From 7a85a3c7f719740c4442cc9dfc9e3f492cabee41 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 23 Jul 2021 10:20:57 -0400
Subject: [PATCH] move dashboard location

---
 .../grafana/dashboards/common_template.json.jinja |  4 ++--
 salt/grafana/etc/dashboards/dashboard.yml         | 15 ++++-----------
 salt/grafana/init.sls                             |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/salt/grafana/dashboards/common_template.json.jinja b/salt/grafana/dashboards/common_template.json.jinja
index c03707ad5..b86394b48 100644
--- a/salt/grafana/dashboards/common_template.json.jinja
+++ b/salt/grafana/dashboards/common_template.json.jinja
@@ -12,7 +12,7 @@
       }
     ]
   },
-  "description": "Detailed {{NODETYPE}}",
+  "description": "{{NODETYPE}}",
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
@@ -53,7 +53,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Detailed {{ NODETYPE }}",
+  "title": "{{ NODETYPE }}",
   {% if NODETYPE | lower in 'overview' %}
   "uid": "so_overview",
   {% endif %}
diff --git a/salt/grafana/etc/dashboards/dashboard.yml b/salt/grafana/etc/dashboards/dashboard.yml
index 3820527e8..2c422069c 100644
--- a/salt/grafana/etc/dashboards/dashboard.yml
+++ b/salt/grafana/etc/dashboards/dashboard.yml
@@ -1,19 +1,12 @@
 apiVersion: 1
 
 providers:
-- name: 'Detailed Dashboards'
-  folder: 'Detailed Dashboards'
+- name: 'Dashboards'
+  folder: 'Dashboards'
   type: file
   disableDeletion: false
   editable: true
   allowUiUpdates: true
   options:
-    path: /etc/grafana/grafana_dashboards/detailed
-- name: 'Overview Dashboards'
-  folder: 'Overview Dashboards'
-  type: file
-  disableDeletion: false
-  editable: true
-  allowUiUpdates: true
-  options:
-    path: /etc/grafana/grafana_dashboards/overview
+    path: /etc/grafana/grafana_dashboards/
+
diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls
index c61e46512..565823644 100644
--- a/salt/grafana/init.sls
+++ b/salt/grafana/init.sls
@@ -89,7 +89,7 @@ grafana-config-files:
 {% for nodeType in nodeTypes %}       
 detailed-{{nodeType}}-dashboard:
   file.managed:
-    - name: /opt/so/conf/grafana/grafana_dashboards/detailed/{{nodeType}}.json
+    - name: /opt/so/conf/grafana/grafana_dashboards/{{nodeType}}.json
     - user: 939
     - group: 939
     - template: jinja