Merge pull request #155 from krzko/chore-bump-deps

feat: bump versions and fix otelcol config
krzko · Dec 15, 2024 · dd86e12 · dd86e12
2 parents 4e73d93 + feb8c6b
commit dd86e12
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 OUTPUT:=bin
 EXECUTABLE:=run-o11y-run
 
-VERSION:=v0.13.3
+VERSION:=v0.14.0
 COMMIT=$(shell git describe --tags --always --long)
 NOW=$(shell date +'%Y%m%d')
 

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/urfave/cli/v2 v2.27.5
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
+	golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -24,7 +24,7 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -34,11 +34,15 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e h1:4qufH0hlUYs6AO6XmZC3GqfDPGSXHVXUFR6OND+iJX4=
+golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/internal/files/files/grafana/run-o11y-run/docker-compose.yaml b/internal/files/files/grafana/run-o11y-run/docker-compose.yaml
@@ -1,7 +1,7 @@
 services:
 
   grafana:
-    image: grafana/grafana:11.2.2
+    image: grafana/grafana:11.4.0
     container_name: grafana
     volumes:
       - ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
@@ -19,7 +19,7 @@ services:
       - "3000:3000"
 
   loki:
-    image: grafana/loki:3.2.1
+    image: grafana/loki:3.3.1
     container_name: loki
     command: "-config.file=/etc/loki/local-config.yaml"
     environment:
@@ -65,7 +65,7 @@ services:
       retries: 5
 
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.111.0
+    image: otel/opentelemetry-collector-contrib:0.115.1
     container_name: otel-collector
     command: [ "--config=/etc/otel-collector.yaml" ]
     volumes:
@@ -76,15 +76,17 @@ services:
       - "4317:4317"   # otlp grpc
       - "4318:4318"   # otlp http
       - "8094:8094"   # syslog
+      - "18888:18888"   # prometheus
     environment:
+      - DEBUG=true
       - NO_PROXY=grafana,loki,minio,otel-collector,prometheus,pyroscope,tempo
     depends_on:
       - loki
       - prometheus
       - tempo
 
   prometheus:
-    image: prom/prometheus:v2.54.1
+    image: prom/prometheus:v3.0.1
     container_name: prometheus
     command:
       - --config.file=/etc/prometheus.yaml

diff --git a/internal/files/files/grafana/shared/otel-collector.yaml.tmpl b/internal/files/files/grafana/shared/otel-collector.yaml.tmpl
@@ -67,7 +67,15 @@ service:
       receivers: [otlp]
       exporters: [otlp]
 {{- if .Debug }}
-    telemetry:
-      logs:
-        level: "debug"
+  telemetry:
+    logs:
+      level: "debug"
+    metrics:
+      level: normal
+      readers:
+        - pull:
+            exporter:
+              prometheus:
+                host: '0.0.0.0'
+                port: 18888
 {{- end }}
diff --git a/internal/files/files/grafana/shared/prometheus.yaml b/internal/files/files/grafana/shared/prometheus.yaml
@@ -6,7 +6,7 @@ scrape_configs:
   - job_name: 'otel-collector'
     honor_labels: true
     static_configs:
-      - targets: [ 'otel-collector:8888' ]
+      - targets: [ 'otel-collector:18888' ]
   - job_name: 'prometheus'
     honor_labels: true
     static_configs: