Create docker image for Alloy

alhendrickson · alhendrickson · commit a9b78862d782 · 2025-06-09T16:00:44.000Z
diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml
@@ -29,6 +29,10 @@ jobs:
             context: observability/traefik
             dockerfile: observability/traefik/Dockerfile
             image: cogstacksystems/cogstack-observability-traefik
+          - name: alloy
+            context: observability/grafana-alloy
+            dockerfile: observability/grafana-alloy/Dockerfile
+            image: cogstacksystems/cogstack-observability-alloy
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
diff --git a/observability/build-docker.sh b/observability/build-docker.sh
@@ -5,4 +5,6 @@ docker build -t cogstacksystems/cogstack-observability-blackbox-exporter:latest
 
 docker build -t cogstacksystems/cogstack-observability-grafana:latest -f grafana/Dockerfile ./grafana
 
-docker build -t cogstacksystems/cogstack-observability-traefik:latest -f traefik/Dockerfile ./traefik
+docker build -t cogstacksystems/cogstack-observability-traefik:latest -f traefik/Dockerfile ./traefik
+
+docker build -t cogstacksystems/cogstack-observability-alloy:latest -f grafana-alloy/Dockerfile ./grafana-alloy --debug
diff --git a/observability/examples/alloy/docker-compose.yml b/observability/examples/alloy/docker-compose.yml
@@ -5,20 +5,11 @@ services:
   prometheus:
     image: cogstacksystems/cogstack-observability-prometheus:latest
     restart: unless-stopped
-    ports:
-      - "9090:9090"
     volumes:
-      - ${BASE_DIR-.}/prometheus:/etc/prometheus/cogstack/site/
+      - ./prometheus:/etc/prometheus/cogstack/site/
       - prometheus-data:/prometheus
     networks:
       - observability
-    command: 
-    - "--config.file=/etc/prometheus/cogstack/defaults/prometheus.yml"
-    - "--storage.tsdb.path=/prometheus"
-    - "--storage.tsdb.retention.time=30d"
-    - "--web.external-url=/prometheus"
-    - "--web.route-prefix=/prometheus"
-    - "--web.enable-remote-write-receiver"
   grafana:
     image: cogstacksystems/cogstack-observability-grafana:latest
     restart: unless-stopped
@@ -38,36 +29,22 @@ services:
       - "80:80"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro       # So that Traefik can listen to the Docker events
-  blackbox-exporter:
-    image: cogstacksystems/cogstack-observability-blackbox-exporter:latest
-    restart: unless-stopped
-    networks:
-      - observability
   alloy:
-    image: grafana/alloy:latest
-    command:
-      - run
-      - --server.http.listen-addr=0.0.0.0:12345
-      - --storage.path=/var/lib/alloy/data
-      - --server.http.ui-path-prefix=/alloy
-      - /etc/alloy
+    image: cogstacksystems/cogstack-observability-alloy:latest
     ports:
       - "12345:12345"
     volumes:
-      - ${BASE_DIR-.}/grafana-alloy:/etc/alloy
+      - ${BASE_DIR-.}/grafana-alloy/probes:/etc/alloy/probes
       # - ${BASE_DIR-.}/grafana-alloy/advanced/elasticsearch.alloy:/etc/alloy/elasticsearch.alloy # Enable Elastic Exporter
       # CAdvisor
       - /:/rootfs:ro
       - /var/run:/var/run:rw
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.alloy.rule=PathPrefix(`/alloy`)"
     environment:
