munin is dead. Long live munin!

Wait, not that.

8 files changed, 1 insertions, 78 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index f03e71b81d..b52764c7e8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -18,7 +18,6 @@ include tools/scripts/request_tower_configuration.sh
 include tools/scripts/request_tower_configuration.ps1
 include tools/scripts/ansible-tower-service
 include tools/scripts/tower-python
-include tools/munin_monitors/*
 include tools/sosreport/*
 include COPYING
 include Makefile
diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf
index 95157748b2..2266f042c6 100644
--- a/config/awx-httpd-443.conf
+++ b/config/awx-httpd-443.conf
@@ -47,5 +47,4 @@ WSGIPythonHome /var/lib/awx/venv/tower
     </IfVersion>
   </Directory>
 
-  Include conf.d/awx-munin.conf
 </VirtualHost>
diff --git a/config/awx-munin-el.conf b/config/awx-munin-el.conf
deleted file mode 100644
index 833a6f36bf..0000000000
--- a/config/awx-munin-el.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Alias /munin /var/www/html/munin/
-<Directory /var/www/html/munin/>
-        Order Allow,Deny
-        Allow from all
-
-        AuthUserFile /var/lib/awx/.munin_htpasswd
-        AuthName "Munin"
-        AuthType Basic
-        require valid-user
-
-</Directory>
-ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
\ No newline at end of file
diff --git a/config/awx-munin-ubuntu.conf b/config/awx-munin-ubuntu.conf
deleted file mode 100644
index 90c479f77a..0000000000
--- a/config/awx-munin-ubuntu.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Alias /munin /var/cache/munin/www
-<Directory /var/cache/munin/www>
-        Order Allow,Deny
-        Allow from all
-        Options FollowSymLinks
-
-        AuthUserFile /var/lib/awx/.munin_htpasswd
-        AuthName "Munin"
-        AuthType Basic
-        require valid-user
-
-    <IfModule mod_expires.c>
-        ExpiresActive On
-        ExpiresDefault M310
-    </IfModule>
-</Directory>
diff --git a/config/awx-munin.conf b/config/awx-munin.conf
deleted file mode 100644
index ca4f4c39ad..0000000000
--- a/config/awx-munin.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Alias /munin /var/www/html/munin/
-<Directory /var/www/html/munin/>
-        Order Allow,Deny
-        Allow from all
-
-        AuthUserFile /var/lib/awx/.munin_htpasswd
-        AuthName "Munin"
-        AuthType Basic
-        require valid-user
-
-</Directory>
diff --git a/config/awx_munin_tower_jobs b/config/awx_munin_tower_jobs
deleted file mode 100644
index ff2cc225f8..0000000000
--- a/config/awx_munin_tower_jobs
+++ /dev/null
@@ -1,3 +0,0 @@
-[tower_jobs]
-user awx
-
diff --git a/setup.py b/setup.py
index 4b89789df7..01957a1a91 100755
--- a/setup.py
+++ b/setup.py
@@ -23,13 +23,10 @@ homedir = "/var/lib/awx"
 bindir = "/usr/bin"
 sharedir = "/usr/share/awx"
 docdir = "/usr/share/doc/ansible-tower"
-munin_plugin_path = "/etc/munin/plugins/"
-munin_plugin_conf_path = "/etc/munin/plugin-conf.d"
 
 if os.path.exists("/etc/debian_version"):
     sysinit = "/etc/init.d"
     webconfig  = "/etc/apache2/conf.d"
-    shutil.copy("config/awx-munin-ubuntu.conf", "config/awx-munin.conf")
     # sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins'
     # sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins'
     # debian/<package>.links will create symlinks to support both versions
@@ -37,7 +34,6 @@ if os.path.exists("/etc/debian_version"):
 else:
     sysinit = "/etc/rc.d/init.d"
     webconfig  = "/etc/httpd/conf.d"
-    shutil.copy("config/awx-munin-el.conf", "config/awx-munin.conf")
     # The .spec will create symlinks to support multiple versions of sosreport
     sosconfig = "/usr/share/sosreport/sos/plugins"
 
@@ -120,22 +116,9 @@ setup(
         ("%s" % homedir,        ["config/wsgi.py",
                                  "awx/static/favicon.ico"]),
         ("%s" % webconfig,      ["config/awx-httpd-80.conf",
-                                 "config/awx-httpd-443.conf",
-                                 "config/awx-munin.conf"]),
+                                 "config/awx-httpd-443.conf"]),
         ("%s" % sharedir,       ["tools/scripts/request_tower_configuration.sh","tools/scripts/request_tower_configuration.ps1"]),
         ("%s" % docdir,         ["docs/licenses/*",]),
-        ("%s" % munin_plugin_path, ["tools/munin_monitors/tower_jobs",
-                                    "tools/munin_monitors/callbackr_alive",
-                                    "tools/munin_monitors/celery_alive",
-                                    "tools/munin_monitors/postgres_alive",
-                                    "tools/munin_monitors/redis_alive",
-                                    "tools/munin_monitors/socketio_alive",
-                                    "tools/munin_monitors/taskmanager_alive",
-                                    "tools/munin_monitors/mongo_conn",
-                                    "tools/munin_monitors/mongo_docs",
-                                    "tools/munin_monitors/mongo_mem",
-                                    "tools/munin_monitors/mongo_ops"]),
-        ("%s" % munin_plugin_conf_path, ["config/awx_munin_tower_jobs"]),
         ("%s" % bindir, ["tools/scripts/ansible-tower-service",
                          "tools/scripts/tower-python"]),
         ("%s" % sosconfig, ["tools/sosreport/tower.py"])]),
diff --git a/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt b/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt
index 3246bd0143..1d220664e0 100644
--- a/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt
+++ b/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt
@@ -18831,10 +18831,6 @@ awx/ui/static/lib/select2/dist/css/select2.css
 awx/ui/templates/ui/index.html
 config/awx-httpd-443.conf
 config/awx-httpd-80.conf
-config/awx-munin-el.conf
-config/awx-munin-ubuntu.conf
-config/awx-munin.conf
-config/awx_munin_tower_jobs
 config/wsgi.py
 docs/licenses/Babel.txt
 docs/licenses/IP.txt
@@ -19013,17 +19009,6 @@ requirements/requirements.txt
 requirements/requirements_dev.txt
 requirements/requirements_jenkins.txt
 requirements/requirements_python26.txt
-tools/munin_monitors/callbackr_alive
-tools/munin_monitors/celery_alive
-tools/munin_monitors/mongo_conn
-tools/munin_monitors/mongo_docs
-tools/munin_monitors/mongo_mem
-tools/munin_monitors/mongo_ops
-tools/munin_monitors/postgres_alive
-tools/munin_monitors/redis_alive
-tools/munin_monitors/socketio_alive
-tools/munin_monitors/taskmanager_alive
-tools/munin_monitors/tower_jobs
 tools/scripts/ansible-tower-service
 tools/scripts/request_tower_configuration.ps1
 tools/scripts/request_tower_configuration.sh