From 7c80483f6eb17b74a758afa20aa993c6c7d293c5 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 8 Jul 2021 16:39:14 -0400 Subject: [PATCH] change CPUS to $cpucount --- .../panels/cpu_docker_combined.json.jinja | 20 +++++++++---------- .../panels/elasticsearch_cpu_usage.json.jinja | 4 ++-- .../panels/influxdb_cpu_usage.json.jinja | 4 ++-- .../panels/kibana_cpu_usage.json.jinja | 4 ++-- .../panels/logstash_cpu_usage.json.jinja | 4 ++-- .../grafana/panels/redis_cpu_usage.json.jinja | 8 ++++---- .../panels/stenographer_cpu_usage.json.jinja | 4 ++-- .../panels/suricata_cpu_usage.json.jinja | 4 ++-- salt/grafana/panels/zeek_cpu_usage.json.jinja | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/salt/grafana/panels/cpu_docker_combined.json.jinja b/salt/grafana/panels/cpu_docker_combined.json.jinja index 161b4c526..7fe3ed685 100644 --- a/salt/grafana/panels/cpu_docker_combined.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined.json.jinja @@ -57,13 +57,13 @@ { "type": "math", "params": [ - " /8" + " /$cpucount" ] } ] ], "measurement": "docker_container_cpu", - "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)", + "query": "SELECT mean(\"usage_percent\") /$cpucount 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" @@ -116,7 +116,7 @@ { "type": "math", "params": [ - " /8" + " /$cpucount" ] } ] @@ -172,7 +172,7 @@ { "type": "math", "params": [ - " /8" + " /$cpucount" ] } ] @@ -228,7 +228,7 @@ { "type": "math", "params": [ - " /8" + " /$cpucount" ] } ] @@ -284,7 +284,7 @@ { "type": "math", "params": [ - "/8" + "/$cpucount" ] } ] @@ -340,7 +340,7 @@ { "type": "math", "params": [ - "/8" + "/$cpucount" ] } ] @@ -396,7 +396,7 @@ { "type": "math", "params": [ - "/8" + "/$cpucount" ] } ] @@ -452,7 +452,7 @@ { "type": "math", "params": [ - "/8" + "/$cpucount" ] } ] @@ -508,7 +508,7 @@ { "type": "math", "params": [ - "/8" + "/$cpucount" ] } ] diff --git a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja index 081ab68f0..c607fc655 100644 --- a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja +++ b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja @@ -91,7 +91,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -148,7 +148,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/influxdb_cpu_usage.json.jinja b/salt/grafana/panels/influxdb_cpu_usage.json.jinja index 082e7c33b..2fd644446 100644 --- a/salt/grafana/panels/influxdb_cpu_usage.json.jinja +++ b/salt/grafana/panels/influxdb_cpu_usage.json.jinja @@ -88,7 +88,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -144,7 +144,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/kibana_cpu_usage.json.jinja b/salt/grafana/panels/kibana_cpu_usage.json.jinja index a468cfaea..59e9c80b2 100644 --- a/salt/grafana/panels/kibana_cpu_usage.json.jinja +++ b/salt/grafana/panels/kibana_cpu_usage.json.jinja @@ -88,7 +88,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -144,7 +144,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/logstash_cpu_usage.json.jinja b/salt/grafana/panels/logstash_cpu_usage.json.jinja index 52fc9e0d5..1fc128802 100644 --- a/salt/grafana/panels/logstash_cpu_usage.json.jinja +++ b/salt/grafana/panels/logstash_cpu_usage.json.jinja @@ -88,7 +88,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -144,7 +144,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/redis_cpu_usage.json.jinja b/salt/grafana/panels/redis_cpu_usage.json.jinja index 03f396774..0004c39ab 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\") /$cpucount 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", @@ -90,7 +90,7 @@ }, { "params": [ - "/{{ CPUS }}" + "/$cpucount" ], "type": "math" } @@ -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\") /$cpucount 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", @@ -148,7 +148,7 @@ }, { "params": [ - "/{{ CPUS }}" + "/$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/stenographer_cpu_usage.json.jinja b/salt/grafana/panels/stenographer_cpu_usage.json.jinja index 9c745f5da..94a6cf983 100644 --- a/salt/grafana/panels/stenographer_cpu_usage.json.jinja +++ b/salt/grafana/panels/stenographer_cpu_usage.json.jinja @@ -82,7 +82,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -139,7 +139,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/suricata_cpu_usage.json.jinja b/salt/grafana/panels/suricata_cpu_usage.json.jinja index b68ca817a..adb2ef9fc 100644 --- a/salt/grafana/panels/suricata_cpu_usage.json.jinja +++ b/salt/grafana/panels/suricata_cpu_usage.json.jinja @@ -91,7 +91,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -148,7 +148,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } diff --git a/salt/grafana/panels/zeek_cpu_usage.json.jinja b/salt/grafana/panels/zeek_cpu_usage.json.jinja index 1d5e9905f..0a63548da 100644 --- a/salt/grafana/panels/zeek_cpu_usage.json.jinja +++ b/salt/grafana/panels/zeek_cpu_usage.json.jinja @@ -91,7 +91,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" } @@ -148,7 +148,7 @@ }, { "params": [ - " /{{ CPUS }}" + " /$cpucount" ], "type": "math" }