From c67f168e4b91155aa7b20b8399eb4d4761128852 Mon Sep 17 00:00:00 2001
From: akrzos <akrzos@redhat.com>
Date: Wed, 15 Mar 2017 17:27:41 -0400
Subject: [PATCH] Few small changes for rabbitmq grafana graphs and
 configuration

Change-Id: Ib87524818b2714eb1a5567039d6448fdb5d3a9cb
---
 ansible/install/group_vars/all.yml            | 10 +++++++++
 .../templates/controller.collectd.conf.j2     |  3 ++-
 .../templates/undercloud.collectd.conf.j2     |  3 ++-
 ...enstack_general_system_performance.json.j2 | 21 ++++++++++++-------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index 5313477e5..9e4ea6ed8 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -102,6 +102,16 @@ rabbitmq_undercloud_collectd_interval: 10
 rabbitmq_controller_collectd_plugin: false
 rabbitmq_controller_collectd_interval: 10
 
+# Queues to monitor message count on Undercloud
+undercloud_monitored_queues:
+  - "metering.sample"
+  - "event.sample"
+
+# Queues to monitor message count on Controllers
+controller_monitored_queues:
+  - "metering.sample"
+  - "event.sample"
+
 ########################
 # tail plugin
 ########################
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 df6fc3dbd..46a92f04f 100644
--- a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
@@ -264,7 +264,8 @@ PreCacheChain "PreCache"
     port 15672
     username {{controller0_rabbitmq_username.stdout}}
     password {{controller0_rabbitmq_password.stdout}}
-    message_count "metering.sample" "event.sample"
+    message_count {% for a_queue in controller_monitored_queues %}"{{a_queue}}" {% endfor %}
+
   </Module>
 </Plugin>
 {% else %}
diff --git a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
index c49adbb43..51f8ee810 100644
--- a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
@@ -235,7 +235,8 @@ PreCacheChain "PreCache"
     port 15672
     username {{undercloud_rabbitmq_username.stdout}}
     password {{undercloud_rabbitmq_password.stdout}}
-    message_count "metering.sample" "event.sample"
+    message_count {% for a_queue in undercloud_monitored_queues %}"{{a_queue}}" {% endfor %}
+
   </Module>
 </Plugin>
 
diff --git a/ansible/install/roles/grafana-dashboards/templates/openstack_general_system_performance.json.j2 b/ansible/install/roles/grafana-dashboards/templates/openstack_general_system_performance.json.j2
index a51cbcf91..45a071454 100644
--- a/ansible/install/roles/grafana-dashboards/templates/openstack_general_system_performance.json.j2
+++ b/ansible/install/roles/grafana-dashboards/templates/openstack_general_system_performance.json.j2
@@ -2894,7 +2894,8 @@
             "editable": true,
             "type": "graph",
             "isNew": true,
-            "id": 185,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "targets": [
               {
                 "target": "aliasByMetric(aliasSub($Cloud.$Node.gnocchi_status.*, 'gauge-', ''))",
@@ -4120,7 +4121,8 @@
             "bars": false,
             "datasource": null,
             "fill": 0,
-            "id": 246,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,
@@ -4206,7 +4208,8 @@
             "bars": false,
             "datasource": null,
             "fill": 0,
-            "id": 247,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,
@@ -4277,7 +4280,8 @@
             "bars": false,
             "datasource": null,
             "fill": 1,
-            "id": 248,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,
@@ -4348,7 +4352,8 @@
             "bars": false,
             "datasource": null,
             "fill": 0,
-            "id": 249,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,
@@ -4419,7 +4424,8 @@
             "bars": false,
             "datasource": null,
             "fill": 0,
-            "id": 250,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,
@@ -4490,7 +4496,8 @@
             "bars": false,
             "datasource": null,
             "fill": 0,
-            "id": 240,
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            "id": {{vars.panel_idx}},
             "legend": {
               "alignAsTable": true,
               "avg": false,