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
index 89e1deef5..fab71fd8b 100644
--- 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
@@ -112,7 +112,7 @@
       "measurement": "logstash_events",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"cluster_name\" = \"$cluster_name\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "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",
@@ -138,9 +138,21 @@
       ],
       "tags": [
         {
-          "key": "cluster_name",
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
           "operator": "=",
-          "value": "$cluster_name"
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
         }
       ]
     }