diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 90808557f..6fcb7568a 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -276,130 +276,173 @@ grafana:
             h: 8
             w: 8
 
-        row_logstash:
+        row_docker_details:
           gridPos:
             x: 0
             y: 95
             h: 1
             w: 24
-        logstash_estimated_eps_graph:
+        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
+
+        row_logstash:
+          gridPos:
+            x: 0
+            y: 144
+            h: 1
+            w: 24
+        logstash_estimated_eps_graph:
+          gridPos:
+            x: 0
+            y: 145
+            h: 8
+            w: 24
 
         row_elasticsearch:
           gridPos:
             x: 0
-            y: 104
+            y: 153
             h: 1
             w: 24
         elasticsearch_document_count_graph:
           gridPos:
             x: 0
-            y: 105
+            y: 154
             h: 8
             w: 12
         elasticsearch_thread_count_graph:
           gridPos:
             x: 12
-            y: 105
+            y: 154
             h: 8
             w: 12
         elasticsearch_store_size_graph:
           gridPos:
             x: 0
-            y: 113
+            y: 162
             h: 8
             w: 12
         elasticsearch_field_data_cache_size_graph:
           gridPos:
             x: 12
-            y: 113
+            y: 162
             h: 8
             w: 12
 
         row_redis:
           gridPos:
             x: 0
-            y: 121
+            y: 170
             h: 1
             w: 24
         redis_queue_graph:
           gridPos:
             x: 0
-            y: 122
+            y: 171
             h: 8
             w: 24
 
         row_zeek:
           gridPos:
             x: 0
-            y: 130
+            y: 179
             h: 1
             w: 24
         zeek_packet_loss_graph:
           gridPos:
             x: 0
-            y: 131
+            y: 180
             h: 8
             w: 10
         zeek_capture_loss_graph:
           gridPos:
             x: 10
-            y: 131
+            y: 180
             h: 8
             w: 10
         zeek_restarts_healthcheck_stat:
           gridPos:
             x: 20
-            y: 131
+            y: 180
             h: 8
             w: 4
 
         row_suricata:
           gridPos:
             x: 0
-            y: 139
+            y: 188
             h: 1
             w: 24
         suricata_packet_loss_graph:
           gridPos:
             x: 0
-            y: 140
+            y: 189
             h: 8
             w: 24
 
         row_stenographer:
           gridPos:
             x: 0
-            y: 148
+            y: 197
             h: 1
             w: 24
         stenographer_packet_loss_graph:
           gridPos:
             x: 0
-            y: 149
+            y: 198
             h: 8
             w: 16
         stenographer_pcap_retention_graph:
           gridPos:
             x: 16
-            y: 149
+            y: 198
             h: 8
             w: 8
 
         row_influxdb:
           gridPos:
             x: 0
-            y: 157
+            y: 206
             h: 1
             w: 24
         influxdb_db_size_graph:
           gridPos:
             x: 0
-            y: 158
+            y: 207
             h: 8
             w: 24 
 
@@ -655,86 +698,129 @@ grafana:
             h: 8
             w: 8
 
-        row_logstash:
+        row_docker_details:
           gridPos:
             x: 0
             y: 95
             h: 1
             w: 24
-        logstash_estimated_eps_graph:
+        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
+
+        row_logstash:
+          gridPos:
+            x: 0
+            y: 144
+            h: 1
+            w: 24
+        logstash_estimated_eps_graph:
+          gridPos:
+            x: 0
+            y: 145
+            h: 8
+            w: 24
 
         row_redis:
           gridPos:
             x: 0
-            y: 104
+            y: 153
             h: 1
             w: 24
         redis_queue_graph:
           gridPos:
             x: 0
-            y: 105
+            y: 154
             h: 8
             w: 24
 
         row_zeek:
           gridPos:
             x: 0
-            y: 113
+            y: 162
             h: 1
             w: 24
         zeek_packet_loss_graph:
           gridPos:
             x: 0
-            y: 114
+            y: 163
             h: 8
             w: 10
         zeek_capture_loss_graph:
           gridPos:
             x: 10
-            y: 114
+            y: 163
             h: 8
             w: 10
         zeek_restarts_healthcheck_stat:
           gridPos:
             x: 20
-            y: 114
+            y: 163
             h: 8
             w: 4
 
         row_suricata:
           gridPos:
             x: 0
-            y: 122
+            y: 171
             h: 1
             w: 24
         suricata_packet_loss_graph:
           gridPos:
             x: 0
-            y: 123
+            y: 172
             h: 8
             w: 24
 
         row_stenographer:
           gridPos:
             x: 0
-            y: 131
+            y: 180
             h: 1
             w: 24
         stenographer_packet_loss_graph:
           gridPos:
             x: 0
-            y: 132
+            y: 181
             h: 8
             w: 16
         stenographer_pcap_retention_graph:
           gridPos:
             x: 16
-            y: 132
+            y: 181
             h: 8
             w: 8