deleted: .devcontainer/.zshrc

modified:   .devcontainer/devcontainer.json
deleted:    .devcontainer/scripts/postCreate.sh
modified:   roles/grafana_alloy/templates/config.alloy.j2

roles/grafana_alloy/templates/config.alloy.j2

@@ -3,30 +3,22 @@ prometheus.remote_write "prom_srv" {
     endpoint {
         url = "{{ prometheus.remote_write.endpoint.url }}"
     }
+
+  // global labels
+  external_labels = {
+    cluster     = sys.env("CLUSTER_NAME"),
+    zone        = sys.env("ZONE"),
+    job         = integrations/unix"
+  }
 }
 
 // metrics - scrape config
 prometheus.scrape "integrations_node_exporter" {
     scrape_interval = "15s"
-    targets    = discovery.relabel.integrations_node_exporter.output
+    targets    = prometheus.exporter.unix.integrations_node_exporter.targets
     forward_to = [prometheus.remote_write.prom_srv.receiver]
 }
 
-// metrics - relabel
-discovery.relabel "integrations_node_exporter" {
-targets = prometheus.exporter.unix.integrations_node_exporter.targets
-
-    rule {
-        target_label = "instance"
-        replacement  = constants.hostname
-    }
-
-    rule {
-        target_label = "job"
-        replacement = "node-exporter"
-    }
-}
-
 
 // metrics - node exporter
 prometheus.exporter.unix "integrations_node_exporter" {
@@ -62,6 +54,7 @@ loki.source.journal "logs_journal_scrape" {
     forward_to    = [loki.write.loki_srv.receiver]
 
     labels = {
+        job  = "integrations/journald",
         host = "{{ inventory_hostname }}",
         {% if loki.labels is defined and loki.labels %}
         {% for key, value in loki.labels.items() %}