From 74bd13727a48cc1476d61dbaed2f2433b00d3940 Mon Sep 17 00:00:00 2001
From: Eike Frost <ei@kefro.st>
Date: Sat, 21 Oct 2017 10:07:51 +0200
Subject: [PATCH] move zabbix modules into their own namespace below
 monitoring/ (#31992)

---
 .github/BOTMETA.yml                                   | 11 ++++++-----
 lib/ansible/modules/monitoring/zabbix/__init__.py     |  0
 .../modules/monitoring/{ => zabbix}/zabbix_group.py   |  0
 .../modules/monitoring/{ => zabbix}/zabbix_host.py    |  0
 .../monitoring/{ => zabbix}/zabbix_hostmacro.py       |  0
 .../monitoring/{ => zabbix}/zabbix_maintenance.py     |  0
 .../modules/monitoring/{ => zabbix}/zabbix_proxy.py   |  0
 .../modules/monitoring/{ => zabbix}/zabbix_screen.py  |  0
 .../monitoring/{ => zabbix}/zabbix_template.py        |  0
 9 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 lib/ansible/modules/monitoring/zabbix/__init__.py
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_group.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_host.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_hostmacro.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_maintenance.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_proxy.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_screen.py (100%)
 rename lib/ansible/modules/monitoring/{ => zabbix}/zabbix_template.py (100%)

diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 3fc7ab24da..a988fbc240 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -415,11 +415,12 @@ files:
   $modules/monitoring/stackdriver.py: bwhaley
   $modules/monitoring/statusio_maintenance.py: bhcopeland
   $modules/monitoring/uptimerobot.py: nate-kingsley
-  $modules/monitoring/zabbix_group.py: cove eikef harrisongu
-  $modules/monitoring/zabbix_host.py: cove eikef harrisongu D3DeFi
-  $modules/monitoring/zabbix_hostmacro.py: cave eikef
-  $modules/monitoring/zabbix_maintenance.py: abulimov eikef
-  $modules/monitoring/zabbix_screen.py: cove eikef harrisongu
+  $modules/monitoring/zabbix: eikef
+  $modules/monitoring/zabbix/zabbix_group.py: cove harrisongu
+  $modules/monitoring/zabbix/zabbix_host.py: cove harrisongu D3DeFi
+  $modules/monitoring/zabbix/zabbix_hostmacro.py: cave
+  $modules/monitoring/zabbix/zabbix_maintenance.py: abulimov
+  $modules/monitoring/zabbix/zabbix_screen.py: cove harrisongu
   $modules/net_tools/basics/get_url.py: jpmens
   $modules/net_tools/basics/slurp.py: $team_ansible
   $modules/net_tools/basics/uri.py: $team_ansible
diff --git a/lib/ansible/modules/monitoring/zabbix/__init__.py b/lib/ansible/modules/monitoring/zabbix/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/monitoring/zabbix_group.py b/lib/ansible/modules/monitoring/zabbix/zabbix_group.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_group.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_group.py
diff --git a/lib/ansible/modules/monitoring/zabbix_host.py b/lib/ansible/modules/monitoring/zabbix/zabbix_host.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_host.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_host.py
diff --git a/lib/ansible/modules/monitoring/zabbix_hostmacro.py b/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_hostmacro.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
diff --git a/lib/ansible/modules/monitoring/zabbix_maintenance.py b/lib/ansible/modules/monitoring/zabbix/zabbix_maintenance.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_maintenance.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_maintenance.py
diff --git a/lib/ansible/modules/monitoring/zabbix_proxy.py b/lib/ansible/modules/monitoring/zabbix/zabbix_proxy.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_proxy.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_proxy.py
diff --git a/lib/ansible/modules/monitoring/zabbix_screen.py b/lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_screen.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
diff --git a/lib/ansible/modules/monitoring/zabbix_template.py b/lib/ansible/modules/monitoring/zabbix/zabbix_template.py
similarity index 100%
rename from lib/ansible/modules/monitoring/zabbix_template.py
rename to lib/ansible/modules/monitoring/zabbix/zabbix_template.py