Consistent naming of recording rules

Author: malcolmholmes

prometheus-ksonnet/lib/prometheus-config.libsonnet

@@ -5,8 +5,8 @@
     },
 
     rule_files: [
-      'alerts/rules',
-      'recording/rules',
+      'alerts/alerts.rules',
+      'recording/recording.rules',
     ],
 
     alerting: {

prometheus-ksonnet/lib/prometheus-configmap.libsonnet

@@ -28,7 +28,7 @@
           'alerts.rules': $.util.manifestYaml(prometheusAlerts),
         }),
 
-        configMap.new('%s-rules' % self.name) +
+        configMap.new('%s-recording' % self.name) +
         configMap.withData({
           'recording.rules': $.util.manifestYaml(prometheusRules),
         }),

prometheus-ksonnet/lib/prometheus-ha-mixin.libsonnet

@@ -58,7 +58,7 @@ local configMap = k.core.v1.configMap;
     configMap.withData({
       'alerts.rules': k.util.manifestYaml(root.prometheus_zero.alerts),
     }),
-    configMap.new('%s-rules-0' % self.name) +
+    configMap.new('%s-recording-0' % self.name) +
     configMap.withData({
       'recording.rules': k.util.manifestYaml(root.prometheus_zero.rules),
     }),
@@ -71,7 +71,7 @@ local configMap = k.core.v1.configMap;
     configMap.withData({
       'alerts.rules': k.util.manifestYaml(root.prometheus_one.alerts),
     }),
-    configMap.new('%s-rules-1' % self.name) +
+    configMap.new('%s-recording-1' % self.name) +
     configMap.withData({
       'recording.rules': k.util.manifestYaml(root.prometheus_one.rules),
     }),
@@ -80,10 +80,10 @@ local configMap = k.core.v1.configMap;
   prometheus_config_mount::
     k.util.configVolumeMount('%s-config-0' % self.name, '/etc/prometheus-0')
     + k.util.configVolumeMount('%s-alerts-0' % self.name, '/etc/prometheus-0/alerts')
-    + k.util.configVolumeMount('%s-rules-0' % self.name, '/etc/prometheus-0/rules')
+    + k.util.configVolumeMount('%s-recording-0' % self.name, '/etc/prometheus-0/recording')
     + k.util.configVolumeMount('%s-config-1' % self.name, '/etc/prometheus-1')
     + k.util.configVolumeMount('%s-alerts-1' % self.name, '/etc/prometheus-1/alerts')
-    + k.util.configVolumeMount('%s-rules-1' % self.name, '/etc/prometheus-1/rules')
+    + k.util.configVolumeMount('%s-recording-1' % self.name, '/etc/prometheus-1/recording')
   ,
 
   prometheus_container+:: container.withEnv([

prometheus-ksonnet/lib/prometheus.libsonnet

@@ -77,7 +77,7 @@
     prometheus_config_mount::
       $.util.configVolumeMount('%s-config' % self.name, _config.prometheus_config_dir)
       + $.util.configVolumeMount('%s-alerts' % self.name, _config.prometheus_config_dir + '/alerts')
-      + $.util.configVolumeMount('%s-rules' % self.name, _config.prometheus_config_dir + '/rules')
+      + $.util.configVolumeMount('%s-recording' % self.name, _config.prometheus_config_dir + '/recording')
     ,
 
     prometheus_statefulset: