Rename 'Standard' to 'Main'

Signed-off-by: Marco Pracucci <marco@pracucci.com>
grafana · Aug 27, 2024 · 6fb2db8 · 6fb2db8
1 parent 20c6bcd
commit 6fb2db8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/...oring-values-generated/mimir-distributed/templates/metamonitoring/grafana-dashboards.yaml b/...oring-values-generated/mimir-distributed/templates/metamonitoring/grafana-dashboards.yaml
@@ -13685,7 +13685,7 @@ data:
                       },
                       {
                          "selected": false,
-                         "text": "Standard",
+                         "text": "Main",
                          "value": "cluster=~\"$cluster\"\\, job=~\"($namespace)/((cortex|mimir|mimir-backend.*|mimir-read.*|querier.*|query-frontend.*|query-scheduler.*))\""
                       },
                       {
@@ -13694,7 +13694,7 @@ data:
                          "value": "cluster=~\"$cluster\"\\, job=~\"($namespace)/((ruler-querier.*|ruler-query-frontend.*|ruler-query-scheduler.*))\""
                       }
                    ],
-                   "query": "All : cluster=~\"$cluster\"\\, job=~\"($namespace)/((cortex|mimir|mimir-backend.*|mimir-read.*|querier.*|query-frontend.*|query-scheduler.*|ruler-querier.*|ruler-query-frontend.*|ruler-query-scheduler.*))\",Standard : cluster=~\"$cluster\"\\, job=~\"($namespace)/((cortex|mimir|mimir-backend.*|mimir-read.*|querier.*|query-frontend.*|query-scheduler.*))\",Remote ruler : cluster=~\"$cluster\"\\, job=~\"($namespace)/((ruler-querier.*|ruler-query-frontend.*|ruler-query-scheduler.*))\"",
+                   "query": "All : cluster=~\"$cluster\"\\, job=~\"($namespace)/((cortex|mimir|mimir-backend.*|mimir-read.*|querier.*|query-frontend.*|query-scheduler.*|ruler-querier.*|ruler-query-frontend.*|ruler-query-scheduler.*))\",Main : cluster=~\"$cluster\"\\, job=~\"($namespace)/((cortex|mimir|mimir-backend.*|mimir-read.*|querier.*|query-frontend.*|query-scheduler.*))\",Remote ruler : cluster=~\"$cluster\"\\, job=~\"($namespace)/((ruler-querier.*|ruler-query-frontend.*|ruler-query-scheduler.*))\"",
                    "skipUrlSync": false,
                    "type": "custom",
                    "useTags": false

diff --git a/operations/mimir-mixin-compiled-baremetal/dashboards/mimir-queries.json b/operations/mimir-mixin-compiled-baremetal/dashboards/mimir-queries.json
diff --git a/operations/mimir-mixin-compiled/dashboards/mimir-queries.json b/operations/mimir-mixin-compiled/dashboards/mimir-queries.json
diff --git a/operations/mimir-mixin/config.libsonnet b/operations/mimir-mixin/config.libsonnet
@@ -88,9 +88,9 @@
       alertmanager: ['alertmanager', 'cortex', 'mimir', 'mimir-backend.*'],
       overrides_exporter: ['overrides-exporter', 'mimir-backend.*'],
 
-      // The following arejob matchers used to select all components in the read path.
-      standard_read_path: std.uniq(std.sort(self.query_frontend + self.query_scheduler + self.querier)),
-      ruler_read_path: std.uniq(std.sort(self.ruler_query_frontend + self.ruler_query_scheduler + self.ruler_querier)),
+      // The following are job matchers used to select all components in the read path.
+      main_read_path: std.uniq(std.sort(self.query_frontend + self.query_scheduler + self.querier)),
+      remote_ruler_read_path: std.uniq(std.sort(self.ruler_query_frontend + self.ruler_query_scheduler + self.ruler_querier)),
 
       // The following are job matchers used to select all components in a given "path".
       write: ['distributor.*', 'ingester.*', 'mimir-write.*'],

diff --git a/operations/mimir-mixin/dashboards/queries.libsonnet b/operations/mimir-mixin/dashboards/queries.libsonnet
@@ -14,9 +14,9 @@ local filename = 'mimir-queries.json';
     // (e.g. cortex_query_frontend_* metrics are only exposed by query-frontend) or on metrics
     // that have other labels that allow to distinguish the component (e.g. component="query-frontend").
     .addCustomTemplate('Read path', 'read_path_matcher', [
-      { label: 'All', value: $.jobMatcher(std.uniq(std.sort($._config.job_names.standard_read_path + $._config.job_names.ruler_read_path))) },
-      { label: 'Standard', value: $.jobMatcher($._config.job_names.standard_read_path) },
-      { label: 'Remote ruler', value: $.jobMatcher($._config.job_names.ruler_read_path) },
+      { label: 'All', value: $.jobMatcher(std.uniq(std.sort($._config.job_names.main_read_path + $._config.job_names.remote_ruler_read_path))) },
+      { label: 'Main', value: $.jobMatcher($._config.job_names.main_read_path) },
+      { label: 'Remote ruler', value: $.jobMatcher($._config.job_names.remote_ruler_read_path) },
     ])
     .addRow(
       $.row('Query-frontend')