move dashboard location

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 %}

salt/grafana/etc/dashboards/dashboard.yml

@@ -1,19 +1,12 @@
 apiVersion: 1
 
 providers:
-- name: 'Detailed Dashboards'
+- name: 'Dashboards'
-  folder: 'Detailed Dashboards'
+  folder: 'Dashboards'
   type: file
   disableDeletion: false
   editable: true
   allowUiUpdates: true
   options:
-    path: /etc/grafana/grafana_dashboards/detailed
+    path: /etc/grafana/grafana_dashboards/
-- name: 'Overview Dashboards'
+
-  folder: 'Overview Dashboards'
-  type: file
-  disableDeletion: false
-  editable: true
-  allowUiUpdates: true
-  options:
-    path: /etc/grafana/grafana_dashboards/overview

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