diff --git a/operations/alloy-mixin/alerts.libsonnet b/operations/alloy-mixin/alerts.libsonnet index 548e41febd..ab23492080 100644 --- 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 index 281c48c765..c6330c4769 100644 --- 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