Improve alloy docker image. Cleanup folders

Author: alhendrickson

observability/examples/alloy/docker-compose.yml

@@ -0,0 +1,12 @@
+- targets:
+    - cogstack-observability-traefik-1/grafana/api/health
+  labels:
+    name: grafana
+    job: probe-observability-stack
+    host: localhost
+- targets:
+    - cogstack-observability-traefik-1/prometheus/-/healthy
+  labels:
+    name: prometheus
+    job: probe-observability-stack
+    host: localhost

observability/examples/alloy/prometheus/scrape-configs/probers/probe-internal.yml

@@ -6,6 +6,8 @@ services:
     image: cogstacksystems/cogstack-observability-alloy:latest
     ports:
       - "12345:12345"
+    networks:
+      - observability
     volumes:
       - ${BASE_DIR-.}/alloy/probers:/etc/alloy/probers
       # CAdvisor

observability/examples/alloy/prometheus/scrape-configs/recording-rules/slo.yml

@@ -15,7 +15,7 @@ services:
       - 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
-      - ELASTICSEARCH_URL=${ELASTICSEARCH_URL-https://elassticsearch-1:9200}
+      - ELASTICSEARCH_URL=${ELASTICSEARCH_URL-https://elasticsearch-1:9200}
       - ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME-user} # Used to get metrics from Elasticsearch
       - ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD-pass} # Used to get metrics from Elasticsearch
     networks:

observability/examples/full/alloy/probers/probe-internal.yml

@@ -0,0 +1,12 @@
+- targets:
+    - cogstack-observability-traefik-1/grafana/api/health
+  labels:
+    name: grafana
+    job: probe-observability-stack
+    host: localhost
+- targets:
+    - cogstack-observability-traefik-1/prometheus/-/healthy
+  labels:
+    name: prometheus
+    job: probe-observability-stack
+    host: localhost

observability/examples/full/alloy/probers/probe-observability.yml

@@ -3,6 +3,8 @@ FROM grafana/alloy:latest
 LABEL traefik.enable="true" \
     traefik.http.routers.alloy.rule="PathPrefix(`/alloy`)" 
 
+RUN mkdir -p /etc/alloy/probers
+
 COPY ./defaults /etc/alloy
 
 CMD [ \

observability/examples/full/docker-compose.yml

@@ -8,31 +8,7 @@ prometheus.remote_write "default" {
     url = sys.env("PROMETHEUS_URL") + "/api/v1/write"
   }
   external_labels = {
-    host = sys.env("ALLOY_HOSTNAME"),
-    ip_address = sys.env("ALLOY_IP_ADDRESS"),
+    alloy_hostname = sys.env("ALLOY_HOSTNAME"),
+    alloy_ip_address = sys.env("ALLOY_IP_ADDRESS"),
   } 
-}
-
-prometheus.scrape "exporter" {
-    scrape_interval = "15s"
-    targets    = array.concat(
-        prometheus.exporter.self.alloy.targets,
-        prometheus.exporter.cadvisor.local_cadvisor.targets,
-        prometheus.exporter.unix.local_node_exporter.targets,
-    )
-    forward_to = [prometheus.remote_write.default.receiver]
-}
-
-// Alloys internal metrics
-prometheus.exporter.self "alloy" {
-}
-
-// CAdvisor
-prometheus.exporter.cadvisor "local_cadvisor" {
-  docker_host = "unix:///var/run/docker.sock"
-  storage_duration = "5m"
-}
-
-// Node exporter
-prometheus.exporter.unix "local_node_exporter" {
-}
+}