diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index c756fb2b4..fecfa47eb 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -2784,6 +2784,12 @@ grafana:
       title: 'Pipeline Overview'
       templating:
         list:
+          searchnode:
+            includeAll: true
+            multi: true
+            hide: 0
+            text: All
+            value: "$__all"
           cluster_name:
             includeAll: true
             multi: true
@@ -2796,13 +2802,25 @@ grafana:
             x: 0
             y: 0
             h: 8
-            w: 12
-        logstash_indexing_eps_in_tc_total_graph:
+            w: 8
+        logstash_eps_in_out_manager_graph:
           gridPos:
-            x: 12
+            x: 8
             y: 0
             h: 8
-            w: 12
+            w: 8
+        logstash_indexing_eps_in_searchnode_total_graph:
+          gridPos:
+            x: 16
+            y: 0
+            h: 8
+            w: 8
+        logstash_indexing_eps_in_out_searchnode_graph:
+          gridPos:
+            x: 0
+            y: 8
+            h: 8
+            w: 24
         elasticsearch_ingest_performance_tc_graph:
           gridPos:
             x: 0
diff --git a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja
deleted file mode 100644
index 28e9ff3af..000000000
--- a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "id": 69001,
-  "gridPos": {
-    "x": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.x }},
-    "y": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.y }},
-    "w": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.w }},
-    "h": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.h }}
-  },
-  "type": "timeseries",
-  "title": "Total Indexing Events Per Second",
-  "transformations": [
-    {
-      "id": "calculateField",
-      "options": {
-        "alias": "Total EPS",
-        "mode": "reduceRow",
-        "reduce": {
-          "reducer": "sum"
-        },
-        "replaceFields": true
-      }
-    }
-  ],
-  "datasource": "InfluxDB",
-  "pluginVersion": "8.2.1",
-  "interval": "30s",
-  "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": "EPS",
-        "scaleDistribution": {
-          "type": "linear"
-        },
-        "hideFrom": {
-          "tooltip": false,
-          "viz": false,
-          "legend": false
-        },
-        "thresholdsStyle": {
-          "mode": "off"
-        }
-      },
-      "color": {
-        "mode": "fixed",
-        "fixedColor": "orange"
-      },
-      "thresholds": {
-        "mode": "absolute",
-        "steps": [
-          {
-            "color": "green",
-            "value": null
-          }
-        ]
-      },
-      "mappings": [],
-      "unit": "short"
-    },
-    "overrides": []
-  },
-  "options": {
-    "tooltip": {
-      "mode": "single"
-    },
-    "legend": {
-      "displayMode": "table",
-      "placement": "bottom",
-      "calcs": [
-        "max",
-        "mean",
-        "min"
-      ]
-    }
-  },
-  "targets": [
-    {
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "host"
-          ],
-          "type": "tag"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "hide": false,
-      "measurement": "logstash_events",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" =~ \"manager\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
-      "rawQuery": false,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "in"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          },
-          {
-            "type": "non_negative_derivative",
-            "params": [
-              "1s"
-            ]
-          }
-        ]
-      ],
-      "tags": [
-        {
-          "key": "role",
-          "operator": "=~",
-          "value": "/^manager/"
-        },
-        {
-          "key": "role",
-          "value": "standalone",
-          "operator": "=",
-          "condition": "OR"
-        },
-        {
-          "key": "role",
-          "value": "eval",
-          "operator": "=",
-          "condition": "OR"
-        }
-      ]
-    }
-  ],
-  "description": "",
-  "maxDataPoints": null,
-  "timeFrom": null,
-  "timeShift": null
-}