diff --git a/salt/grafana/panels/cpu_docker_combined.json.jinja b/salt/grafana/panels/cpu_docker_combined.json.jinja index 4f804d38d..161b4c526 100644 --- a/salt/grafana/panels/cpu_docker_combined.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined.json.jinja @@ -19,7 +19,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -63,7 +63,7 @@ ] ], "measurement": "docker_container_cpu", - "query": "SELECT mean(\"usage_percent\") /8 FROM \"docker_container_cpu\" WHERE (\"host\" = 'jppce2360sa-influx-scripts' AND \"container_name\" = 'so-elasticsearch') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_percent\") /8 FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-elasticsearch') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "hide": false, "alias": "elasticsearch" @@ -78,7 +78,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -134,7 +134,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -190,7 +190,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -246,7 +246,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -302,7 +302,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -358,7 +358,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -414,7 +414,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", @@ -470,7 +470,7 @@ { "key": "host", "operator": "=", - "value": "jppce2360sa-influx-scripts" + "value": "$servername" }, { "condition": "AND", diff --git a/salt/grafana/panels/cpu_usage_idle.json.jinja b/salt/grafana/panels/cpu_usage_idle.json.jinja index e83dee734..e786fe786 100644 --- a/salt/grafana/panels/cpu_usage_idle.json.jinja +++ b/salt/grafana/panels/cpu_usage_idle.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -158,7 +158,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -173,7 +173,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - CPU", + "title": "$servername - CPU", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/cpu_usage_tasks.json.jinja b/salt/grafana/panels/cpu_usage_tasks.json.jinja index 014e10ee7..85909264f 100644 --- a/salt/grafana/panels/cpu_usage_tasks.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks.json.jinja @@ -77,7 +77,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -99,7 +99,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -129,7 +129,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -151,7 +151,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -181,7 +181,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "C", "resultFormat": "time_series", @@ -203,7 +203,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -233,7 +233,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -255,7 +255,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -285,7 +285,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": true, "refId": "E", "resultFormat": "time_series", @@ -307,7 +307,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -337,7 +337,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": true, "refId": "F", "resultFormat": "time_series", @@ -359,7 +359,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -390,7 +390,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "G", "resultFormat": "time_series", @@ -412,7 +412,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -443,7 +443,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "H", "resultFormat": "time_series", @@ -465,7 +465,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -496,7 +496,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "I", "resultFormat": "time_series", @@ -518,7 +518,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -549,7 +549,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "J", "resultFormat": "time_series", @@ -571,7 +571,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -602,7 +602,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "K", "resultFormat": "time_series", @@ -624,7 +624,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -655,7 +655,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '$servername' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "L", "resultFormat": "time_series", @@ -677,7 +677,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -690,7 +690,7 @@ ], "thresholds": [], "timeRegions": [], - "title": "{{ SERVERNAME }} - CPU Usage", + "title": "$servername - CPU Usage", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/disk_io.json.jinja b/salt/grafana/panels/disk_io.json.jinja index dde4a55a4..9aedaceb9 100644 --- a/salt/grafana/panels/disk_io.json.jinja +++ b/salt/grafana/panels/disk_io.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -149,7 +149,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -198,7 +198,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -247,7 +247,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -256,7 +256,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Disk I/O", + "title": "$servername - Disk I/O", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/disk_used_nsm.json.jinja b/salt/grafana/panels/disk_used_nsm.json.jinja index cce953ecb..495ad69ff 100644 --- a/salt/grafana/panels/disk_used_nsm.json.jinja +++ b/salt/grafana/panels/disk_used_nsm.json.jinja @@ -90,7 +90,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -140,7 +140,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -155,7 +155,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Disk Used(/nsm)", + "title": "$servername - Disk Used(/nsm)", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/disk_used_root.json.jinja b/salt/grafana/panels/disk_used_root.json.jinja index c4c76ada3..0743382f2 100644 --- a/salt/grafana/panels/disk_used_root.json.jinja +++ b/salt/grafana/panels/disk_used_root.json.jinja @@ -90,7 +90,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -140,7 +140,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -155,7 +155,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Disk Used(/)", + "title": "$servername - Disk Used(/)", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja index a8a9230f4..081ab68f0 100644 --- a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja +++ b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -158,7 +158,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -173,7 +173,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - ES CPU Usage", + "title": "$servername - ES CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/elasticsearch_documents_count.json.jinja b/salt/grafana/panels/elasticsearch_documents_count.json.jinja index 91c33396d..d34af37b7 100644 --- a/salt/grafana/panels/elasticsearch_documents_count.json.jinja +++ b/salt/grafana/panels/elasticsearch_documents_count.json.jinja @@ -103,13 +103,13 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } ], "thresholds": "", - "title": "{{ SERVERNAME }} - ES Documents", + "title": "$servername - ES Documents", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ diff --git a/salt/grafana/panels/elasticsearch_field_data_cache_size.json.jinja b/salt/grafana/panels/elasticsearch_field_data_cache_size.json.jinja index 39ac53c91..a9b6b9473 100644 --- a/salt/grafana/panels/elasticsearch_field_data_cache_size.json.jinja +++ b/salt/grafana/panels/elasticsearch_field_data_cache_size.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -136,7 +136,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -145,7 +145,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - ES Fielddata Cache Size", + "title": "$servername - ES Fielddata Cache Size", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/elasticsearch_store_size.json.jinja b/salt/grafana/panels/elasticsearch_store_size.json.jinja index fc9d8c435..b98e1bb18 100644 --- a/salt/grafana/panels/elasticsearch_store_size.json.jinja +++ b/salt/grafana/panels/elasticsearch_store_size.json.jinja @@ -95,7 +95,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -140,7 +140,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -149,7 +149,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - ES Store Size", + "title": "$servername - ES Store Size", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/elasticsearch_thread_count.json.jinja b/salt/grafana/panels/elasticsearch_thread_count.json.jinja index cae6a4450..c825c83d0 100644 --- a/salt/grafana/panels/elasticsearch_thread_count.json.jinja +++ b/salt/grafana/panels/elasticsearch_thread_count.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -136,7 +136,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -145,7 +145,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - ES Thread Count", + "title": "$servername - ES Thread Count", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/estimated_eps.json.jinja b/salt/grafana/panels/estimated_eps.json.jinja index 7680f471d..9c0310f20 100644 --- a/salt/grafana/panels/estimated_eps.json.jinja +++ b/salt/grafana/panels/estimated_eps.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -137,7 +137,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -146,7 +146,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Estimated EPS", + "title": "$servername - Estimated EPS", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/influxdb_cpu_usage.json.jinja b/salt/grafana/panels/influxdb_cpu_usage.json.jinja index 5c7adff02..082e7c33b 100644 --- a/salt/grafana/panels/influxdb_cpu_usage.json.jinja +++ b/salt/grafana/panels/influxdb_cpu_usage.json.jinja @@ -98,7 +98,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -154,7 +154,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -169,7 +169,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - InfluxDB CPU Usage", + "title": "$servername - InfluxDB CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/influxdb_size.json.jinja b/salt/grafana/panels/influxdb_size.json.jinja index 6a749245c..dbf7ebc5c 100644 --- a/salt/grafana/panels/influxdb_size.json.jinja +++ b/salt/grafana/panels/influxdb_size.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -136,7 +136,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -145,7 +145,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - InfluxDB Size", + "title": "$servername - InfluxDB Size", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/influxdb_traffic.json.jinja b/salt/grafana/panels/influxdb_traffic.json.jinja index 50002a2a0..758cb0692 100644 --- a/salt/grafana/panels/influxdb_traffic.json.jinja +++ b/salt/grafana/panels/influxdb_traffic.json.jinja @@ -106,7 +106,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -167,7 +167,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -229,7 +229,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -291,7 +291,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -306,7 +306,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - InfluxDB Traffic", + "title": "$servername - InfluxDB Traffic", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/io_wait.json.jinja b/salt/grafana/panels/io_wait.json.jinja index 1c73443a4..e06013bd7 100644 --- a/salt/grafana/panels/io_wait.json.jinja +++ b/salt/grafana/panels/io_wait.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -136,7 +136,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -145,7 +145,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - IO Wait", + "title": "$servername - IO Wait", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/kibana_cpu_usage.json.jinja b/salt/grafana/panels/kibana_cpu_usage.json.jinja index 767a0c012..a468cfaea 100644 --- a/salt/grafana/panels/kibana_cpu_usage.json.jinja +++ b/salt/grafana/panels/kibana_cpu_usage.json.jinja @@ -104,7 +104,7 @@ "condition": "AND", "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -160,7 +160,7 @@ "condition": "AND", "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -169,7 +169,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Kibana CPU Usage", + "title": "$servername - Kibana CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/load_average.json.jinja b/salt/grafana/panels/load_average.json.jinja index db2c6f5c9..203cce76e 100644 --- a/salt/grafana/panels/load_average.json.jinja +++ b/salt/grafana/panels/load_average.json.jinja @@ -106,7 +106,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -150,7 +150,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -194,7 +194,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -238,7 +238,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -282,7 +282,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -327,7 +327,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -372,7 +372,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -417,7 +417,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -426,7 +426,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Load Average", + "title": "$servername - Load Average", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/logstash_cpu_usage.json.jinja b/salt/grafana/panels/logstash_cpu_usage.json.jinja index e0cb24f78..52fc9e0d5 100644 --- a/salt/grafana/panels/logstash_cpu_usage.json.jinja +++ b/salt/grafana/panels/logstash_cpu_usage.json.jinja @@ -98,7 +98,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -154,7 +154,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -169,7 +169,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Logstash CPU Usage", + "title": "$servername - Logstash CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/logstash_traffic.json.jinja b/salt/grafana/panels/logstash_traffic.json.jinja index 61c2900ea..e03009aa1 100644 --- a/salt/grafana/panels/logstash_traffic.json.jinja +++ b/salt/grafana/panels/logstash_traffic.json.jinja @@ -105,7 +105,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -166,7 +166,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -228,7 +228,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -290,7 +290,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -305,7 +305,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Logstash Traffic", + "title": "$servername - Logstash Traffic", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/management_traffic.json.jinja b/salt/grafana/panels/management_traffic.json.jinja index 4cc23903b..c5fda1869 100644 --- a/salt/grafana/panels/management_traffic.json.jinja +++ b/salt/grafana/panels/management_traffic.json.jinja @@ -116,7 +116,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -180,7 +180,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -245,7 +245,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -310,7 +310,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -325,7 +325,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Management Traffic", + "title": "$servername - Management Traffic", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/memory.json.jinja b/salt/grafana/panels/memory.json.jinja index 1daf4aba5..1a8d4d22a 100644 --- a/salt/grafana/panels/memory.json.jinja +++ b/salt/grafana/panels/memory.json.jinja @@ -76,7 +76,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -98,7 +98,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -122,7 +122,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -144,7 +144,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -168,7 +168,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "C", "resultFormat": "time_series", @@ -190,7 +190,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -214,7 +214,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "D", "resultFormat": "time_series", @@ -236,7 +236,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -261,7 +261,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "E", "resultFormat": "time_series", @@ -283,7 +283,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -308,7 +308,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "F", "resultFormat": "time_series", @@ -330,7 +330,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -355,7 +355,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "G", "resultFormat": "time_series", @@ -377,7 +377,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -402,7 +402,7 @@ "measurement": "mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "H", "resultFormat": "time_series", @@ -424,14 +424,14 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } ], "thresholds": [], "timeRegions": [], - "title": "{{ SERVERNAME }} - Memory", + "title": "$servername - Memory", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/memory_used.json.jinja b/salt/grafana/panels/memory_used.json.jinja index 5d8902db8..04ff62c20 100644 --- a/salt/grafana/panels/memory_used.json.jinja +++ b/salt/grafana/panels/memory_used.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -135,7 +135,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -179,7 +179,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -223,7 +223,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -232,7 +232,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Memory(Used)", + "title": "$servername - Memory(Used)", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/monitor_traffic.json.jinja b/salt/grafana/panels/monitor_traffic.json.jinja index c28615bf0..ad3bca4b3 100644 --- a/salt/grafana/panels/monitor_traffic.json.jinja +++ b/salt/grafana/panels/monitor_traffic.json.jinja @@ -116,7 +116,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -181,7 +181,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -196,7 +196,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Monitor Traffic", + "title": "$servername - Monitor Traffic", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/pcap_packet_loss.json.jinja b/salt/grafana/panels/pcap_packet_loss.json.jinja index 58ae81220..0e87fff60 100644 --- a/salt/grafana/panels/pcap_packet_loss.json.jinja +++ b/salt/grafana/panels/pcap_packet_loss.json.jinja @@ -95,7 +95,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -140,7 +140,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -149,7 +149,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - PCAP Packet Loss", + "title": "$servername - PCAP Packet Loss", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/pcap_retention.json.jinja b/salt/grafana/panels/pcap_retention.json.jinja index 7800f99df..3426fe245 100644 --- a/salt/grafana/panels/pcap_retention.json.jinja +++ b/salt/grafana/panels/pcap_retention.json.jinja @@ -95,7 +95,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -140,7 +140,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -149,7 +149,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - PCAP Retention", + "title": "$servername - PCAP Retention", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/processes_states.json.jinja b/salt/grafana/panels/processes_states.json.jinja index 274d86d89..a8aa1970a 100644 --- a/salt/grafana/panels/processes_states.json.jinja +++ b/salt/grafana/panels/processes_states.json.jinja @@ -93,7 +93,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -137,7 +137,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -181,7 +181,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -226,7 +226,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -271,7 +271,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -316,14 +316,14 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } ], "thresholds": [], "timeRegions": [], - "title": "{{ SERVERNAME }} - Processes", + "title": "$servername - Processes", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/proxy_traffic.json.jinja b/salt/grafana/panels/proxy_traffic.json.jinja index a962d4d02..6812b9c57 100644 --- a/salt/grafana/panels/proxy_traffic.json.jinja +++ b/salt/grafana/panels/proxy_traffic.json.jinja @@ -105,7 +105,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -166,7 +166,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -228,7 +228,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -290,7 +290,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -305,7 +305,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Proxy Traffic", + "title": "$servername - Proxy Traffic", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/redis_cpu_usage.json.jinja b/salt/grafana/panels/redis_cpu_usage.json.jinja index 779251d4d..03f396774 100644 --- a/salt/grafana/panels/redis_cpu_usage.json.jinja +++ b/salt/grafana/panels/redis_cpu_usage.json.jinja @@ -72,7 +72,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -100,7 +100,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -130,7 +130,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -158,7 +158,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -173,7 +173,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Redis CPU Usage", + "title": "$servername - Redis CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/redis_memory_usage.json.jinja b/salt/grafana/panels/redis_memory_usage.json.jinja index c7ec96754..4234414bc 100644 --- a/salt/grafana/panels/redis_memory_usage.json.jinja +++ b/salt/grafana/panels/redis_memory_usage.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -142,7 +142,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -157,7 +157,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Redis Memory Usage", + "title": "$servername - Redis Memory Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/redis_queue.json.jinja b/salt/grafana/panels/redis_queue.json.jinja index 723fdf887..4a9b41e85 100644 --- a/salt/grafana/panels/redis_queue.json.jinja +++ b/salt/grafana/panels/redis_queue.json.jinja @@ -93,7 +93,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -137,7 +137,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -146,7 +146,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Redis Queue", + "title": "$servername - Redis Queue", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/stenographer_cpu_usage.json.jinja b/salt/grafana/panels/stenographer_cpu_usage.json.jinja index ba718b48e..9c745f5da 100644 --- a/salt/grafana/panels/stenographer_cpu_usage.json.jinja +++ b/salt/grafana/panels/stenographer_cpu_usage.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -149,7 +149,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -162,7 +162,7 @@ ], "thresholds": [], "timeRegions": [], - "title": "{{ SERVERNAME }} - Steno CPU Usage", + "title": "$servername - Steno CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/stenographer_memory_usage.json.jinja b/salt/grafana/panels/stenographer_memory_usage.json.jinja index 195fc06e7..09e5385b0 100644 --- a/salt/grafana/panels/stenographer_memory_usage.json.jinja +++ b/salt/grafana/panels/stenographer_memory_usage.json.jinja @@ -86,7 +86,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -137,7 +137,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -150,7 +150,7 @@ ], "thresholds": [], "timeRegions": [], - "title": "{{ SERVERNAME }} - Steno Memory Usage", + "title": "$servername - Steno Memory Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/suricata_cpu_usage.json.jinja b/salt/grafana/panels/suricata_cpu_usage.json.jinja index ed6fb881e..b68ca817a 100644 --- a/salt/grafana/panels/suricata_cpu_usage.json.jinja +++ b/salt/grafana/panels/suricata_cpu_usage.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -158,7 +158,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -173,7 +173,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Suri CPU Usage", + "title": "$servername - Suri CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/suricata_memory_usage.json.jinja b/salt/grafana/panels/suricata_memory_usage.json.jinja index 90d2bf038..1a692ec5d 100644 --- a/salt/grafana/panels/suricata_memory_usage.json.jinja +++ b/salt/grafana/panels/suricata_memory_usage.json.jinja @@ -95,7 +95,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -146,7 +146,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -161,7 +161,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Suri Memory Usage", + "title": "$servername - Suri Memory Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/suricata_packet_loss.json.jinja b/salt/grafana/panels/suricata_packet_loss.json.jinja index d8391424b..a854f1a34 100644 --- a/salt/grafana/panels/suricata_packet_loss.json.jinja +++ b/salt/grafana/panels/suricata_packet_loss.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -152,7 +152,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -161,7 +161,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Suricata Packet Loss", + "title": "$servername - Suricata Packet Loss", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/system_uptime.json.jinja b/salt/grafana/panels/system_uptime.json.jinja index 971768aa6..318192edb 100644 --- a/salt/grafana/panels/system_uptime.json.jinja +++ b/salt/grafana/panels/system_uptime.json.jinja @@ -79,13 +79,13 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } ], "timeFrom": null, "timeShift": null, - "title": "{{ SERVERNAME }} - System Uptime", + "title": "$servername - System Uptime", "type": "stat" } diff --git a/salt/grafana/panels/total_threads.json.jinja b/salt/grafana/panels/total_threads.json.jinja index f06fa4de5..dd8ebb231 100644 --- a/salt/grafana/panels/total_threads.json.jinja +++ b/salt/grafana/panels/total_threads.json.jinja @@ -98,7 +98,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -143,7 +143,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -152,7 +152,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Total Threads", + "title": "$servername - Total Threads", "tooltip": { "msResolution": true, "shared": true, diff --git a/salt/grafana/panels/zeek_capture_loss.json.jinja b/salt/grafana/panels/zeek_capture_loss.json.jinja index 2840163bf..c75a8e5d9 100644 --- a/salt/grafana/panels/zeek_capture_loss.json.jinja +++ b/salt/grafana/panels/zeek_capture_loss.json.jinja @@ -92,7 +92,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -136,7 +136,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -145,7 +145,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Zeek Capture Loss", + "title": "$servername - Zeek Capture Loss", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/zeek_cpu_usage.json.jinja b/salt/grafana/panels/zeek_cpu_usage.json.jinja index 29fe89244..1d5e9905f 100644 --- a/salt/grafana/panels/zeek_cpu_usage.json.jinja +++ b/salt/grafana/panels/zeek_cpu_usage.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -158,7 +158,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -173,7 +173,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Zeek CPU Usage", + "title": "$servername - Zeek CPU Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/zeek_memory_usage.json.jinja b/salt/grafana/panels/zeek_memory_usage.json.jinja index 6e890f7b1..502038d26 100644 --- a/salt/grafana/panels/zeek_memory_usage.json.jinja +++ b/salt/grafana/panels/zeek_memory_usage.json.jinja @@ -95,7 +95,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -146,7 +146,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" }, { "condition": "AND", @@ -161,7 +161,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Zeek Memory Usage", + "title": "$servername - Zeek Memory Usage", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/zeek_packet_loss.json.jinja b/salt/grafana/panels/zeek_packet_loss.json.jinja index a91872f8f..ac07f5eb2 100644 --- a/salt/grafana/panels/zeek_packet_loss.json.jinja +++ b/salt/grafana/panels/zeek_packet_loss.json.jinja @@ -101,7 +101,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }, @@ -152,7 +152,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] } @@ -161,7 +161,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "{{ SERVERNAME }} - Zeek Packet Loss", + "title": "$servername - Zeek Packet Loss", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/zeek_restarts_healthcheck.json.jinja b/salt/grafana/panels/zeek_restarts_healthcheck.json.jinja index 881827b11..f609292e6 100644 --- a/salt/grafana/panels/zeek_restarts_healthcheck.json.jinja +++ b/salt/grafana/panels/zeek_restarts_healthcheck.json.jinja @@ -81,7 +81,7 @@ { "key": "host", "operator": "=", - "value": "{{ SERVERNAME }}" + "value": "$servername" } ] }