importRules directly on mixing

Author: yduartep

csp-mixin/azureconfig.libsonnet

@@ -19,14 +19,5 @@
     groupLabels: ['job', 'resourceGroup', 'subscriptionName'],
     instanceLabels: ['resourceName'],
     metricsSource: 'azuremonitor',
-
-    local importRules(rules) = {
-      groups+: std.parseYaml(rules).groups,
-    },
-
-    prometheus: {
-      alerts: importRules(importstr 'alerts/azure-alerts.yml'),
-      recordingRules: {},
-    },
   },
 }

csp-mixin/gcpconfig.libsonnet

@@ -19,13 +19,5 @@
     groupLabels: ['job'],
     instanceLabels: ['bucket_name'],
     metricsSource: 'stackdriver',
-    local importRules(rules) = {
-      groups+: std.parseYaml(rules).groups,
-    },
-
-    prometheus: {
-      alerts: importRules(importstr 'alerts/gcp-alerts.yml'),
-      recordingRules: {},
-    },
   },
 }

csp-mixin/main.libsonnet

@@ -14,9 +14,13 @@ local commonlib = import 'common-lib/common/main.libsonnet';
       rows: (import './rows.libsonnet').new(this),
       dashboards: (import './dashboards.libsonnet').new(this),
     },
+    local importRules(rules) = {
+      groups+: std.parseYaml(rules).groups,
+    },
     asMonitoringMixin(): {
       grafanaDashboards+:: this.grafana.dashboards,
-      prometheusAlerts+:: this.prometheus.alerts,
+      prometheusAlerts+:
+        importRules(importstr 'alerts/azure-alerts.yml') + importRules(importstr 'alerts/gcp-alerts.yml'),
     },
   },