diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json index 1996bdde..c72f3a12 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json @@ -103,6 +103,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -214,6 +219,7 @@ "groupByTags": [], "measurement": "apache_requests", "query": "SELECT mean(\"value\") FROM \"apache_requests\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -319,6 +325,7 @@ "groupByTags": [], "measurement": "apache_bytes", "query": "SELECT mean(\"value\") FROM \"apache_bytes\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -423,6 +430,7 @@ "groupByTags": [], "measurement": "apache_connections", "query": "SELECT mean(\"value\") FROM \"apache_connections\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -515,6 +523,7 @@ "groupByTags": [], "measurement": "apache_connections", "query": "SELECT last(\"value\") FROM \"apache_connections\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -621,6 +630,7 @@ "groupByTags": [], "measurement": "/apache_workers/", "query": "SELECT mean(\"value\") FROM /apache_workers/ WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -714,6 +724,7 @@ "groupByTags": [], "measurement": "apache_idle_workers", "query": "SELECT last(\"value\") FROM \"apache_idle_workers\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -763,6 +774,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -770,7 +794,7 @@ "includeAll": false, "name": "server", "options": [], - "query": "show tag values from apache_requests with key = hostname", + "query": "show tag values from apache_requests with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -815,5 +839,5 @@ }, "timezone": "browser", "title": "Apache", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json index 3f9d6f82..84dfe9ec 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json @@ -80,6 +80,7 @@ "groupByTags": [], "measurement": "ceph_health", "query": "SELECT last(\"value\") FROM \"ceph_health\" WHERE \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -185,6 +186,7 @@ "groupByTags": [], "measurement": "ceph_quorum_count", "query": "SELECT last(\"value\") FROM \"ceph_quorum_count\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -202,7 +204,13 @@ ] ], "series": "/$controller.ceph.cluster-$cluster.quorum/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "0,1,3", @@ -270,6 +278,7 @@ "groupByTags": [], "measurement": "ceph_monitor_count", "query": "SELECT last(\"value\") FROM \"ceph_monitor_count\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -287,7 +296,13 @@ ] ], "series": "/$controller.ceph.cluster-$cluster.monitor/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "0,1,3", @@ -353,6 +368,7 @@ "groupByTags": [], "measurement": "ceph_objects_count", "query": "SELECT last(\"value\") FROM \"ceph_objects_count\" WHERE \"cluster\" =~ /$cluster/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -370,6 +386,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -441,6 +462,7 @@ "groupByTags": [], "measurement": "ceph_pg_count", "query": "SELECT last(\"value\") FROM \"ceph_pg_count\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -457,7 +479,13 @@ } ] ], - "tags": [], + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ], "target": "" } ], @@ -524,6 +552,7 @@ "groupByTags": [], "measurement": "ceph_pool_total_percent_free", "query": "SELECT last(\"value\") FROM \"ceph_pool_total_percent_free\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -540,7 +569,13 @@ } ] ], - "tags": [], + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ], "target": "" } ], @@ -641,7 +676,13 @@ ] ], "series": "/ceph.*.pool.total_bytes/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "available", @@ -683,7 +724,13 @@ ] ], "series": "/ceph.*.pool.total_bytes/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -770,6 +817,7 @@ "hide": false, "measurement": "ceph_pg_state_count", "query": "SELECT max(\"value\") FROM \"ceph_pg_state_count\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1047,6 +1095,7 @@ "groupByTags": [], "measurement": "ceph_pool_bytes_free", "query": "SELECT mean(\"value\") FROM \"ceph_pool_bytes_free\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"cluster\" =~ /$cluster/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1163,6 +1212,7 @@ "groupByTags": [], "measurement": "ceph_pool_objects", "query": "SELECT mean(\"value\") FROM \"ceph_pool_objects\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1693,6 +1743,7 @@ "groupByTags": [], "measurement": "ceph_pool_size", "query": "SELECT mean(\"value\") FROM \"ceph_pool_size\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1806,6 +1857,7 @@ "groupByTags": [], "measurement": "ceph_pool_pg_num", "query": "SELECT max(\"value\") FROM \"ceph_pool_pg_num\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1917,6 +1969,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_up", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_up\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2012,6 +2065,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_down", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_down\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2121,6 +2175,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_up", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_up\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2172,6 +2227,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_down", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_down\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2223,6 +2279,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_in", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_in\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2274,6 +2331,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_out", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_out\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -2384,6 +2442,7 @@ "groupByTags": [], "measurement": "ceph_osd_space_used", "query": "SELECT mean(\"value\") FROM \"ceph_osd_space_used\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2440,6 +2499,7 @@ "groupByTags": [], "measurement": "ceph_osd_space_total", "query": "SELECT mean(\"value\") FROM \"ceph_osd_space_total\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2555,6 +2615,7 @@ "groupByTags": [], "measurement": "ceph_osd_latency_appply", "query": "SELECT mean(\"value\") FROM \"ceph_osd_latency_appply\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2670,6 +2731,7 @@ "groupByTags": [], "measurement": "ceph_osd_latency_commit", "query": "SELECT mean(\"value\") FROM \"ceph_osd_latency_commit\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2739,6 +2801,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -2746,7 +2821,7 @@ "includeAll": false, "name": "mon", "options": [], - "query": "show tag values from ceph_health with key = hostname", + "query": "show tag values from ceph_health with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -2830,5 +2905,5 @@ }, "timezone": "browser", "title": "Ceph", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json index ffdafd91..93dd08e2 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json @@ -98,6 +98,11 @@ ], "series": "/$osd.osd.op_wip/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -184,7 +189,7 @@ } ], "measurement": "ceph_perf_osd_op", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -294,7 +299,7 @@ "hide": false, "interval": "", "measurement": "ceph_perf_osd_op_in_bytes", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -343,7 +348,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_out_bytes", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -457,6 +462,7 @@ ], "measurement": "ceph_perf_osd_op_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -475,6 +481,11 @@ ], "series": "/$osd.osd.op_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -575,7 +586,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_r_out_bytes", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -624,7 +635,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_r", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -738,6 +749,7 @@ ], "measurement": "ceph_perf_osd_op_r_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_r_latency\" WHERE \"cluster\" = 'ceph' AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -756,6 +768,11 @@ ], "series": "/$osd.osd.op_r_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "ceph" @@ -788,6 +805,7 @@ ], "measurement": "ceph_perf_osd_op_r_process_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_r_process_latency\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -805,7 +823,13 @@ ] ], "series": "/$osd.osd.op_r_process_latency$/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -895,7 +919,7 @@ } ], "measurement": "ceph_perf_osd_op_w_in_bytes", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -943,7 +967,7 @@ } ], "measurement": "ceph_perf_osd_op_w", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -991,7 +1015,7 @@ } ], "measurement": "ceph_perf_osd_op_w_rlat", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -1105,6 +1129,7 @@ ], "measurement": "ceph_perf_osd_op_w_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_w_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1123,6 +1148,11 @@ ], "series": "/$osd.osd.op_w_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -1155,6 +1185,7 @@ ], "measurement": "ceph_perf_osd_op_w_process_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_w_process_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1173,6 +1204,11 @@ ], "series": "/$osd.osd.op_w_process_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -1272,7 +1308,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_in_bytes", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1320,7 +1356,7 @@ } ], "measurement": "ceph_perf_osd_op_rw", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1368,7 +1404,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_rlat", - "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -1482,6 +1518,7 @@ ], "measurement": "ceph_perf_osd_op_rw_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_rw_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1500,6 +1537,11 @@ ], "series": "/$osd.osd.op_rw_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -1532,6 +1574,7 @@ ], "measurement": "ceph_perf_osd_op_rw_process_latency", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_rw_process_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1550,6 +1593,11 @@ ], "series": "/$osd.osd.op_rw_process_latency$/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -1649,6 +1697,7 @@ ], "measurement": "ceph_perf_osd_recovery_ops", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_recovery_ops\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1667,6 +1716,11 @@ ], "series": "/$osd.*osd.recovery_ops/", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster", "value": "/$cluster/" @@ -1705,6 +1759,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -1712,7 +1779,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": "", @@ -1725,7 +1792,7 @@ "includeAll": false, "name": "osd", "options": [], - "query": "show tag values from ceph_perf_osd_op_latency with key = osd ", + "query": "show tag values from ceph_perf_osd_op_latency with key = osd where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1770,5 +1837,5 @@ }, "timezone": "browser", "title": "Ceph OSD", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json index dd907c53..d93d0310 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json @@ -19,7 +19,7 @@ }, "editable": true, "hideControls": false, - "id": 5, + "id": null, "links": [], "originalTitle": "Cinder", "refresh": "1m", @@ -97,6 +97,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -302,6 +307,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -353,6 +359,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -404,6 +411,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -455,6 +463,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -566,6 +575,7 @@ ], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'cinder-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -584,6 +594,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -729,6 +744,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -781,6 +797,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -833,6 +850,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -885,6 +903,7 @@ "interval": "", "measurement": "openstack_cinder_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_cinder_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1015,6 +1034,11 @@ ], "series": "merge(/haproxy.backend.cinder-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "cinder-api" @@ -1128,6 +1152,11 @@ ], "series": "merge(/haproxy.backend.cinder-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "cinder-api" @@ -1257,6 +1286,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1355,6 +1389,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1453,6 +1492,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1537,7 +1581,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter and service = 'scheduler' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'scheduler' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -1647,6 +1691,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1745,6 +1794,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1843,6 +1897,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1927,7 +1986,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter and service = 'volume' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'volume' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2037,6 +2096,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2135,6 +2199,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2233,6 +2302,11 @@ ], "series": "merge(/openstack.cinder.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2317,7 +2391,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter and service = 'backup' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'backup' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2398,6 +2472,7 @@ ], "measurement": "openstack_cinder_volumes", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2416,6 +2491,11 @@ ], "series": "merge(/openstack.cinder.volumes.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -2483,6 +2563,7 @@ ], "measurement": "openstack_cinder_volumes", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2501,6 +2582,11 @@ ], "series": "merge(/openstack.cinder.volumes.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -2568,6 +2654,7 @@ ], "measurement": "openstack_cinder_volumes", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2586,6 +2673,11 @@ ], "series": "merge(/openstack.cinder.volumes.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -2672,6 +2764,7 @@ "hide": false, "measurement": "openstack_cinder_volumes", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2690,6 +2783,11 @@ ], "series": "merge(/openstack.cinder.volumes.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -2717,6 +2815,7 @@ ], "measurement": "openstack_cinder_volumes", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2735,6 +2834,11 @@ ], "series": "merge(/openstack.cinder.volumes.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -2764,6 +2868,7 @@ "hide": false, "measurement": "openstack_cinder_volumes", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2782,6 +2887,11 @@ ], "series": "merge(/openstack.cinder.volumes.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -2850,6 +2960,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2868,6 +2979,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -2934,6 +3050,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2952,6 +3069,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -3018,6 +3140,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3036,6 +3159,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -3120,6 +3248,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3138,6 +3267,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -3166,6 +3300,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3184,6 +3319,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -3212,6 +3352,7 @@ ], "measurement": "openstack_cinder_volumes_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -3230,6 +3371,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -3298,6 +3444,7 @@ ], "measurement": "openstack_cinder_volume_creation_time", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volume_creation_time\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3315,7 +3462,13 @@ ] ], "series": "merge(/openstack.cinder.volume_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -3431,7 +3584,13 @@ ] ], "series": "merge(/openstack.cinder.volume_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "max", @@ -3474,7 +3633,13 @@ ] ], "series": "merge(/openstack.cinder.volume_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "min", @@ -3517,7 +3682,13 @@ ] ], "series": "merge(/openstack.cinder.volume_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3589,6 +3760,7 @@ ], "measurement": "openstack_cinder_snapshots", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3607,6 +3779,11 @@ ], "series": "merge(/openstack.cinder.volumes.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -3673,6 +3850,7 @@ ], "measurement": "openstack_cinder_snapshots", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3691,6 +3869,11 @@ ], "series": "merge(/openstack.cinder.volumes.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -3757,6 +3940,7 @@ ], "measurement": "openstack_cinder_snapshots", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3775,6 +3959,11 @@ ], "series": "merge(/openstack.cinder.volumes.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -3861,6 +4050,7 @@ "hide": false, "measurement": "openstack_cinder_snapshots", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3879,6 +4069,11 @@ ], "series": "merge(/openstack.cinder.volumes.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -3906,6 +4101,7 @@ ], "measurement": "openstack_cinder_snapshots", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3924,6 +4120,11 @@ ], "series": "merge(/openstack.cinder.volumes.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -3953,6 +4154,7 @@ "hide": false, "measurement": "openstack_cinder_snapshots", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -3971,6 +4173,11 @@ ], "series": "merge(/openstack.cinder.volumes.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -4039,6 +4246,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4057,6 +4265,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -4123,6 +4336,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4141,6 +4355,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.in-use/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -4207,6 +4426,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4225,6 +4445,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -4309,6 +4534,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4327,6 +4553,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.available/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "available" @@ -4354,6 +4585,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -4372,6 +4604,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.in-user/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "in-use" @@ -4399,6 +4636,7 @@ ], "measurement": "openstack_cinder_snapshots_size", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -4417,6 +4655,11 @@ ], "series": "merge(/openstack.cinder.volumes_size.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -4451,6 +4694,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -4458,7 +4714,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -4503,5 +4759,5 @@ }, "timezone": "browser", "title": "Cinder", - "version": 10 + "version": 11 } diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json index a10b2ab6..8a93df35 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json @@ -18,7 +18,7 @@ }, "editable": true, "hideControls": false, - "id": 9, + "id": null, "links": [], "originalTitle": "Elasticsearch", "refresh": "1m", @@ -95,6 +95,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -186,6 +191,7 @@ ], "measurement": "elasticsearch_cluster_number_of_nodes", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_number_of_nodes\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -202,7 +208,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -277,6 +289,7 @@ ], "measurement": "elasticsearch_cluster_active_primary_shards", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_active_primary_shards\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -293,7 +306,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "active", @@ -308,6 +327,7 @@ ], "measurement": "elasticsearch_cluster_active_shards", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_active_shards\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -324,7 +344,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "relocating", @@ -339,6 +365,7 @@ ], "measurement": "elasticsearch_cluster_relocating_shards", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_relocating_shards\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -355,7 +382,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "unassigned", @@ -370,6 +403,7 @@ ], "measurement": "elasticsearch_cluster_unassigned_shards", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_unassigned_shards\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -386,7 +420,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "initializing", @@ -401,6 +441,7 @@ ], "measurement": "elasticsearch_cluster_initializing_shards", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_initializing_shards\" WHERE $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -417,7 +458,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -510,7 +557,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -582,6 +635,7 @@ ], "measurement": "lma_components_threads", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -691,6 +745,7 @@ ], "measurement": "lma_components_memory_rss", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -803,6 +858,7 @@ ], "measurement": "lma_components_disk_bytes_read", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -854,6 +910,7 @@ ], "measurement": "lma_components_disk_bytes_write", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -964,6 +1021,7 @@ ], "measurement": "lma_components_cputime_syst", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1015,6 +1073,7 @@ ], "measurement": "lma_components_cputime_user", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1104,6 +1163,7 @@ ], "measurement": "fs_space_percent_free", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1211,6 +1271,7 @@ ], "measurement": "fs_space_free", "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1369,6 +1430,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -1376,7 +1450,7 @@ "includeAll": false, "name": "server", "options": [], - "query": "show tag values from elasticsearch_cluster_health with key = \"hostname\"", + "query": "show tag values from elasticsearch_cluster_health with key = \"hostname\" where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1421,5 +1495,5 @@ }, "timezone": "browser", "title": "Elasticsearch", - "version": 12 -} \ No newline at end of file + "version": 13 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json index ae27d7d7..0b9e4365 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -317,6 +322,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -369,6 +375,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -421,6 +428,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -473,6 +481,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -585,6 +594,7 @@ "groupByTags": [], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'glance-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -603,6 +613,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -750,6 +765,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -803,6 +819,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -856,6 +873,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -909,6 +927,7 @@ "interval": "", "measurement": "openstack_glance_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_glance_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1027,6 +1046,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'glance-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1045,6 +1065,11 @@ ], "series": "merge(/haproxy.backend.glance-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "glance-api" @@ -1122,6 +1147,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'glance-registry-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1140,6 +1166,11 @@ ], "series": "merge(/haproxy.backend.glance-registry-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "glance-registry-api" @@ -1241,6 +1272,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'glance-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1259,6 +1291,11 @@ ], "series": "merge(/haproxy.backend.glance-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "glance-api" @@ -1336,6 +1373,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'glance-registry-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1354,6 +1392,11 @@ ], "series": "merge(/haproxy.backend.glance-registry-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "glance-registry-api" @@ -1472,6 +1515,11 @@ ], "series": "merge(/openstack.glance.images.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "public" @@ -1569,6 +1617,11 @@ ], "series": "merge(/openstack.glance.images.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -1661,6 +1714,7 @@ "hide": false, "measurement": "openstack_glance_images", "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1679,6 +1733,11 @@ ], "series": "merge(/openstack.glance.images.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -1712,6 +1771,7 @@ "groupByTags": [], "measurement": "openstack_glance_images", "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"state\" = 'active' AND \"state\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1730,6 +1790,11 @@ ], "series": "merge(/openstack.glance.images.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -1829,6 +1894,11 @@ ], "series": "merge(/openstack.glance.images_size.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "public" @@ -1926,6 +1996,11 @@ ], "series": "merge(/openstack.glance.images_size.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "private" @@ -2036,6 +2111,11 @@ ], "series": "merge(/openstack.glance.images_size.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2069,6 +2149,7 @@ "groupByTags": [], "measurement": "openstack_glance_images_size", "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2087,6 +2168,11 @@ ], "series": "merge(/openstack.glance.images_size.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2187,6 +2273,11 @@ ], "series": "merge(/openstack.glance.snapshots.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "public" @@ -2284,6 +2375,11 @@ ], "series": "merge(/openstack.glance.snapshots.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "private" @@ -2375,6 +2471,7 @@ "groupByTags": [], "measurement": "openstack_glance_snapshots", "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2393,6 +2490,11 @@ ], "series": "merge(/openstack.glance.snapshots.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "public" @@ -2421,6 +2523,7 @@ "groupByTags": [], "measurement": "openstack_glance_snapshots", "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2439,6 +2542,11 @@ ], "series": "merge(/openstack.glance.snapshots.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "visibility", "value": "private" @@ -2534,6 +2642,11 @@ ], "series": "merge(/openstack.glance.snapshots_size.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2631,6 +2744,11 @@ ], "series": "merge(/openstack.glance.snapshots_size.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2721,6 +2839,7 @@ "groupByTags": [], "measurement": "openstack_glance_snapshots_size", "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2739,6 +2858,11 @@ ], "series": "merge(/openstack.glance.snapshots_size.public.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2772,6 +2896,7 @@ "groupByTags": [], "measurement": "openstack_glance_snapshots_size", "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2790,6 +2915,11 @@ ], "series": "merge(/openstack.glance.snapshots_size.private.active$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2830,6 +2960,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -2837,7 +2980,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname ", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", @@ -2882,5 +3025,5 @@ }, "timezone": "browser", "title": "Glance", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json index 431193ec..54d880c2 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json @@ -97,6 +97,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -646,6 +651,7 @@ "hide": false, "measurement": "haproxy_pipes_free", "query": "SELECT mean(\"value\") FROM \"haproxy_pipes_free\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -694,6 +700,7 @@ "interval": "", "measurement": "haproxy_pipes_used", "query": "SELECT mean(\"value\") FROM \"haproxy_pipes_used\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -741,6 +748,7 @@ "interval": "", "measurement": "haproxy_tasks", "query": "SELECT mean(\"value\") FROM \"haproxy_tasks\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -852,7 +860,7 @@ ], "interval": "", "measurement": "haproxy_frontend_bytes_in", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -902,7 +910,7 @@ "hide": false, "interval": "", "measurement": "haproxy_frontend_bytes_out", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1012,7 +1020,7 @@ ], "interval": "", "measurement": "haproxy_frontend_response_1xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1060,7 +1068,7 @@ } ], "measurement": "haproxy_frontend_response_2xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1108,7 +1116,7 @@ } ], "measurement": "haproxy_frontend_response_3xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -1156,7 +1164,7 @@ } ], "measurement": "haproxy_frontend_response_4xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -1204,7 +1212,7 @@ } ], "measurement": "haproxy_frontend_response_5xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "E", "resultFormat": "time_series", @@ -1252,7 +1260,7 @@ } ], "measurement": "haproxy_frontend_response_other", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "F", "resultFormat": "time_series", @@ -1367,6 +1375,7 @@ "hide": false, "measurement": "haproxy_frontend_session_current", "query": "SELECT mean(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1419,6 +1428,7 @@ "interval": "", "measurement": "haproxy_frontend_session_current", "query": "SELECT max(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1470,6 +1480,7 @@ "interval": "", "measurement": "haproxy_frontend_session_current", "query": "SELECT min(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -1574,7 +1585,7 @@ } ], "measurement": "haproxy_frontend_error_requests", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_error_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_error_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1622,7 +1633,7 @@ } ], "measurement": "haproxy_frontend_denied_requests", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1671,7 +1682,7 @@ } ], "measurement": "haproxy_frontend_denied_responses", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -1791,7 +1802,7 @@ ], "interval": "", "measurement": "haproxy_backend_bytes_in", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1841,7 +1852,7 @@ "hide": false, "interval": "", "measurement": "haproxy_backend_bytes_out", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1951,7 +1962,7 @@ ], "interval": "", "measurement": "haproxy_backend_response_1xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1999,7 +2010,7 @@ } ], "measurement": "haproxy_backend_response_2xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2047,7 +2058,7 @@ } ], "measurement": "haproxy_backend_response_3xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2095,7 +2106,7 @@ } ], "measurement": "haproxy_backend_response_4xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -2143,7 +2154,7 @@ } ], "measurement": "haproxy_backend_response_5xx", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "E", "resultFormat": "time_series", @@ -2191,7 +2202,7 @@ } ], "measurement": "haproxy_backend_response_other", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "F", "resultFormat": "time_series", @@ -2306,6 +2317,7 @@ "hide": false, "measurement": "haproxy_backend_session_current", "query": "SELECT mean(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2358,6 +2370,7 @@ "interval": "", "measurement": "haproxy_backend_session_current", "query": "SELECT max(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2409,6 +2422,7 @@ "interval": "", "measurement": "haproxy_backend_session_current", "query": "SELECT min(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2511,7 +2525,7 @@ } ], "measurement": "haproxy_backend_error_connection", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_connection\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_connection\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -2557,7 +2571,7 @@ } ], "measurement": "haproxy_backend_error_responses", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2606,7 +2620,7 @@ ], "interval": "", "measurement": "haproxy_backend_denied_requests", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2656,7 +2670,7 @@ ], "interval": "", "measurement": "haproxy_backend_denied_responses", - "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -2718,6 +2732,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -2725,7 +2752,7 @@ "includeAll": false, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname ", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", @@ -2783,5 +2810,5 @@ }, "timezone": "browser", "title": "HAProxy", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json index 0a1275a4..6f90354c 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -317,6 +322,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -369,6 +375,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -421,6 +428,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -473,6 +481,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -585,6 +594,7 @@ "groupByTags": [], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'heat-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -603,6 +613,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -750,6 +765,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -803,6 +819,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -856,6 +873,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -909,6 +927,7 @@ "interval": "", "measurement": "openstack_heat_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_heat_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1028,6 +1047,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'heat-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1046,6 +1066,11 @@ ], "series": "merge(/haproxy.backend.heat-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "heat-api" @@ -1124,6 +1149,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'heat-cfn-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1142,6 +1168,11 @@ ], "series": "merge(/haproxy.backend.heat-cfn-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "heat-cfn-api" @@ -1244,6 +1275,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'heat-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1262,6 +1294,11 @@ ], "series": "merge(/haproxy.backend.heat-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "heat-api" @@ -1340,6 +1377,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'heat-cfn-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1358,6 +1396,11 @@ ], "series": "merge(/haproxy.backend.heat-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "heat-cfn-api" @@ -1407,6 +1450,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -1414,7 +1470,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1459,5 +1515,5 @@ }, "timezone": "browser", "title": "Heat", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json index ff6c52b5..9d4c78bd 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json @@ -139,6 +139,7 @@ ], "measurement": "cpu_idle", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -193,6 +194,7 @@ ], "measurement": "cpu_interrupt", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -247,6 +249,7 @@ ], "measurement": "cpu_nice", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -301,6 +304,7 @@ ], "measurement": "cpu_system", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -355,6 +359,7 @@ ], "measurement": "cpu_steal", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "F", "resultFormat": "time_series", "select": [ @@ -409,6 +414,7 @@ ], "measurement": "cpu_wait", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "G", "resultFormat": "time_series", "select": [ @@ -534,6 +540,7 @@ "interval": "", "measurement": "memory_used", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -589,6 +596,7 @@ "interval": "", "measurement": "memory_buffered", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -644,6 +652,7 @@ "interval": "", "measurement": "memory_cached", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -699,6 +708,7 @@ "interval": "", "measurement": "memory_free", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -906,6 +916,7 @@ ], "measurement": "openstack_nova_running_instances", "query": "SELECT last(\"value\") FROM \"openstack_nova_running_instances\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1006,6 +1017,7 @@ ], "measurement": "openstack_nova_free_vcpus", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_vcpus\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1049,6 +1061,7 @@ ], "measurement": "openstack_nova_used_vcpus", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_vcpus\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1151,6 +1164,7 @@ ], "measurement": "openstack_nova_free_ram", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_ram\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1194,6 +1208,7 @@ ], "measurement": "openstack_nova_used_ram", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_ram\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1296,6 +1311,7 @@ ], "measurement": "openstack_nova_free_disk", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_disk\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1339,6 +1355,7 @@ ], "measurement": "openstack_nova_used_disk", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_disk\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1458,6 +1475,7 @@ ], "measurement": "virt_cpu_time", "query": "SELECT mean(\"value\") /10000000 FROM \"virt_cpu_time\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1636,6 +1654,7 @@ ], "measurement": "virt_memory_total", "query": "SELECT mean(\"value\") FROM \"virt_memory_total\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1744,6 +1763,7 @@ ], "measurement": "virt_disk_octets_read", "query": "SELECT mean(\"value\") FROM \"virt_disk_octets_read\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"device\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1799,6 +1819,7 @@ ], "measurement": "virt_disk_octets_write", "query": "SELECT mean(\"value\") FROM \"virt_disk_octets_write\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"device\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1913,6 +1934,7 @@ ], "measurement": "virt_if_octets_rx", "query": "SELECT mean(\"value\") FROM \"virt_if_octets_rx\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"interface\" =~ /$interface$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1968,6 +1990,7 @@ ], "measurement": "virt_if_octets_tx", "query": "SELECT mean(\"value\") FROM \"virt_if_octets_tx\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"interface\" =~ /$interface$/ AND $timeFilter GROUP BY time($interval) fill(none)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2031,6 +2054,19 @@ "tags": [], "templating": { "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -2040,7 +2076,7 @@ "multiFormat": "glob", "name": "hostname", "options": [], - "query": "show tag values from openstack_nova_running_instances with key = hostname", + "query": "show tag values from openstack_nova_running_instances with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -2123,5 +2159,5 @@ }, "timezone": "browser", "title": "Hypervisor", - "version": 1 -} \ No newline at end of file + "version": 2 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json index be81ef1a..0f21a2d2 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -303,6 +308,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -348,6 +354,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -393,6 +400,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -438,6 +446,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -552,6 +561,7 @@ "groupByTags": [], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'keystone-public-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -570,6 +580,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -701,6 +716,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -747,6 +763,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -793,6 +810,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -839,6 +857,7 @@ "interval": "", "measurement": "openstack_keystone_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_keystone_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -959,6 +978,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'keystone-public-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -977,6 +997,11 @@ ], "series": "merge(/haproxy.backend.keystone-public-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "keystone-public-api" @@ -1054,6 +1079,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'keystone-admin-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1072,6 +1098,11 @@ ], "series": "merge(/haproxy.backend.keystone-admin-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "keystone-admin-api" @@ -1173,6 +1204,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'keystone-public-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1191,6 +1223,11 @@ ], "series": "merge(/haproxy.backend.keystone-public-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "keystone-public-api" @@ -1268,6 +1305,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'keystone-admin-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1286,6 +1324,11 @@ ], "series": "merge(/haproxy.backend.keystone-admin-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "keystone-admin-api" @@ -1384,6 +1427,7 @@ "groupByTags": [], "measurement": "openstack_keystone_users", "query": "SELECT last(\"value\") FROM \"openstack_keystone_users\" WHERE \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1402,6 +1446,11 @@ ], "series": "merge(/openstack.keystone.users.enabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "enabled" @@ -1480,6 +1529,7 @@ ], "measurement": "openstack_keystone_users", "query": "SELECT last(\"value\") FROM \"openstack_keystone_users\" WHERE \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1498,6 +1548,11 @@ ], "series": "merge(/openstack.keystone.users.enabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "operator": "=", @@ -1573,6 +1628,7 @@ "groupByTags": [], "measurement": "openstack_keystone_tenants", "query": "SELECT last(\"value\") FROM \"openstack_keystone_tenants\" WHERE \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1591,6 +1647,11 @@ ], "series": "merge(/openstack.keystone.tenants.enabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "enabled" @@ -1678,6 +1739,7 @@ "groupByTags": [], "measurement": "openstack_keystone_tenants", "query": "SELECT last(\"value\") FROM \"openstack_keystone_tenants\" WHERE \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1696,6 +1758,11 @@ ], "series": "merge(/openstack.keystone.tenants.enabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "enabled" @@ -1730,6 +1797,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -1737,7 +1817,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1782,5 +1862,5 @@ }, "timezone": "browser", "title": "Keystone", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json index 4a022b6f..da7df4d5 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json @@ -4,7 +4,7 @@ }, "editable": true, "hideControls": false, - "id": 6, + "id": null, "links": [], "originalTitle": "LMA self-monitoring", "refresh": "1m", @@ -59,6 +59,7 @@ ], "measurement": "lma_components_threads", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -166,6 +167,7 @@ ], "measurement": "lma_components_memory_rss", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -276,6 +278,7 @@ ], "measurement": "lma_components_disk_bytes_read", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -325,6 +328,7 @@ ], "measurement": "lma_components_disk_bytes_write", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -433,6 +437,7 @@ ], "measurement": "lma_components_cputime_syst", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -482,6 +487,7 @@ ], "measurement": "lma_components_cputime_user", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -605,7 +611,7 @@ ], "hide": false, "measurement": "hekad_msg_count", - "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval), \"name\" fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -724,6 +730,7 @@ ], "measurement": "hekad_msg_avg_duration", "query": "SELECT mean(\"value\") FROM \"hekad_msg_avg_duration\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -845,6 +852,7 @@ "hide": false, "measurement": "hekad_memory", "query": "SELECT mean(\"value\") FROM \"hekad_memory\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -966,7 +974,7 @@ } ], "measurement": "hekad_msg_count", - "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval), \"name\" fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1085,6 +1093,7 @@ ], "measurement": "hekad_msg_avg_duration", "query": "SELECT mean(\"value\") FROM \"hekad_msg_avg_duration\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1206,6 +1215,7 @@ "hide": false, "measurement": "hekad_memory", "query": "SELECT mean(\"value\") FROM \"hekad_memory\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1322,7 +1332,7 @@ ], "hide": false, "measurement": "hekad_timer_event_count", - "query": "SELECT derivative(first(value),1s) AS \"first(value),1s\" FROM \"hekad_timer_event_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "query": "SELECT derivative(first(value),1s) AS \"first(value),1s\" FROM \"hekad_timer_event_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval), \"name\" fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1441,6 +1451,7 @@ ], "measurement": "hekad_timer_event_avg_duration", "query": "SELECT mean(\"value\") FROM \"hekad_timer_event_avg_duration\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1541,6 +1552,7 @@ ], "measurement": "lma_components_threads", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1648,6 +1660,7 @@ ], "measurement": "lma_components_memory_rss", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1758,6 +1771,7 @@ ], "measurement": "lma_components_disk_bytes_read", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1807,6 +1821,7 @@ ], "measurement": "lma_components_disk_bytes_write", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1915,6 +1930,7 @@ ], "measurement": "lma_components_cputime_syst", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1964,6 +1980,7 @@ ], "measurement": "lma_components_cputime_user", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2062,6 +2079,7 @@ ], "measurement": "lma_components_threads", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2079,6 +2097,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2164,6 +2187,7 @@ ], "measurement": "lma_components_memory_rss", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2181,6 +2205,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2269,6 +2298,7 @@ ], "measurement": "lma_components_disk_bytes_read", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2286,6 +2316,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2313,6 +2348,7 @@ ], "measurement": "lma_components_disk_bytes_write", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2330,6 +2366,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2416,6 +2457,7 @@ ], "measurement": "lma_components_cputime_syst", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2433,6 +2475,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2460,6 +2507,7 @@ ], "measurement": "lma_components_cputime_user", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'influxd' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2477,6 +2525,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "influxd" @@ -2542,6 +2595,7 @@ ], "measurement": "fs_space_percent_free", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"fs\" = '/var/lib/influxdb' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2559,6 +2613,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "fs", "operator": "=", @@ -2660,6 +2719,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "fs", "operator": "=", @@ -2704,6 +2768,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "fs", "operator": "=", @@ -2748,6 +2817,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "fs", "operator": "=", @@ -2825,6 +2899,7 @@ ], "measurement": "lma_components_threads", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2842,6 +2917,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -2927,6 +3007,7 @@ ], "measurement": "lma_components_memory_rss", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2944,6 +3025,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -3032,6 +3118,7 @@ ], "measurement": "lma_components_disk_bytes_read", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3049,6 +3136,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -3076,6 +3168,7 @@ ], "measurement": "lma_components_disk_bytes_write", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3093,6 +3186,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -3179,6 +3277,7 @@ ], "measurement": "lma_components_cputime_syst", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3196,6 +3295,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -3223,6 +3327,7 @@ ], "measurement": "lma_components_cputime_user", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'grafana-server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3240,6 +3345,11 @@ ] ], "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "value": "grafana-server" @@ -3274,6 +3384,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -3281,7 +3404,7 @@ "includeAll": false, "name": "node", "options": [], - "query": "show tag values from lma_components_threads with key = \"hostname\"", + "query": "show tag values from lma_components_threads with key = \"hostname\" where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -3326,5 +3449,5 @@ }, "timezone": "browser", "title": "LMA self-monitoring", - "version": 3 -} \ No newline at end of file + "version": 4 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json index 0d75cd6c..97b9e7c0 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json @@ -96,6 +96,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -224,6 +229,11 @@ ], "series": "merge(/openstack.keystone.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -352,6 +362,11 @@ ], "series": "merge(/openstack.glance.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -480,6 +495,11 @@ ], "series": "merge(/openstack.heat.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -608,6 +628,11 @@ ], "series": "merge(/openstack.neutron.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -736,6 +761,11 @@ ], "series": "merge(/openstack.nova.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -874,6 +904,11 @@ ], "series": "merge(/\\.rabbitmq.status$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -1000,6 +1035,11 @@ ], "series": "merge(/mysql.status$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -1127,6 +1167,11 @@ ], "series": "merge(/mysql.status$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -1254,6 +1299,11 @@ ], "series": "merge(/mysql.status$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -1381,6 +1431,11 @@ ], "series": "merge(/mysql.status$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -1519,7 +1574,13 @@ ] ], "series": "merge(/.*.openstack.nova.total_free_vcpus/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "used", @@ -1561,7 +1622,13 @@ ] ], "series": "merge(/.*.openstack.nova.total_used_vcpus/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1663,7 +1730,13 @@ ] ], "series": "$server.openstack.nova.free_ram", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "used", @@ -1705,7 +1778,13 @@ ] ], "series": "$server.openstack.nova.used_ram", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1806,7 +1885,13 @@ ] ], "series": "$server.openstack.nova.free_disk", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "used", @@ -1848,7 +1933,13 @@ ] ], "series": "$server.openstack.nova.used_disk", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1987,6 +2078,7 @@ "groupByTags": [], "measurement": "cpu_idle", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2034,6 +2126,7 @@ "groupByTags": [], "measurement": "cpu_interrupt", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2081,6 +2174,7 @@ "groupByTags": [], "measurement": "cpu_nice", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -2128,6 +2222,7 @@ "groupByTags": [], "measurement": "cpu_system", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -2175,6 +2270,7 @@ "groupByTags": [], "measurement": "cpu_steal", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "F", "resultFormat": "time_series", "select": [ @@ -2222,6 +2318,7 @@ "groupByTags": [], "measurement": "cpu_wait", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "G", "resultFormat": "time_series", "select": [ @@ -2339,6 +2436,7 @@ "interval": "", "measurement": "memory_used", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2387,6 +2485,7 @@ "interval": "", "measurement": "memory_buffered", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2435,6 +2534,7 @@ "interval": "", "measurement": "memory_cached", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2483,6 +2583,7 @@ "interval": "", "measurement": "memory_free", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -2577,7 +2678,7 @@ ], "groupByTags": [], "measurement": "fs_space_percent_free", - "query": "SELECT last(value) FROM \"fs_space_percent_free\" WHERE \"hostname\" = '$controller' AND \"fs\" = '/' AND $timeFilter GROUP BY time($interval)", + "query": "SELECT last(value) FROM \"fs_space_percent_free\" WHERE \"hostname\" = '$controller' AND \"fs\" = '/' AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -2709,7 +2810,13 @@ ] ], "series": "merge(/ceph.cluster-ceph.health/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "1,2,3", @@ -2812,7 +2919,13 @@ ] ], "series": "", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -2898,7 +3011,13 @@ ] ], "series": "merge(/$controller.ceph.cluster-ceph.pool.*.objects/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -2966,6 +3085,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_up", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_up\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2983,7 +3103,13 @@ ] ], "series": "/$controller.ceph.cluster-ceph.osd.up/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -3051,6 +3177,7 @@ "groupByTags": [], "measurement": "ceph_osd_count_down", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_down\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3068,7 +3195,13 @@ ] ], "series": "/$controller.ceph.cluster-ceph.osd.down/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -3096,6 +3229,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -3103,7 +3249,7 @@ "includeAll": false, "name": "controller", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -3148,5 +3294,5 @@ }, "timezone": "browser", "title": "Main", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json index 461af419..41cce072 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json @@ -103,6 +103,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -221,6 +226,7 @@ ], "measurement": "memcached_items_current", "query": "SELECT mean(\"value\") FROM \"memcached_items_current\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -238,7 +244,13 @@ ] ], "series": "/memcached.items.current/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -323,6 +335,7 @@ ], "measurement": "memcached_df_cache_used", "query": "SELECT mean(\"value\") FROM \"memcached_df_cache_used\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -340,7 +353,13 @@ ] ], "series": "/memcached.df.cache.used/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -432,6 +451,7 @@ "groupByTags": [], "measurement": "memcached_command_get", "query": "SELECT mean(\"value\") FROM \"memcached_command_get\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -449,7 +469,13 @@ ] ], "series": "merge(/memcached.command.get/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "set", @@ -492,7 +518,13 @@ ] ], "series": "merge(/memcached.command.set/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -577,6 +609,7 @@ ], "measurement": "memcached_df_cache_free", "query": "SELECT mean(\"value\") FROM \"memcached_df_cache_free\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -594,7 +627,13 @@ ] ], "series": "/memcached.df.cache.free/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -706,6 +745,7 @@ "interval": "", "measurement": "memcached_percent_hitratio", "query": "SELECT mean(\"value\") FROM \"memcached_percent_hitratio\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -723,7 +763,13 @@ ] ], "series": "/memcached.percent.hitratio/", - "tags": [], + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ], "target": "" } ], @@ -836,7 +882,13 @@ ] ], "series": "merge(/memcached.ops.hits/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "misses", @@ -880,7 +932,13 @@ ] ], "series": "merge(/memcached.ops.misses/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "evictions", @@ -904,6 +962,7 @@ "groupByTags": [], "measurement": "memcached_ops_evictions", "query": "SELECT mean(\"value\") FROM \"memcached_ops_evictions\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -921,7 +980,13 @@ ] ], "series": "merge(/memcached.ops.evictions/)", - "tags": [], + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ], "target": "" } ], @@ -1045,7 +1110,13 @@ ] ], "series": "/memcached.octets.rx/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "$tag_hostname.rx", @@ -1090,7 +1161,13 @@ ] ], "series": "/memcached.octets.rx/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1180,6 +1257,7 @@ "interval": "", "measurement": "memcached_connections_current", "query": "SELECT mean(\"value\") FROM \"memcached_connections_current\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1197,7 +1275,13 @@ ] ], "series": "/memcached.connections/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1224,7 +1308,21 @@ "style": "dark", "tags": [], "templating": { - "list": [] + "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + } + ] }, "time": { "from": "now-1h", @@ -1263,5 +1361,5 @@ }, "timezone": "browser", "title": "Memcached", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json index c4019635..776d3dfd 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -370,6 +375,7 @@ "groupByTags": [], "measurement": "mysql_locks_immediate", "query": "SELECT mean(\"value\") FROM \"mysql_locks_immediate\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -387,7 +393,13 @@ ] ], "series": "/$server.mysql_locks/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "waited", @@ -411,6 +423,7 @@ "groupByTags": [], "measurement": "mysql_locks_waited", "query": "SELECT mean(\"value\") FROM \"mysql_locks_waited\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -428,7 +441,13 @@ ] ], "series": "/$server.mysql_locks/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -713,6 +732,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'commit' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -764,6 +784,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'delete' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -815,6 +836,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'insert' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -866,6 +888,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'select' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -917,6 +940,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'rollback' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -968,6 +992,7 @@ "groupByTags": [], "measurement": "mysql_commands", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'update' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "F", "resultFormat": "time_series", "select": [ @@ -1081,6 +1106,7 @@ ], "measurement": "mysql_handler", "query": "SELECT mean(\"value\") FROM \"mysql_handler\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1132,6 +1158,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -1139,7 +1178,7 @@ "includeAll": false, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname ", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1184,5 +1223,5 @@ }, "timezone": "browser", "title": "MySQL", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json index d835d4b7..05d48df9 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json @@ -19,7 +19,7 @@ }, "editable": true, "hideControls": false, - "id": 15, + "id": null, "links": [], "originalTitle": "Neutron", "refresh": "1m", @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -319,6 +324,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -371,6 +377,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -423,6 +430,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -475,6 +483,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -587,6 +596,7 @@ "groupByTags": [], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'neutron-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -605,6 +615,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -752,6 +767,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -805,6 +821,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -858,6 +875,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -911,6 +929,7 @@ "interval": "", "measurement": "openstack_neutron_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_neutron_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1029,6 +1048,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'neutron-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1047,6 +1067,11 @@ ], "series": "merge(/haproxy.backend.neutron-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "neutron-api" @@ -1148,6 +1173,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'neutron-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1166,6 +1192,11 @@ ], "series": "merge(/haproxy.backend.neutron-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "neutron-api" @@ -1277,6 +1308,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'dhcp' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1295,6 +1327,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1375,6 +1412,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'dhcp' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1393,6 +1431,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1473,6 +1516,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'dhcp' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1491,6 +1535,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1575,7 +1624,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter and service = 'dhcp' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'dhcp' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -1667,6 +1716,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'l3' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1685,6 +1735,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1765,6 +1820,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'l3' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1783,6 +1839,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1863,6 +1924,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'l3' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1881,6 +1943,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1965,7 +2032,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter and service = 'l3' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'l3' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2057,6 +2124,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'metadata' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2075,6 +2143,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2155,6 +2228,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'metadata' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2173,6 +2247,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2253,6 +2332,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'metadata' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2271,6 +2351,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2355,7 +2440,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter and service = 'metadata' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'metadata' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2447,6 +2532,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'openvswitch' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2465,6 +2551,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2545,6 +2636,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'openvswitch' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2563,6 +2655,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2643,6 +2740,7 @@ ], "measurement": "openstack_neutron_agents", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"service\" = 'openvswitch' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2661,6 +2759,11 @@ ], "series": "merge(/openstack.neutron.agents.dhcp.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2745,7 +2848,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter and service = 'openvswitch' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'openvswitch' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2854,6 +2957,11 @@ ], "series": "merge(/openstack.neutron.networks$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -2943,6 +3051,7 @@ ], "measurement": "openstack_neutron_networks", "query": "SELECT last(\"value\") FROM \"openstack_neutron_networks\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2960,7 +3069,13 @@ ] ], "series": "merge(/openstack.neutron.networks$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3048,7 +3163,13 @@ ] ], "series": "merge(/openstack.neutron.subnets$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -3131,6 +3252,7 @@ "groupByTags": [], "measurement": "openstack_neutron_subnets", "query": "SELECT last(\"value\") FROM \"openstack_neutron_subnets\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3148,7 +3270,13 @@ ] ], "series": "merge(/openstack.neutron.subnets$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3237,6 +3365,11 @@ ], "series": "merge(/openstack.neutron.ports$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "owner", "value": "compute" @@ -3331,6 +3464,7 @@ ], "measurement": "openstack_neutron_ports", "query": "SELECT last(\"value\") FROM \"openstack_neutron_ports\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3348,7 +3482,13 @@ ] ], "series": "merge(/openstack.neutron.ports$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3438,6 +3578,11 @@ ], "series": "merge(/openstack.neutron.routers$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -3527,6 +3672,7 @@ ], "measurement": "openstack_neutron_routers", "query": "SELECT last(\"value\") FROM \"openstack_neutron_routers\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3544,7 +3690,13 @@ ] ], "series": "merge(/openstack.neutron.routers$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3633,6 +3785,11 @@ ], "series": "merge(/openstack.neutron.floatingips$/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "associated" @@ -3721,6 +3878,7 @@ ], "measurement": "openstack_neutron_floatingips", "query": "SELECT last(\"value\") FROM \"openstack_neutron_floatingips\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3738,7 +3896,13 @@ ] ], "series": "merge(/openstack.neutron.floatingips$/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -3768,6 +3932,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -3775,7 +3952,7 @@ "includeAll": true, "name": "server", "options": [], - "query": " show tag values from pacemaker_local_resource_active with key = hostname ", + "query": " show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json index 1aae58f6..e4d3ac35 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json @@ -19,7 +19,7 @@ }, "editable": true, "hideControls": false, - "id": 17, + "id": null, "links": [], "originalTitle": "Nova", "refresh": "1m", @@ -104,6 +104,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -318,6 +323,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -370,6 +376,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -422,6 +429,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -474,6 +482,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT mean(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -586,6 +595,7 @@ "groupByTags": [], "measurement": "openstack_check_api", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"service\" = 'nova-api' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -604,6 +614,11 @@ ], "series": "merge(/openstack.cinder.check_api/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -751,6 +766,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^1/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -804,6 +820,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^3/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -857,6 +874,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^4/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -910,6 +928,7 @@ "interval": "", "measurement": "openstack_nova_http_responses", "query": "SELECT count(\"value\") FROM \"openstack_nova_http_responses\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" =~ /^5/ AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1029,6 +1048,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1047,6 +1067,11 @@ ], "series": "merge(/haproxy.backend.nova-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-api" @@ -1125,6 +1150,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-ec2-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1143,6 +1169,11 @@ ], "series": "merge(/haproxy.backend.nova-ec2-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-ec2-api" @@ -1221,6 +1252,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-metadata-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1239,6 +1271,11 @@ ], "series": "merge(/haproxy.backend.nova-metadata-api.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-metadata-api" @@ -1317,6 +1354,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-novncproxy-websocket' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1335,6 +1373,11 @@ ], "series": "merge(/haproxy.backend.nova-novncproxy-websocket.servers.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-novncproxy-websocket" @@ -1437,6 +1480,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1455,6 +1499,11 @@ ], "series": "merge(/haproxy.backend.nova-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-api" @@ -1533,6 +1582,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-ec2-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1551,6 +1601,11 @@ ], "series": "merge(/haproxy.backend.nova-ec2-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-ec2-api" @@ -1629,6 +1684,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-metadata-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1647,6 +1703,11 @@ ], "series": "merge(/haproxy.backend.nova-metadata-api.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-metadata-api" @@ -1725,6 +1786,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"backend\" = 'nova-novncproxy-websocket' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1743,6 +1805,11 @@ ], "series": "merge(/haproxy.backend.nova-novncproxy-websocket.servers.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "backend", "value": "nova-novncproxy-websocket" @@ -1854,6 +1921,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'compute' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1872,6 +1940,11 @@ ], "series": "merge(/openstack.nova.services.compute.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -1952,6 +2025,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'compute' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1970,6 +2044,11 @@ ], "series": "merge(/openstack.nova.services.compute.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2050,6 +2129,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'compute' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2068,6 +2148,11 @@ ], "series": "merge(/openstack.nova.services.compute.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2152,7 +2237,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter and service = 'compute' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'compute' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2244,6 +2329,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'scheduler' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2262,6 +2348,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2342,6 +2433,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'scheduler' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2360,6 +2452,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2440,6 +2537,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'scheduler' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2458,6 +2556,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2542,7 +2645,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter and service = 'scheduler' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'scheduler' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2634,6 +2737,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'conductor' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2652,6 +2756,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2732,6 +2841,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'conductor' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2750,6 +2860,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2830,6 +2945,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'conductor' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2848,6 +2964,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -2932,7 +3053,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter and service = 'conductor' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'conductor' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -3024,6 +3145,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'cert' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3042,6 +3164,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3122,6 +3249,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'cert' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3140,6 +3268,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3220,6 +3353,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'cert' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3238,6 +3372,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3322,7 +3461,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter and service = 'cert' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'cert' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -3414,6 +3553,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'consoleauth' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3432,6 +3572,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.disabled/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3512,6 +3657,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'consoleauth' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3530,6 +3676,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.up/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3610,6 +3761,7 @@ ], "measurement": "openstack_nova_services", "query": "SELECT last(\"value\") FROM \"openstack_nova_services\" WHERE \"service\" = 'consoleauth' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3628,6 +3780,11 @@ ], "series": "merge(/openstack.nova.services.scheduler.down/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "service", "operator": "=", @@ -3712,7 +3869,7 @@ } ], "measurement": "openstack_nova_service", - "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter and service = 'consoleauth' GROUP BY time($interval), hostname fill(0)", + "query": "SELECT state, last(value) FROM \"openstack_nova_service\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'consoleauth' GROUP BY time($interval), hostname fill(0)", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -3801,6 +3958,7 @@ "groupByTags": [], "measurement": "openstack_nova_instances", "query": "SELECT last(\"value\") FROM \"openstack_nova_instances\" WHERE \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3819,6 +3977,11 @@ ], "series": "merge(/openstack.nova.instances.active/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -3906,6 +4069,7 @@ "groupByTags": [], "measurement": "openstack_nova_instances", "query": "SELECT max(\"value\") FROM \"openstack_nova_instances\" WHERE \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3924,6 +4088,11 @@ ], "series": "merge(/openstack.nova.instances.active/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "active" @@ -3999,6 +4168,7 @@ "groupByTags": [], "measurement": "openstack_nova_instances", "query": "SELECT last(\"value\") FROM \"openstack_nova_instances\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4017,6 +4187,11 @@ ], "series": "merge(/openstack.nova.instances.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -4103,6 +4278,7 @@ "groupByTags": [], "measurement": "openstack_nova_instances", "query": "SELECT max(\"value\") FROM \"openstack_nova_instances\" WHERE \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4121,6 +4297,11 @@ ], "series": "merge(/openstack.nova.instances.error/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "state", "value": "error" @@ -4196,6 +4377,7 @@ "groupByTags": [], "measurement": "openstack_nova_instance_creation_time", "query": "SELECT mean(\"value\") FROM \"openstack_nova_instance_creation_time\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4213,7 +4395,13 @@ ] ], "series": "merge(/openstack.nova.instance_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4316,7 +4504,13 @@ ] ], "series": "merge(/openstack.nova.instance_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "max", @@ -4359,7 +4553,13 @@ ] ], "series": "merge(/openstack.nova.instance_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] }, { "alias": "min", @@ -4402,7 +4602,13 @@ ] ], "series": "merge(/openstack.nova.instance_creation_time/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -4494,6 +4700,7 @@ "groupByTags": [], "measurement": "openstack_nova_total_used_vcpus", "query": "SELECT last(\"value\") FROM \"openstack_nova_total_used_vcpus\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4511,7 +4718,13 @@ ] ], "series": "merge(/openstack.nova.total_used_vcpus/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4598,7 +4811,13 @@ ] ], "series": "merge(/openstack.nova.total_used_disk/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4685,7 +4904,13 @@ ] ], "series": "merge(/openstack.nova.total_used_ram/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4778,6 +5003,7 @@ "groupByTags": [], "measurement": "openstack_nova_total_free_vcpus", "query": "SELECT last(\"value\") FROM \"openstack_nova_total_free_vcpus\" WHERE $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -4795,7 +5021,13 @@ ] ], "series": "merge(/openstack.nova.total_free_vcpus/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4882,7 +5114,13 @@ ] ], "series": "merge(/openstack.nova.total_free_disk/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -4969,7 +5207,13 @@ ] ], "series": "merge(/openstack.nova.total_free_ram/)", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "thresholds": "", @@ -5009,6 +5253,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -5016,7 +5273,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname ", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", @@ -5061,5 +5318,5 @@ }, "timezone": "browser", "title": "Nova", - "version": 9 + "version": 10 } diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json index c3afaf5c..69ef692b 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json @@ -103,6 +103,11 @@ ], "series": "merge(/openstack.cinder.status/)", "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + }, { "key": "cluster_name", "operator": "=", @@ -202,6 +207,7 @@ "groupByTags": [], "measurement": "rabbitmq_total_nodes", "query": "SELECT last(\"value\") FROM \"rabbitmq_total_nodes\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -293,6 +299,7 @@ "groupByTags": [], "measurement": "rabbitmq_running_nodes", "query": "SELECT last(\"value\") FROM \"rabbitmq_running_nodes\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -403,6 +410,7 @@ "groupByTags": [], "measurement": "rabbitmq_consumers", "query": "SELECT last(\"value\") FROM \"rabbitmq_consumers\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -494,6 +502,7 @@ "groupByTags": [], "measurement": "rabbitmq_queues", "query": "SELECT last(\"value\") FROM \"rabbitmq_queues\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -585,6 +594,7 @@ "groupByTags": [], "measurement": "rabbitmq_connections", "query": "SELECT last(\"value\") FROM \"rabbitmq_connections\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -675,6 +685,7 @@ "groupByTags": [], "measurement": "rabbitmq_exchanges", "query": "SELECT last(\"value\") FROM \"rabbitmq_exchanges\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -799,7 +810,13 @@ ] ], "series": "/$server.rabbitmq.memory/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -885,6 +902,7 @@ ], "measurement": "rabbitmq_messages", "query": "SELECT mean(\"value\") FROM \"rabbitmq_messages\" WHERE $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -902,7 +920,13 @@ ] ], "series": "/$server.rabbitmq.messages/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1005,7 +1029,13 @@ ] ], "series": "/$server.rabbitmq.memory/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1108,7 +1138,13 @@ ] ], "series": "/$server.rabbitmq.memory/", - "tags": [] + "tags": [ + { + "key": "environment_label", + "operator": "=", + "value": "$environment" + } + ] } ], "timeFrom": null, @@ -1137,6 +1173,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "regex values", "current": {}, @@ -1144,7 +1193,7 @@ "includeAll": true, "name": "server", "options": [], - "query": "show tag values from pacemaker_local_resource_active with key = hostname ", + "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", "refresh": true, "refresh_on_load": true, "regex": "", @@ -1189,5 +1238,5 @@ }, "timezone": "browser", "title": "RabbitMQ", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json index 07bf7e3a..3621bb14 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json @@ -126,6 +126,7 @@ "groupByTags": [], "measurement": "cpu_idle", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -173,6 +174,7 @@ "groupByTags": [], "measurement": "cpu_interrupt", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -220,6 +222,7 @@ "groupByTags": [], "measurement": "cpu_nice", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -267,6 +270,7 @@ "groupByTags": [], "measurement": "cpu_system", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -314,6 +318,7 @@ "groupByTags": [], "measurement": "cpu_steal", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "F", "resultFormat": "time_series", "select": [ @@ -361,6 +366,7 @@ "groupByTags": [], "measurement": "cpu_wait", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "G", "resultFormat": "time_series", "select": [ @@ -478,6 +484,7 @@ "interval": "", "measurement": "memory_used", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -526,6 +533,7 @@ "interval": "", "measurement": "memory_buffered", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -574,6 +582,7 @@ "interval": "", "measurement": "memory_cached", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -622,6 +631,7 @@ "interval": "", "measurement": "memory_free", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -730,6 +740,7 @@ "groupByTags": [], "measurement": "load_shortterm", "query": "SELECT mean(\"value\") FROM \"load_shortterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -776,6 +787,7 @@ "groupByTags": [], "measurement": "load_midterm", "query": "SELECT mean(\"value\") FROM \"load_midterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -822,6 +834,7 @@ "groupByTags": [], "measurement": "load_longterm", "query": "SELECT mean(\"value\") FROM \"load_longterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -934,6 +947,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'blocked' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -985,6 +999,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'paging' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1036,6 +1051,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'running' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -1087,6 +1103,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'sleeping' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "D", "resultFormat": "time_series", "select": [ @@ -1138,6 +1155,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'stopped' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "E", "resultFormat": "time_series", "select": [ @@ -1189,6 +1207,7 @@ "groupByTags": [], "measurement": "processes_count", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'zombies' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "F", "resultFormat": "time_series", "select": [ @@ -1300,6 +1319,7 @@ "groupByTags": [], "measurement": "processes_fork_rate", "query": "SELECT max(\"value\") FROM \"processes_fork_rate\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1612,6 +1632,7 @@ "interval": "", "measurement": "fs_space_used", "query": "SELECT mean(\"value\") FROM \"fs_space_used\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1665,6 +1686,7 @@ "interval": "", "measurement": "fs_space_reserved", "query": "SELECT mean(\"value\") FROM \"fs_space_reserved\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -1718,6 +1740,7 @@ "interval": "", "measurement": "fs_space_free", "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -1938,6 +1961,7 @@ "interval": "", "measurement": "fs_inodes_used", "query": "SELECT mean(\"value\") FROM \"fs_inodes_used\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -1991,6 +2015,7 @@ "interval": "", "measurement": "fs_inodes_reserved", "query": "SELECT mean(\"value\") FROM \"fs_inodes_reserved\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2044,6 +2069,7 @@ "interval": "", "measurement": "fs_inodes_free", "query": "SELECT mean(\"value\") FROM \"fs_inodes_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -2167,6 +2193,7 @@ "groupByTags": [], "measurement": "disk_merged_read", "query": "SELECT max(\"value\") FROM \"disk_merged_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2218,6 +2245,7 @@ "groupByTags": [], "measurement": "disk_merged_write", "query": "SELECT max(\"value\") FROM \"disk_merged_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2329,6 +2357,7 @@ "groupByTags": [], "measurement": "disk_ops_read", "query": "SELECT max(\"value\") FROM \"disk_ops_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2380,6 +2409,7 @@ "groupByTags": [], "measurement": "disk_ops_write", "query": "SELECT max(\"value\") FROM \"disk_ops_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2491,6 +2521,7 @@ "groupByTags": [], "measurement": "disk_octets_read", "query": "SELECT max(\"value\") FROM \"disk_octets_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2542,6 +2573,7 @@ "groupByTags": [], "measurement": "disk_octets_write", "query": "SELECT max(\"value\") FROM \"disk_octets_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2662,6 +2694,7 @@ "groupByTags": [], "measurement": "if_octets_rx", "query": "SELECT max(\"value\") FROM \"if_octets_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2713,6 +2746,7 @@ "groupByTags": [], "measurement": "if_octets_tx", "query": "SELECT max(\"value\") FROM \"if_octets_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2824,6 +2858,7 @@ "groupByTags": [], "measurement": "if_packets_rx", "query": "SELECT max(\"value\") FROM \"if_packets_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2875,6 +2910,7 @@ "groupByTags": [], "measurement": "if_packets_tx", "query": "SELECT max(\"value\") FROM \"if_packets_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -2986,6 +3022,7 @@ "groupByTags": [], "measurement": "if_errors_rx", "query": "SELECT max(\"value\") FROM \"if_errors_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3037,6 +3074,7 @@ "groupByTags": [], "measurement": "if_errors_tx", "query": "SELECT max(\"value\") FROM \"if_errors_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3156,6 +3194,7 @@ "groupByTags": [], "measurement": "swap_used", "query": "SELECT mean(\"value\") FROM \"swap_used\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3202,6 +3241,7 @@ "groupByTags": [], "measurement": "swap_cached", "query": "SELECT mean(\"value\") FROM \"swap_cached\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3248,6 +3288,7 @@ "groupByTags": [], "measurement": "swap_free", "query": "SELECT mean(\"value\") FROM \"swap_free\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "C", "resultFormat": "time_series", "select": [ @@ -3354,6 +3395,7 @@ "groupByTags": [], "measurement": "swap_io_out", "query": "SELECT max(\"value\") FROM \"swap_io_out\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -3400,6 +3442,7 @@ "groupByTags": [], "measurement": "swap_io_in", "query": "SELECT max(\"value\") FROM \"swap_io_in\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ @@ -3452,6 +3495,19 @@ "templating": { "enable": true, "list": [ + { + "allFormat": "regex values", + "current": {}, + "datasource": null, + "includeAll": false, + "name": "environment", + "options": [], + "query": "show tag values from cpu_idle with key = environment_label", + "refresh": true, + "refresh_on_load": true, + "regex": "", + "type": "query" + }, { "allFormat": "glob", "current": {}, @@ -3459,7 +3515,7 @@ "includeAll": false, "name": "server", "options": [], - "query": "show tag values from cpu_idle with key=\"hostname\"", + "query": "show tag values from cpu_idle with key=\"hostname\" where environment_label = '$environment'", "refresh": true, "refresh_on_load": true, "regex": "", @@ -3543,5 +3599,5 @@ }, "timezone": "browser", "title": "System", - "version": 2 -} \ No newline at end of file + "version": 3 +}