From d94a76a2c7e837ef204fd020da84f954980a8aa0 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 13 May 2020 12:06:02 -0400
Subject: [PATCH] fix docker_container_cpu calculations for grafana

---
 salt/grafana/dashboards/eval/eval.json                 |  8 ++++----
 salt/grafana/dashboards/master/master.json             | 10 +++++-----
 salt/grafana/dashboards/mastersearch/mastersearch.json | 10 +++++-----
 salt/grafana/dashboards/search_nodes/searchnode.json   |  4 ++--
 salt/grafana/dashboards/sensor_nodes/sensor.json       |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/salt/grafana/dashboards/eval/eval.json b/salt/grafana/dashboards/eval/eval.json
index 0c7fdc769..b3a0f9795 100644
--- a/salt/grafana/dashboards/eval/eval.json
+++ b/salt/grafana/dashboards/eval/eval.json
@@ -1226,7 +1226,7 @@
                 },
                 {
                   "params": [
-                    " / 5"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1365,7 +1365,7 @@
                 },
                 {
                   "params": [
-                    " / 8"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1504,7 +1504,7 @@
                 },
                 {
                   "params": [
-                    " / 8"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1643,7 +1643,7 @@
                 },
                 {
                   "params": [
-                    " / 8"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
diff --git a/salt/grafana/dashboards/master/master.json b/salt/grafana/dashboards/master/master.json
index e6c368b8f..ddf8e93de 100644
--- a/salt/grafana/dashboards/master/master.json
+++ b/salt/grafana/dashboards/master/master.json
@@ -290,7 +290,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -430,7 +430,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1046,7 +1046,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1186,7 +1186,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1326,7 +1326,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
diff --git a/salt/grafana/dashboards/mastersearch/mastersearch.json b/salt/grafana/dashboards/mastersearch/mastersearch.json
index 2de3280bb..0a675f938 100644
--- a/salt/grafana/dashboards/mastersearch/mastersearch.json
+++ b/salt/grafana/dashboards/mastersearch/mastersearch.json
@@ -299,7 +299,7 @@
                 },
                 {
                   "params": [
-                    "{{ CPUS }}"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -436,7 +436,7 @@
                 },
                 {
                   "params": [
-                    "{{ CPUS }}"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1048,7 +1048,7 @@
                 },
                 {
                   "params": [
-                    "{{ CPUS }}"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1190,7 +1190,7 @@
                 },
                 {
                   "params": [
-                    "{{ CPUS }}"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
@@ -1327,7 +1327,7 @@
                 },
                 {
                   "params": [
-                    "/16"
+                    " / {{ CPUS }}"
                   ],
                   "type": "math"
                 }
diff --git a/salt/grafana/dashboards/search_nodes/searchnode.json b/salt/grafana/dashboards/search_nodes/searchnode.json
index 5dc17c85d..3d6722c94 100644
--- a/salt/grafana/dashboards/search_nodes/searchnode.json
+++ b/salt/grafana/dashboards/search_nodes/searchnode.json
@@ -298,7 +298,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -438,7 +438,7 @@
               },
               {
                 "params": [
-                  " / 16"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
diff --git a/salt/grafana/dashboards/sensor_nodes/sensor.json b/salt/grafana/dashboards/sensor_nodes/sensor.json
index ddccc1664..1b0ab33a4 100644
--- a/salt/grafana/dashboards/sensor_nodes/sensor.json
+++ b/salt/grafana/dashboards/sensor_nodes/sensor.json
@@ -1326,7 +1326,7 @@
               },
               {
                 "params": [
-                  " / 8"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1465,7 +1465,7 @@
               },
               {
                 "params": [
-                  " / 8"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1604,7 +1604,7 @@
               },
               {
                 "params": [
-                  " / 8"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }