From 4748949a903d8eb2d0ec2be22e9f8d4ebd2797d8 Mon Sep 17 00:00:00 2001
From: Kristof Kowalski <1499932+krzko@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:51:45 +1100
Subject: [PATCH] fix: otlp default endpoint values

---
 Makefile                                              |  2 +-
 dockerfiles/otel-collector/Dockerfile                 |  2 +-
 .../files/grafana/run-o11y-run/docker-compose.yaml    |  4 +---
 .../files/grafana/shared/otel-collector.yaml.tmpl     | 11 +++++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6af5269..2625ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 OUTPUT:=bin
 EXECUTABLE:=run-o11y-run
 
-VERSION:=v0.13.1
+VERSION:=v0.13.2
 COMMIT=$(shell git describe --tags --always --long)
 NOW=$(shell date +'%Y%m%d')
 
diff --git a/dockerfiles/otel-collector/Dockerfile b/dockerfiles/otel-collector/Dockerfile
index 6b15ce7..20e37e6 100644
--- a/dockerfiles/otel-collector/Dockerfile
+++ b/dockerfiles/otel-collector/Dockerfile
@@ -1,2 +1,2 @@
 # dependabot will update this file when base image is updated
-FROM otel/opentelemetry-collector-contrib:0.110.0
+FROM otel/opentelemetry-collector-contrib:0.111.0
diff --git a/internal/files/files/grafana/run-o11y-run/docker-compose.yaml b/internal/files/files/grafana/run-o11y-run/docker-compose.yaml
index 5feb9de..209a4d2 100644
--- a/internal/files/files/grafana/run-o11y-run/docker-compose.yaml
+++ b/internal/files/files/grafana/run-o11y-run/docker-compose.yaml
@@ -65,7 +65,7 @@ services:
       retries: 5
 
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.110.0
+    image: otel/opentelemetry-collector-contrib:0.111.0
     container_name: otel-collector
     command: [ "--config=/etc/otel-collector.yaml" ]
     volumes:
@@ -117,8 +117,6 @@ services:
       - ../shared/tempo.yaml:/etc/tempo.yaml
       - ./tempo-data:/tmp/tempo
     ports:
-      # - "4317:4317"   # otlp grpc
-      # - "4318:4318"   # otlp http
       - "14268:14268" # jaeger ingest
       - "3200:3200"   # tempo
       - "9095:9095"   # tempo grpc
diff --git a/internal/files/files/grafana/shared/otel-collector.yaml.tmpl b/internal/files/files/grafana/shared/otel-collector.yaml.tmpl
index 5fd19f4..c4e2dfd 100644
--- a/internal/files/files/grafana/shared/otel-collector.yaml.tmpl
+++ b/internal/files/files/grafana/shared/otel-collector.yaml.tmpl
@@ -15,10 +15,17 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: 0.0.0.0:4317
       http:
+        endpoint: 0.0.0.0:4318
+        cors:
+          allowed_origins:
+            - "*"
+          allowed_headers:
+            - "*"
   syslog:
     tcp:
-      listen_address: "0.0.0.0:8094"
+      listen_address: 0.0.0.0:8094
     protocol: rfc3164
     location: UTC
     operators:
@@ -63,4 +70,4 @@ service:
     telemetry:
       logs:
         level: "debug"
-{{- end }}
\ No newline at end of file
+{{- end }}