From d08173295b6f6cedaf974896a236e18b87a8d6ff Mon Sep 17 00:00:00 2001 From: Aswin Toni Date: Thu, 18 Aug 2022 16:21:36 +0200 Subject: [PATCH] ceph-mixin: fix config inheritance Signed-off-by: Aswin Toni (cherry picked from commit 35183140f60fe445de8d256fa08639b288b6e768) --- monitoring/ceph-mixin/alerts.libsonnet | 3 ++- monitoring/ceph-mixin/prometheus_alerts.libsonnet | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/monitoring/ceph-mixin/alerts.libsonnet b/monitoring/ceph-mixin/alerts.libsonnet index e7ee2f35d9f66..c2d39e2d33302 100644 --- a/monitoring/ceph-mixin/alerts.libsonnet +++ b/monitoring/ceph-mixin/alerts.libsonnet @@ -1,3 +1,4 @@ { - prometheusAlerts+:: (import 'prometheus_alerts.libsonnet'), + prometheusAlerts+:: (import 'prometheus_alerts.libsonnet') + + { _config:: $._config }, } diff --git a/monitoring/ceph-mixin/prometheus_alerts.libsonnet b/monitoring/ceph-mixin/prometheus_alerts.libsonnet index 6107c3e54d47f..a00d621c15bd6 100644 --- a/monitoring/ceph-mixin/prometheus_alerts.libsonnet +++ b/monitoring/ceph-mixin/prometheus_alerts.libsonnet @@ -1,5 +1,6 @@ -(import 'config.libsonnet') { + _config:: error 'must provide _config', + MultiClusterQuery():: if $._config.showMultiCluster then 'cluster,'