Allow config overwrite, and make grafanaDashboards and prometheusAler…

…ts hidden
grafana · May 27, 2024 · a1eea90 · a1eea90
1 parent 6ef896d
commit a1eea90
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/operations/alloy-mixin/alerts.libsonnet b/operations/alloy-mixin/alerts.libsonnet
@@ -10,7 +10,7 @@ local openTelemetryAlerts = (import './alerts/opentelemetry.libsonnet');
     openTelemetryAlerts.newOpenTelemetryAlertsGroup($._config.enableK8sCluster)
   ],
 
-  prometheusAlerts+: {
+  prometheusAlerts+:: {
     groups+: 
       if $._config.enableAlloyCluster then
         alloyClusterAlerts + otherAlerts

diff --git a/operations/alloy-mixin/dashboards.libsonnet b/operations/alloy-mixin/dashboards.libsonnet
@@ -1,18 +1,20 @@
-local alloyClusterDashboards =   
-  (import './dashboards/cluster-node.libsonnet') + 
-  (import './dashboards/cluster-overview.libsonnet') +
-  (import './config.libsonnet');
+(import './dashboards/alloy-logs.libsonnet') +
+{
+  local alloyClusterDashboards =   
+    (import './dashboards/cluster-node.libsonnet') + 
+    (import './dashboards/cluster-overview.libsonnet') +
+    config,
 
-local otherDashboards =  
-  (import './dashboards/resources.libsonnet') +
-  (import './dashboards/controller.libsonnet') + 
-  (import './dashboards/prometheus.libsonnet') + 
-  (import './dashboards/opentelemetry.libsonnet') +
-  (import './config.libsonnet');
+  local otherDashboards =  
+    (import './dashboards/resources.libsonnet') +
+    (import './dashboards/controller.libsonnet') + 
+    (import './dashboards/prometheus.libsonnet') + 
+    (import './dashboards/opentelemetry.libsonnet') +
+    config,
 
-(import './dashboards/alloy-logs.libsonnet') +
-{   
-  grafanaDashboards+:     
+  local config = {_config:: $._config},
+
+  grafanaDashboards+::
     if $._config.enableAlloyCluster then 
        alloyClusterDashboards +
        otherDashboards