x/fuel-plugin-influxdb-grafana
Code Issues Proposed changes

Fix dashboards'filter to support multiple environments

Browse Source 
This patch adds the "and environment_label = '$environment'"
fragment to the template query in order to support environments deployed
by different Fuel nodes.

Change-Id: Icdd2f33b2145fcb763873399a36a3d188afd7898
Closes-Bug: #1584825
This commit is contained in:
Guillaume Thouvenin
2016-06-06 13:02:41 +02:00
parent 2e6bef82ec
commit 8e13e7aea2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json
View File

@@ -2829,7 +2829,7 @@
"includeAll": false,
"name": "cluster",
"options": [],
"query": "show tag values from ceph_health with key = cluster ",
"query": "show tag values from ceph_health with key = cluster where environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",
@@ -2842,7 +2842,7 @@
"includeAll": false,
"name": "pool",
"options": [],
"query": "show tag values from ceph_pool_size with key = pool",
"query": "show tag values from ceph_pool_size with key = pool where environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "/^[^.]/",
@@ -2855,7 +2855,7 @@
"includeAll": false,
"name": "osd",
"options": [],
"query": "show tag values from ceph_osd_space_total with key = osd",
"query": "show tag values from ceph_osd_space_total with key = osd where environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",

2
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json
View File

@@ -2765,7 +2765,7 @@
"includeAll": false,
"name": "service",
"options": [],
"query": "show tag values from haproxy_backend_servers with key = backend where hostname = '$server'",
"query": "show tag values from haproxy_backend_servers with key = backend where hostname = '$server' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",

6
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json
View File

@@ -2091,7 +2091,7 @@
"multiFormat": "glob",
"name": "instance_id",
"options": [],
"query": "show tag values from virt_cpu_time with key = instance_id where hostname = '$hostname'",
"query": "show tag values from virt_cpu_time with key = instance_id where hostname = '$hostname' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"type": "query"
@@ -2105,7 +2105,7 @@
"multiFormat": "glob",
"name": "disk",
"options": [],
"query": "show tag values from virt_disk_octets_read with key = device where hostname = '$hostname' and instance_id = '$instance_id'",
"query": "show tag values from virt_disk_octets_read with key = device where hostname = '$hostname' and instance_id = '$instance_id' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",
@@ -2120,7 +2120,7 @@
"multiFormat": "glob",
"name": "interface",
"options": [],
"query": "show tag values from virt_if_octets_rx with key = interface where hostname = '$hostname' and instance_id = '$instance_id'",
"query": "show tag values from virt_if_octets_rx with key = interface where hostname = '$hostname' and instance_id = '$instance_id' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"type": "query"

6
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json
View File

@@ -3528,7 +3528,7 @@
"includeAll": false,
"name": "disk",
"options": [],
"query": "show tag values from disk_merged_read with key=\"device\" where hostname = '$server'",
"query": "show tag values from disk_merged_read with key=\"device\" where hostname = '$server' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "/^[a-z]+$/",
@@ -3541,7 +3541,7 @@
"includeAll": false,
"name": "mount",
"options": [],
"query": "show tag values from fs_inodes_free with key=\"fs\" where hostname = '$server'",
"query": "show tag values from fs_inodes_free with key=\"fs\" where hostname = '$server' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",
@@ -3554,7 +3554,7 @@
"includeAll": false,
"name": "interface",
"options": [],
"query": "show tag values from if_errors_rx with key=\"interface\" where hostname = '$server'",
"query": "show tag values from if_errors_rx with key=\"interface\" where hostname = '$server' and environment_label = '$environment'",
"refresh": true,
"refresh_on_load": true,
"regex": "",