From: Aswin Toni <aswin.toni@cern.ch>
Date: Thu, 18 Aug 2022 14:21:36 +0000 (+0200)
Subject: ceph-mixin: fix config inheritance
X-Git-Tag: v17.2.4~58^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dc79cee3bea92877b5946620edb5c5121f23d8b;p=ceph.git

ceph-mixin: fix config inheritance

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 35183140f60fe445de8d256fa08639b288b6e768)
---

diff --git a/monitoring/ceph-mixin/alerts.libsonnet b/monitoring/ceph-mixin/alerts.libsonnet
index e7ee2f35d9f6..c2d39e2d3330 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 6107c3e54d47..a00d621c15bd 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,'