diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 77500778c..024fd5dfd 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -2731,6 +2731,319 @@ grafana:
             w: 24
 
 
+    receiver:
+      templating:
+        list:
+          servername: {}
+          role:
+            allValue: false
+            multi: false
+            hide: 2
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
+      panels:
+        row_overview:
+          gridPos:
+            x: 0
+            y: 0
+            h: 1
+            w: 24
+        system_uptime:
+          gridPos:
+            x: 0
+            y: 1
+            h: 4
+            w: 4
+        load_average_5_minute_stat:
+          gridPos:
+            x: 4
+            y: 1
+            h: 4
+            w: 4
+        cpu_usage_guage:
+          gridPos:
+            x: 8
+            y: 1
+            h: 4
+            w: 2
+        ram_usage_guage:
+          gridPos:
+            x: 10
+            y: 1
+            h: 4
+            w: 2
+        swap_usage_guage:
+          gridPos:
+            x: 12
+            y: 1
+            h: 4
+            w: 2
+        rootfs_used_guage:
+          gridPos:
+            x: 14
+            y: 1
+            h: 4
+            w: 2
+        nsm_used_guage:
+          gridPos:
+            x: 16
+            y: 1
+            h: 4
+            w: 2
+        io_wait_stat:
+          gridPos:
+            x: 20
+            y: 1
+            h: 4
+            w: 4
+        logstash_estimated_eps_in_stat:
+          gridPos:
+            x: 0
+            y: 5
+            h: 4
+            w: 4
+        logstash_estimated_eps_out_stat:
+          gridPos:
+            x: 4
+            y: 5
+            h: 4
+            w: 4
+        redis_queue_stat:
+          gridPos:
+            x: 8
+            y: 5
+            h: 4
+            w: 4
+
+        row_cpu:
+          gridPos:
+            x: 0
+            y: 9
+            h: 1
+            w: 24
+        cpu_usage_tasks_all_graph:
+          gridPos:
+            x: 0
+            y: 10
+            h: 8
+            w: 24
+        load_averages_graph:
+          gridPos:
+            x: 0
+            y: 18
+            h: 8
+            w: 12
+        process_status_graph:
+          gridPos:
+            x: 12
+            y: 18
+            h: 8
+            w: 12
+
+        row_memory:
+          gridPos:
+            x: 0
+            y: 26
+            h: 1
+            w: 24
+        memory_usage_graph:
+          gridPos:
+            x: 0
+            y: 27
+            h: 8
+            w: 24
+
+        row_swap:
+          gridPos:
+            x: 0
+            y: 35
+            h: 1
+            w: 24
+        swap_io_bytes_graph:
+          gridPos:
+            x: 0
+            y: 36
+            h: 8
+            w: 12
+        swap_usage_bytes_graph:
+          gridPos:
+            x: 12
+            y: 36
+            h: 8
+            w: 12
+
+        row_network:
+          gridPos:
+            x: 0
+            y: 44
+            h: 1
+            w: 24
+        management_interface_traffic_both_graph:
+          gridPos:
+            x: 0
+            y: 45
+            h: 8
+            w: 24
+        management_interface_packets_graph:
+          gridPos:
+            x: 0
+            y: 53
+            h: 8
+            w: 12
+        management_interface_drops_graph:
+          gridPos:
+            x: 12
+            y: 53
+            h: 8
+            w: 12
+
+        row_disk_usage:
+          gridPos:
+            x: 0
+            y: 77
+            h: 1
+            w: 24
+        disk_usage_root_graph:
+          gridPos:
+            x: 0
+            y: 78
+            h: 8
+            w: 12
+        disk_usage_nsm_graph:
+          gridPos:
+            x: 12
+            y: 78
+            h: 8
+            w: 12
+
+        row_disk_iops:
+          gridPos:
+            x: 0
+            y: 86
+            h: 1
+            w: 24
+        disk_io_requests_graph:
+          gridPos:
+            x: 0
+            y: 87
+            h: 8
+            w: 8
+        disk_io_bytes_graph:
+          gridPos:
+            x: 8
+            y: 87
+            h: 8
+            w: 8
+        disk_io_time_graph:
+          gridPos:
+            x: 16
+            y: 87
+            h: 8
+            w: 8
+
+        row_docker_details:
+          gridPos:
+            x: 0
+            y: 95
+            h: 1
+            w: 24
+        cpu_docker_combined_current_graph:
+          gridPos:
+            x: 0
+            y: 96
+            h: 8
+            w: 24
+        cpu_docker_combined_trend_graph:
+          gridPos:
+            x: 0
+            y: 104
+            h: 8
+            w: 24
+        memory_used_docker_combined_current_graph:
+          gridPos:
+            x: 0
+            y: 112
+            h: 8
+            w: 24
+        memory_used_docker_combined_trend_graph:
+          gridPos:
+            x: 0
+            y: 120
+            h: 8
+            w: 24
+        network_usage_docker_combined_current_graph:
+          gridPos:
+            x: 0
+            y: 128
+            h: 8
+            w: 24
+        network_usage_docker_combined_trend_graph:
+          gridPos:
+            x: 0
+            y: 136
+            h: 8
+            w: 24
+        uptime_docker_combined_current_graph:
+          gridPos:
+            x: 0
+            y: 144
+            h: 8
+            w: 12
+        uptime_docker_combined_trend_graph:
+          gridPos:
+            x: 12
+            y: 144
+            h: 8
+            w: 12
+
+        row_logstash:
+          gridPos:
+            x: 0
+            y: 152
+            h: 1
+            w: 24
+        logstash_estimated_eps_in_graph:
+          gridPos:
+            x: 0
+            y: 153
+            h: 8
+            w: 24
+        logstash_estimated_eps_in_total_graph:
+          gridPos:
+            x: 0
+            y: 161
+            h: 8
+            w: 24
+        logstash_estimated_eps_out_graph:
+          gridPos:
+            x: 0
+            y: 169
+            h: 8
+            w: 24
+        logstash_estimated_eps_out_total_graph:
+          gridPos:
+            x: 0
+            y: 172
+            h: 8
+            w: 24
+
+        row_redis:
+          gridPos:
+            x: 0
+            y: 180
+            h: 1
+            w: 24
+        redis_queue_graph:
+          gridPos:
+            x: 0
+            y: 181
+            h: 8
+            w: 24
+
+
     pipeline_overview_nontc:
       title: 'Pipeline Overview'
       templating: