From 0e3d351b3e5eb3a8480fc0dad73064435ad5fc21 Mon Sep 17 00:00:00 2001
From: dwilson <dwilson@redhat.com>
Date: Wed, 9 May 2018 16:14:00 -0400
Subject: [PATCH] Adding barbican collection and monitoring

This work will add monitroing for the Barbican security service

Change-Id: Ifd496bc73e6f6e208b91087b083cf0e1fc26f7b1
---
 .../templates/controller.collectd.conf.j2              |  5 +++++
 ansible/install/roles/grafana-dashboards/vars/main.yml | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
index b54efd702..748b3365a 100644
--- a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
@@ -267,6 +267,11 @@ PreCacheChain "PreCache"
   ProcessMatch "aodh-notifier" "aodh-notifier"                                          # 10,11,12,13
   ProcessMatch "aodh_wsgi" "aodh_wsgi.*-DFOREGROUND"                                    # 11,12,13
 
+  # Barbican (OpenStack Installed)
+  ProcessMatch "barbican_wsgi" "barbican_wsgi.*-DFOREGROUND"                           # 13
+  ProcessMatch "barbican-keystone-listener" "python.+barbican-keystone-listener"       # 13
+  ProcessMatch "barbican-worker" "python.+barbican-worker"                             # 13
+
   # Ceilometer (OpenStack Installed)
   ProcessMatch "ceilometer-agent-notification" "ceilometer-agent-notification"          # 10,11,12,13
   ProcessMatch "ceilometer-collector" "ceilometer-collector"                            # 10,11,-12,-13
diff --git a/ansible/install/roles/grafana-dashboards/vars/main.yml b/ansible/install/roles/grafana-dashboards/vars/main.yml
index a9c08674a..0cc6abf3f 100644
--- a/ansible/install/roles/grafana-dashboards/vars/main.yml
+++ b/ansible/install/roles/grafana-dashboards/vars/main.yml
@@ -203,6 +203,11 @@ per_process_panels:
         - aodh-listener
         - aodh-notifier
         - aodh_wsgi
+    - name: "Barbican"
+      processes:
+        - barbican_wsgi
+        - barbican-keystone-listener
+        - barbican-worker
     - name: "Ceilometer"
       processes:
         - ceilometer-agent-notification
@@ -438,6 +443,11 @@ per_process_panels:
         - aodh-listener
         - aodh-notifier
         - aodh_wsgi
+    - name: "Barbican"
+      processes:
+        - barbican_wsgi
+        - barbican-keystone-listener
+        - barbican-worker
     - name: "Ceilometer"
       processes:
         - ceilometer-agent-notification