diff --git a/salt/common/grafana/etc/dashboards/dashboard.yml b/salt/common/grafana/etc/dashboards/dashboard.yml
index 13a7c6de5..e8fd83402 100644
--- a/salt/common/grafana/etc/dashboards/dashboard.yml
+++ b/salt/common/grafana/etc/dashboards/dashboard.yml
@@ -8,4 +8,4 @@ providers:
   disableDeletion: false
   editable: true
   options:
-    path: /etc/grafana/provisioning/dashboards
+    path: /etc/grafana/grafana_dashboards
diff --git a/salt/common/grafana/grafana_dashboards/sensor.json b/salt/common/grafana/grafana_dashboards/sensor.json
new file mode 100644
index 000000000..017b7d456
--- /dev/null
+++ b/salt/common/grafana/grafana_dashboards/sensor.json
@@ -0,0 +1,2 @@
+# The Names is {{ SERVERNAME }}
+# The INT is {{ INT }}
diff --git a/salt/common/init.sls b/salt/common/init.sls
index d6b834efd..7b52396ca 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -229,6 +229,13 @@ grafanaconfdir:
     - group: 939
     - makedirs: True
 
+grafanadashdir:
+  file.directory:
+    - name: /opt/so/conf/grafana/grafana_dashboards
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 grafanaconf:
   file.recurse:
     - name: /opt/so/conf/grafana/etc
@@ -237,6 +244,22 @@ grafanaconf:
     - template: jinja
     - source: salt://common/grafana/etc
 
+{%- for SN, SIP in salt['pillar.get']('sensorstab', {}).iteritems() %}}
+{% include: 'sensors.{{ SN }}.sls' %}
+
+dashboard-{{ SN }}:
+  file.managed:
+    - name: /opt/so/conf/grafana/grafana_dashboards/{{ SN }}-Sensor.json
+    - user: 939
+    - group: 939
+    - template: jinja
+    - source: salt://common/grafana/grafana_dashboards/sensor.json
+    - defaults:
+      - SERVERNAME: {{ SN }}
+      - INT: salt['pillar.get']('sensor:mainint')
+
+{% endfor %}
+
 # Install the docker. This needs to be behind nginx at some point
 so-grafana:
   docker_container.running:
@@ -247,6 +270,7 @@ so-grafana:
       - /nsm/grafana:/var/lib/grafana:rw
       - /opt/so/conf/grafana/etc/datasources:/etc/grafana/provisioning/datasources:rw
       - /opt/so/conf/grafana/etc/dashboards:/etc/grafana/provisioning/dashboards:rw
+      - /opt/so/conf/grafana/grafana_dashboards:/etc/grafana/grafana_dashboards:rw
     - environment:
       - GF_SECURITY_ADMIN_PASSWORD=augusta
     - port_bindings: