From beb7b89275ddf00d3ce4a85a60e775b3d835c72a Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 9 Jul 2021 14:13:00 -0400
Subject: [PATCH] yamlize the gridpos for panels

---
 salt/grafana/defaults.yaml                         | 14 ++++++++++++--
 .../panels/cpu_docker_combined_current.json.jinja  |  8 ++++----
 .../panels/cpu_docker_combined_trend.json.jinja    |  8 ++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 81ae5e9a2..65d900644 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -34,8 +34,18 @@ grafana:
           - monint
           - cpucount
       panels:
-        cpu_docker_combined_current: {}
-        cpu_docker_combined_trend: {}
+        cpu_docker_combined_current:
+          gridPos:
+            x: 0
+            y: 0
+            h: 10
+            w: 24
+        cpu_docker_combined_trend:
+          gridPos:
+            x: 0
+            y: 10
+            h: 10
+            w: 24
         memory_used_docker_combined_current: {}
         memory_used_docker_combined_trend: {}
 #        cpu_usage_idle:
diff --git a/salt/grafana/panels/cpu_docker_combined_current.json.jinja b/salt/grafana/panels/cpu_docker_combined_current.json.jinja
index a2635f41a..8e19e651c 100644
--- a/salt/grafana/panels/cpu_docker_combined_current.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_current.json.jinja
@@ -2,10 +2,10 @@
   "type": "graph",
   "title": "Container CPU Usage Current",
   "gridPos": {
-    "x": 0,
-    "y": 0,
-    "w": 24,
-    "h": 10
+    "x": {{ PANELS.cpu_docker_combined_current.gridPos.x }},
+    "y": {{ PANELS.cpu_docker_combined_current.gridPos.y }},
+    "w": {{ PANELS.cpu_docker_combined_current.gridPos.w }},
+    "h": {{ PANELS.cpu_docker_combined_current.gridPos.h }}
   },
   "id": 4,
   "targets": [
diff --git a/salt/grafana/panels/cpu_docker_combined_trend.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend.json.jinja
index 9a2af38ce..db27beac1 100644
--- a/salt/grafana/panels/cpu_docker_combined_trend.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_trend.json.jinja
@@ -2,10 +2,10 @@
   "type": "graph",
   "title": "Container CPU Usage Trend",
   "gridPos": {
-    "x": 0,
-    "y": 10,
-    "w": 24,
-    "h": 10
+    "x": {{ PANELS.cpu_docker_combined_trend.gridPos.x }},
+    "y": {{ PANELS.cpu_docker_combined_trend.gridPos.y }},
+    "w": {{ PANELS.cpu_docker_combined_trend.gridPos.w }},
+    "h": {{ PANELS.cpu_docker_combined_trend.gridPos.h }}
   },
   "id": 6,
   "targets": [