fix(alloy): scrape all alloy pod targets on the Alloy HTTP port

README.md

@@ -319,6 +319,7 @@ values which are defined [here](https://github.com/grafana/helm-charts/tree/main
 | alloy.alloy.mounts.dockercontainers | bool | `true` |  |
 | alloy.alloy.mounts.varlog | bool | `true` |  |
 | alloy.commonRelabellings | string | `"rule {\n  source_labels = [\"__meta_kubernetes_namespace\"]\n  target_label  = \"namespace\"\n}\nrule {\n  source_labels = [\"__meta_kubernetes_pod_name\"]\n  target_label  = \"pod\"\n}\n// coalesce the following labels and pick the first value; we'll use this to define the \"job\" label\nrule {\n  source_labels  = [\"__meta_kubernetes_pod_label_app_kubernetes_io_component\", \"app\", \"__meta_kubernetes_pod_container_name\"]\n  separator      = \"/\"\n  target_label   = \"__meta_app\"\n  action         = \"replace\"\n  regex          = \"^/*([^/]+?)(?:/.*)?$\" // split by the delimiter if it exists, we only want the first one\n  replacement    = \"${1}\"\n}\nrule {\n  source_labels = [\"__meta_kubernetes_namespace\", \"__meta_kubernetes_pod_label_app_kubernetes_io_name\", \"__meta_app\"]\n  separator     = \"/\"\n  target_label  = \"job\"\n}\nrule {\n  source_labels = [\"__meta_kubernetes_pod_container_name\"]\n  target_label  = \"container\"\n}\nrule {\n  regex   = \"__meta_kubernetes_pod_label_(statefulset_kubernetes_io_pod_name|controller_revision_hash)\"\n  action  = \"labeldrop\"\n}\nrule {\n  regex   = \"pod_template_generation\"\n  action  = \"labeldrop\"\n}\nrule {\n  source_labels = [\"__meta_kubernetes_pod_phase\"]\n  regex = \"Pending|Succeeded|Failed|Completed\"\n  action = \"drop\"\n}\nrule {\n  source_labels = [\"__meta_kubernetes_pod_node_name\"]\n  action = \"replace\"\n  target_label = \"node\"\n}\nrule {\n  action = \"labelmap\"\n  regex = \"__meta_kubernetes_pod_annotation_prometheus_io_param_(.+)\"\n  replacement = \"__param_$1\"\n}"` |  |
+| alloy.controller.podAnnotations."prometheus.io/port" | string | `"12345"` |  |
 | alloy.controller.podAnnotations."prometheus.io/scrape" | string | `"true"` |  |
 | alloy.controller.type | string | `"daemonset"` |  |
 | alloy.crds.create | bool | `false` |  |

coder-observability/values.yaml

@@ -211,6 +211,11 @@ alloy:
     type: daemonset
     podAnnotations:
       prometheus.io/scrape: "true"
+      # Pod discovery makes one target per declared container port, and a target
+      # on port 80 for containers that declare none (such as config-reloader).
+      # Pin every target of this pod to the Alloy HTTP port.
+      # Must equal alloy.alloy.listenPort.
+      prometheus.io/port: "12345"
   crds:
     create: false
 

compiled/resources.yaml

@@ -12072,6 +12072,7 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: alloy
+        prometheus.io/port: "12345"
         prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: alloy