-      - PROMETHEUS_URL=${PROMETHEUS_URL-http://cogstack-observability-prometheus-1:9090/prometheus/api/v1/write}
-      - ALLOY_HOSTNAME=${ALLOY_HOSTNAME} # Used to add a label to metrics
-      - ALLOY_IP_ADDRESS=${ALLOY_IP_ADDRESS} # Used to add a label to metrics
+      - PROMETHEUS_URL=http://cogstack-observability-prometheus-1:9090/prometheus
+      - ALLOY_HOSTNAME=${ALLOY_HOSTNAME-localhost} # Used to add a label to metrics
+      - ALLOY_IP_ADDRESS=${ALLOY_IP_ADDRESS-localhost} # Used to add a label to metrics
     networks:
       - observability
 networks:
diff --git a/observability/examples/alloy/grafana-alloy/probes/probe-external.yml b/observability/examples/alloy/grafana-alloy/probes/probe-external.yml
@@ -2,11 +2,5 @@
 - targets:
     - https://cogstack.org
   labels:
-    name: cogstack-homepage
-    job: probe-services-alloy
-- targets:
-    - https://cogstack.org
-  labels:
-    name: admin_probe
-    job: probe-services-alloy-2
-    module: http_admin_get_200
+    name: homepage
+    job: probe-services
diff --git a/observability/examples/alloy/prometheus/scrape-configs/probers/probe-internal.yml b/observability/examples/alloy/prometheus/scrape-configs/probers/probe-internal.yml
diff --git a/observability/grafana-alloy/Dockerfile b/observability/grafana-alloy/Dockerfile
@@ -0,0 +1,16 @@
+FROM grafana/alloy:latest
+
+LABEL traefik.enable="true" \
+    traefik.http.routers.alloy.rule="PathPrefix(`/alloy`)" 
+
+COPY ./defaults /etc/alloy
+
+CMD [ \
+    "run", \
+    "--server.http.listen-addr=0.0.0.0:12345", \
+    "--storage.path=/var/lib/alloy/data", \
+    "--server.http.ui-path-prefix=/alloy", \
+    "/etc/alloy" \
+    ] 
+
+ENV PROMETHEUS_URL=http://cogstack-observability-prometheus-1:9090/prometheus
diff --git a/observability/grafana-alloy/defaults/blackbox-exporter.yml b/observability/grafana-alloy/defaults/blackbox-exporter.yml
diff --git a/observability/grafana-alloy/defaults/config.alloy b/observability/grafana-alloy/defaults/config.alloy
@@ -9,7 +9,7 @@ livedebugging {
 
 prometheus.remote_write "default" {
   endpoint {
-    url = sys.env("PROMETHEUS_URL")
+    url = sys.env("PROMETHEUS_URL") + "/api/v1/write"
   }
   external_labels = {
     host = sys.env("ALLOY_HOSTNAME"),
diff --git a/observability/grafana-alloy/defaults/probe-default-config.alloy b/observability/grafana-alloy/defaults/probe-default-config.alloy
@@ -1,7 +1,7 @@
 
 // Blackbox Exporter - Probe Observability Stack
 prometheus.exporter.blackbox "probe_observability_stack" {
-  config_file = "/etc/alloy/blackbox.yml"
+  config_file = "/etc/alloy/blackbox-exporter.yml"
   target {
     name    = "grafana"
     address = "cogstack-observability-traefik-1/grafana/api/health"
@@ -60,7 +60,7 @@ discovery.relabel "probe_target_files_with_defaults" {
    source_labels =  ["module"]
    target_label =  "module"
    regex =  ""
-   replacement =  "http_200_ok"
+   replacement =  "http_get_200"
   }
   rule {
     // Alloy takes the "name" field from the yml file, puts it into the job field as a suffix, then removes name. This brings name back.
@@ -70,7 +70,7 @@ discovery.relabel "probe_target_files_with_defaults" {
 }
 
 prometheus.exporter.blackbox "probe_discovered_targets" {
-  config_file = "/etc/alloy/blackbox.yml"
+  config_file = "/etc/alloy/blackbox-exporter.yml"
   targets = discovery.relabel.probe_target_files_with_defaults.output
 }
 
diff --git a/observability/grafana/Dockerfile b/observability/grafana/Dockerfile
@@ -17,4 +17,4 @@ ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboar
     ALERTING_PAUSE_BURN_RATE=true \
     ALERTING_DEFAULT_CONTACT=Slack \
     SLACK_WEBHOOK_URL=http://localhost:3000/missing-SLACK_WEBHOOK_URL-env-var \
-    PROMETHEUS_DATASOURCE_URL=http://cogstack-observability-prometheus-1:9090/prometheus
+    PROMETHEUS_URL=http://cogstack-observability-prometheus-1:9090/prometheus
diff --git a/observability/grafana/Dockerfile.alloy b/observability/grafana/Dockerfile.alloy
diff --git a/observability/grafana/alloy/default-config.alloy b/observability/grafana/alloy/default-config.alloy
diff --git a/observability/grafana/provisioning/datasources/default.yml b/observability/grafana/provisioning/datasources/default.yml
@@ -24,7 +24,7 @@ datasources:
     uid: datasource-prometheus-local-docker
     # <string> Sets the data source's URL, including the
     # port.
-    url: ${PROMETHEUS_DATASOURCE_URL}
+    url: ${PROMETHEUS_URL}
     isDefault: true
     # <bool> Allows users to edit data sources from the
     # Grafana UI.
diff --git a/observability/prometheus/defaults/scrape-config.local.yml b/observability/prometheus/defaults/scrape-config.local.yml
diff --git a/observability/prometheus/defaults/scrape-configs/scrape-config.self.yml b/observability/prometheus/defaults/scrape-configs/scrape-config.self.yml
@@ -12,11 +12,6 @@ scrape_configs:
         labels:
           name: grafana # collect grafana metrics like dashboard usage
           __metrics_path__: /metrics
-      - targets:
-          - cogstack-observability-traefik-1 # Collect blackbox-exporter metrics like number of probes
-        labels:
-          name: blackbox-exporter
-          __metrics_path__: /blackbox-exporter/metrics
       - targets:
           - cogstack-observability-traefik-1:8080  # Collect Traefik metrics like number of success calls
         labels:
@@ -25,33 +20,4 @@ scrape_configs:
         - target_label: env
           replacement: observability-stack
         - target_label: host
-          replacement: prometheus-host
-  - job_name: "probe-observability-stack" # Probe if the observability services are running
-    metrics_path: /blackbox-exporter/probe
-    params:
-      module: [http_get_200]
-    static_configs:
-      - targets:
-          - cogstack-observability-traefik-1/grafana/api/health
-        labels:
-          name: grafana
-      - targets:
-          - cogstack-observability-traefik-1/prometheus/-/healthy
-        labels:
-          name: prometheus
-    relabel_configs:
-      - source_labels: [__address__]
-        regex: ([0-9.]+):[0-9]+
-        target_label: ip_address
-      - target_label: env
-        replacement: observability-stack
-      - source_labels: [__address__]
-        target_label: __param_target
-      - source_labels: [__address__]
-        regex: ([^/]+)/(.*)
-        target_label: instance
-        replacement: prometheus-host/$2
-      - target_label: host
-        replacement: prometheus-host
-      - target_label: __address__
-        replacement: cogstack-observability-traefik-1 # The blackbox exporter's real host:port.
+          replacement: prometheus-host

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ livedebugging {`
`9`	`9`
`10`	`10`	`prometheus.remote_write "default" {`
`11`	`11`	`endpoint {`
`12`		`- url = sys.env("PROMETHEUS_URL")`
	`12`	`+ url = sys.env("PROMETHEUS_URL") + "/api/v1/write"`
`13`	`13`	`}`
`14`	`14`	`external_labels = {`
`15`	`15`	`host = sys.env("ALLOY_HOSTNAME"),`