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 e7ee2f35d9f668a1700c6f4ee1ef8528be20bff6..c2d39e2d33302080eeac151e388f7a487e609f68 100644 (file)
--- 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 6107c3e54d47f3006985a8c84e46205be0b4611f..a00d621c15bd67310a47823449328da48deaa50e 100644 (file)
--- 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,'