Merge pull request #3235 from ryanpetrello/sql-profiling

add a custom DB backend that provides system-level SQL profiling

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

tools/clusterdevel/roles/minishift/templates/configmap.yml.j2

@@ -73,7 +73,7 @@ data:
     DATABASES = {
         'default': {
             'ATOMIC_REQUESTS': True,
-            'ENGINE': 'django.db.backends.postgresql',
+            'ENGINE': 'awx.main.db.profiled_pg',
             'NAME': "awx",
             'USER': "awx",
             'PASSWORD': "awx",

tools/docker-compose/Dockerfile

@@ -66,7 +66,7 @@ ENTRYPOINT ["/tini", "--"]
 CMD /start_development.sh
 
 # Pre-create things that we need to write to
-RUN for dir in /var/lib/awx/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
+RUN for dir in /var/lib/awx/ /var/log/tower/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
   do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done
 
 RUN for file in /etc/passwd /etc/supervisord.conf \

tools/sosreport/tower.py

@@ -46,7 +46,8 @@ SOSREPORT_FORBIDDEN_PATHS = [
     "/etc/tower/tower.key",
     "/etc/tower/awx.key",
     "/etc/tower/tower.cert",
-    "/etc/tower/awx.cert"
+    "/etc/tower/awx.cert",
+    "/var/log/tower/profile"
 ]
 
 if LooseVersion(sos.__version__) >= LooseVersion('3.0'):