diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja
index 2a40327e2..aaf997836 100644
--- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja
@@ -1,39 +1,29 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 445548,
   "gridPos": {
     "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }},
     "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }},
     "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }},
     "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }}
   },
-  "id": 445548,
-  "legend": {
-    "avg": false,
-    "current": false,
-    "max": false,
-    "min": false,
-    "show": true,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "null",
+  "type": "timeseries",
+  "title": "Elastic Ingest Performance",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
   "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
   },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
   "targets": [
     {
       "alias": "community.id_time",
@@ -55,18 +45,18 @@
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "ingest_processor_stats_community_id_time_in_millis"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "last",
-            "params": []
+            "params": [],
+            "type": "last"
           },
           {
-            "type": "non_negative_difference",
-            "params": []
+            "params": [],
+            "type": "non_negative_difference"
           }
         ]
       ],
@@ -276,18 +266,18 @@
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "ingest_processor_stats_dissect_time_in_millis"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "last",
-            "params": []
+            "params": [],
+            "type": "last"
           },
           {
-            "type": "non_negative_difference",
-            "params": []
+            "params": [],
+            "type": "non_negative_difference"
           }
         ]
       ],
@@ -636,18 +626,18 @@
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "ingest_processor_stats_rename_time_in_millis"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "last",
-            "params": []
+            "params": [],
+            "type": "last"
           },
           {
-            "type": "non_negative_difference",
-            "params": []
+            "params": [],
+            "type": "non_negative_difference"
           }
         ]
       ],
@@ -750,56 +740,54 @@
       ]
     }
   ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Elastic Ingest Performance",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:1668",
-      "format": "dtdurationms",
-      "label": "",
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "ms"
     },
-    {
-      "$$hashKey": "object:1669",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+    "overrides": []
   },
-  "bars": false,
-  "dashes": false,
   "description": "",
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null,
-  "interval": "30s"
+  "timeShift": null
 }
diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja
index 343610617..42ac51038 100644
--- a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja
@@ -72,7 +72,7 @@
   },
   "targets": [
     {
-      "alias": "$tag_host",
+      "alias": "Time",
       "groupBy": [
         {
           "params": [
@@ -80,12 +80,6 @@
           ],
           "type": "time"
         },
-        {
-          "params": [
-            "host"
-          ],
-          "type": "tag"
-        },
         {
           "params": [
             "null"