Merge branch 'main' into aja_ruler_selector

Author: pracucci

CHANGELOG.md

@@ -67,7 +67,8 @@
 * [ENHANCEMENT] Add recording rules to improve responsiveness of Alertmanager dashboard. #387
 * [ENHANCEMENT] Add `CortexRolloutStuck` alert. #405
 * [ENHANCEMENT] Added `CortexKVStoreFailure` alert. #406
-* [ENHANCEMENT] Use ruler jobname for ruler dashboard panels #409
+* [ENHANCEMENT] Use configured `ruler` jobname for ruler dashboard panels. #409
+* [ENHANCEMENT] Add ability to override `datasource` for generated dashboards. #407
 * [BUGFIX] Fixed `CortexIngesterHasNotShippedBlocks` alert false positive in case an ingester instance had ingested samples in the past, then no traffic was received for a long period and then it started receiving samples again. #308
 * [BUGFIX] Alertmanager: fixed `--alertmanager.cluster.peers` CLI flag passed to alertmanager when HA is enabled. #329
 * [BUGFIX] Fixed `CortexInconsistentRuntimeConfig` metric. #335

cortex-mixin/config.libsonnet

@@ -68,5 +68,8 @@
 
     // The routes to exclude from alerts.
     alert_excluded_routes: [],
+
+    // Name of the datasource for which the dashboards should attach to
+    dashboard_datasource: 'default',
   },
 }

cortex-mixin/dashboards/dashboard-utils.libsonnet

@@ -8,7 +8,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
   // - default tags,
   // - some links that propagate the selectred cluster.
   dashboard(title)::
-    super.dashboard(title) + {
+    super.dashboard(title=title, datasource=$._config.dashboard_datasource) + {
       addRowIf(condition, row)::
         if condition
         then self.addRow(row)