diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
index 72c6e928f..3df0bd9ad 100644
--- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
@@ -151,5 +151,7 @@
   "percentage": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja
index c1ffd278b..f295bfe03 100644
--- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja
@@ -152,5 +152,7 @@
   "steppedLine": false,
   "timeFrom": null,
   "timeShift": null,
-  "description": ""
+  "description": "",
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
index f0cf6f13b..555ffc968 100644
--- a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
@@ -177,5 +177,7 @@
   "stack": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/disk_io_bytes_graph.json.jinja b/salt/grafana/panels/disk_io_bytes_graph.json.jinja
index cc87aadb9..e4133ac82 100644
--- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_bytes_graph.json.jinja
@@ -1,5 +1,7 @@
 {
     "aliasColors": {},
+    "maxDataPoints": 750,
+    "interval": "30s",
     "bars": false,
     "dashLength": 10,
     "dashes": false,
diff --git a/salt/grafana/panels/disk_io_requests_graph.json.jinja b/salt/grafana/panels/disk_io_requests_graph.json.jinja
index c433de325..b13cd7432 100644
--- a/salt/grafana/panels/disk_io_requests_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_requests_graph.json.jinja
@@ -1,5 +1,7 @@
 {
     "aliasColors": {},
+    "maxDataPoints": 750,
+    "interval": "30s",
     "bars": false,
     "dashLength": 10,
     "dashes": false,
diff --git a/salt/grafana/panels/disk_io_time_graph.json.jinja b/salt/grafana/panels/disk_io_time_graph.json.jinja
index 41f708fd0..2ba115e03 100644
--- a/salt/grafana/panels/disk_io_time_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_time_graph.json.jinja
@@ -1,5 +1,7 @@
 {
     "aliasColors": {},
+    "maxDataPoints": 750,
+    "interval": "30s",
     "bars": false,
     "dashLength": 10,
     "dashes": false,
diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
index b02559d1c..223e2c041 100644
--- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
@@ -180,5 +180,7 @@
   "points": false,
   "bars": false,
   "stack": false,
-  "percentage": false
+  "percentage": false,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja
index e3f4e5843..ee20e5d04 100644
--- a/salt/grafana/panels/disk_usage_root_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja
@@ -180,5 +180,7 @@
   "points": false,
   "bars": false,
   "stack": false,
-  "percentage": false
+  "percentage": false,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja
index 38358ba40..bb5e49748 100644
--- a/salt/grafana/panels/load_averages_graph.json.jinja
+++ b/salt/grafana/panels/load_averages_graph.json.jinja
@@ -174,5 +174,7 @@
   "stack": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja
index 22eba5e83..831c6c45a 100644
--- a/salt/grafana/panels/management_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja
@@ -257,5 +257,7 @@
   "stack": false,
   "percentage": false,
   "steppedLine": false,
-  "decimals": 0
+  "decimals": 0,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja
index e2911de7d..b113e8fc2 100644
--- a/salt/grafana/panels/management_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja
@@ -256,5 +256,7 @@
   "bars": false,
   "stack": false,
   "percentage": false,
-  "steppedLine": false
+  "steppedLine": false,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/management_traffic_graph.json.jinja b/salt/grafana/panels/management_traffic_graph.json.jinja
index f784b6347..f8dedf55a 100644
--- a/salt/grafana/panels/management_traffic_graph.json.jinja
+++ b/salt/grafana/panels/management_traffic_graph.json.jinja
@@ -4,6 +4,8 @@
     "OutBound": "#5195CE",
     "net.non_negative_derivative": "super-light-blue"
   },
+  "maxDataPoints": 750,
+  "interval": "30s",
   "bars": false,
   "dashLength": 10,
   "dashes": false,
diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja
index 040ad017b..bac85a16f 100644
--- a/salt/grafana/panels/memory_usage_graph.json.jinja
+++ b/salt/grafana/panels/memory_usage_graph.json.jinja
@@ -181,5 +181,7 @@
   "stack": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja
index 82a6275e9..5a77123ed 100644
--- a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja
@@ -145,5 +145,7 @@
   "percentage": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja
index 92d7d4741..41688a197 100644
--- a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja
@@ -145,5 +145,7 @@
   "percentage": false,
   "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
index 6b961eb8d..4423b8ef9 100644
--- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
@@ -257,5 +257,7 @@
   "stack": false,
   "percentage": false,
   "steppedLine": false,
-  "decimals": 0
+  "decimals": 0,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
index 7a8062a17..0a9b526b7 100644
--- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
@@ -256,5 +256,7 @@
   "bars": false,
   "stack": false,
   "percentage": false,
-  "steppedLine": false
+  "steppedLine": false,
+  "maxDataPoints": 750,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/monitor_traffic_graph.json.jinja b/salt/grafana/panels/monitor_traffic_graph.json.jinja
index f74eb83a0..cac330c43 100644
--- a/salt/grafana/panels/monitor_traffic_graph.json.jinja
+++ b/salt/grafana/panels/monitor_traffic_graph.json.jinja
@@ -5,6 +5,8 @@
     "net.non_negative_derivative": "light-orange"
   },
   "bars": false,
+  "maxDataPoints": 750,
+  "interval": "30s"
   "dashLength": 10,
   "dashes": false,
   "datasource": "InfluxDB",