Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.

tools/docker-compose.yml

@@ -1,37 +1,26 @@
-version: '2'
-services:
-  # Primary Tower Development Container
-  tower:
-    build: ./docker-compose
-    ports:
-      - "8080:8080"
-      - "8013:8013"
-    links:
-      - postgres
-      - redis
-    #   - sync
-    # volumes_from:
-    #   - sync
-    volumes:
-      - "../:/tower_devel"
-
-  # Postgres Database Container
-  postgres:
-    image: postgres:9.4.1
-
-  # Redis Container
-  redis:
-    image: redis:3.0.1
-
-  # Source Code Synchronization Container
-  # sync:
-  #     build:
-  #         context: ./docker-compose
-  #         dockerfile: Dockerfile-sync
-  #     command: "lsyncd -delay 1 -nodaemon -rsync /src /tower_devel"
-  #     volumes:
-  #         - /tower_devel
-  #         - "../:/src"
-  #     working_dir: /src
-  #     stdin_open: true
-  #     tty: true
+tower:
+  build: ./docker-compose
+  ports:
+    - "8080:8080"
+    - "8013:8013"
+  links:
+    - postgres
+    - redis
+    - graphite
+  volumes:
+    - ../:/tower_devel
+postgres:
+  image: postgres:9.4.1
+  # ports:
+  #   - 5432:5432
+redis:
+  image: redis:3.0.1
+  # ports:
+  #   - 6379:6379
+graphite:
+  image: hopsoft/graphite-statsd
+  ports:
+    - "8001:80"
+    - "2003:2003"
+    - "8125:8125/udp"
+    - "8126:8126"

tools/docker-compose/Dockerfile

@@ -7,9 +7,10 @@ ENV LC_ALL en_US.UTF-8
 RUN apt-get update && apt-get install -y software-properties-common python-software-properties curl
 RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa:chris-lea/zeromq; add-apt-repository -y ppa:chris-lea/node.js; add-apt-repository -y ppa:ansible/ansible; add-apt-repository -y ppa:jal233/proot;
 RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
-RUN curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && apt-key adv --fetch-keys http://www.postgresql.org/media/keys/ACCC4CF8.asc
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | tee /etc/apt/sources.list.d/postgres-9.4.list
-RUN apt-get update && apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server libgss-dev libkrb5-dev && apt-get autoremove --purge -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update
+RUN apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server && rm -rf /var/lib/apt/lists/*
 RUN pip install flake8 pytest pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv
 RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
 RUN mkdir -p /etc/tower

tools/docker-compose/Dockerfile-sync

@@ -1,10 +0,0 @@
-FROM ubuntu:16.04
-
-RUN PACKAGES="\
-        rsync \
-        lsyncd \
-    " && \
-    apt-get update && \
-    apt-get install -y $PACKAGES && \
-    apt-get autoremove --purge -y && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

tools/docker-compose/ansible_tower.egg-info/SOURCES.txt

@@ -18831,6 +18831,10 @@ 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
@@ -19009,6 +19013,17 @@ 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