Merge branch 'jenkins-build-7' into 'master'

Auto-merge for build 7

See merge request puppet/alloy_cd!3

templates/config.alloy.erb

@@ -66,11 +66,21 @@ prometheus.scrape "scrape_system" {
 }
 <% if @ay_manage_ne == true -%>
 prometheus.scrape "node_exporter" {
-  targets = [
-    { __address__ = "localhost:9100" },)
-  ]
-  forward_to      = [prometheus.remote_write.prometheus.receiver]
+  targets = [{ __address__ = "localhost:9100" }]
+  forward_to = [prometheus.remote_write.prometheus.receiver]
   scrape_interval = "15s"
+  relabel_configs = [
+    {
+      source_labels = [__address__]
+      target_label  = "instance"
+      replacement   = "localhost:9100"
+    },
+    {
+      source_labels = [__address__]
+      target_label  = "job"
+      replacement   = "node_exporter"
+    }
+  ]
 }
 <% end %>
 prometheus.remote_write "prometheus" {