Merge pull request #186 from hossted/dev

grafana alloy

Author: AdheipSingh

compose/monitoring/config.river compose/monitoring/config.alloycompose/monitoring/config.river renamed to compose/monitoring/config.alloy

@@ -88,6 +88,7 @@ loki.write "local" {
 		}	
   }
 }
+
 logging {
 	level = "debug"
 }

compose/monitoring/docker-compose.yaml

@@ -4,7 +4,7 @@ services:
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.47.0
     container_name: hossted_cadvisor
-    #ports:
+    # ports:
     #  - "8082:8080"
     volumes:
       - /:/rootfs:ro
@@ -17,7 +17,7 @@ services:
   node_exporter:
     image: prom/node-exporter:latest
     container_name: hossted_node_exporter
-    #ports:
+    # ports:
     #  - "9100:9100"
     volumes:
       - /proc:/host/proc:ro
@@ -29,16 +29,12 @@ services:
       - '--collector.filesystem.ignored-mount-points="^/(sys|proc|dev|host|etc)($$|/)"'
     restart: unless-stopped
 
-  grafana_agent:
-    image: grafana/agent:v0.41.1
-    container_name: hossted_grafana_agent
-    entrypoint: |
-      /bin/bash -c '
-      AGENT_MODE=flow grafana-agent run /etc/config.river
-      '
+  grafana_alloy:
+    image: grafana/alloy:latest
+    container_name: hossted_grafana_alloy
     ports:
       - "12345:12345"
     volumes:
-      - ./config.river:/etc/config.river
+      - ./config.alloy:/etc/alloy/config.alloy
       - /var/run/docker.sock:/var/run/docker.sock:ro      
     restart: unless-stopped

hossted/service/activate.go

@@ -48,7 +48,7 @@ const (
 	hosstedPlatformNamespace   = "hossted-platform"
 	hosstedOperatorReleaseName = "hossted-operator"
 	trivyOperatorReleaseName   = "trivy-operator"
-	grafanaAgentReleaseName    = "hossted-grafana-agent"
+	grafanaAgentReleaseName    = "hossted-grafana-alloy"
 	releaseName                = "hossted-operator-cr"
 )