From 9f32dd5a4e5ba9fda460bc7fc27c48f3c922e9dd Mon Sep 17 00:00:00 2001 From: Ivan Porto Date: Tue, 18 Nov 2025 14:27:44 +0100 Subject: [PATCH] chore: remove config files and simplify compose services --- docker-compose.yaml | 65 ++++++++------------------------------ otel-collector-config.yaml | 42 ------------------------ prometheus.yaml | 7 ---- tempo.yaml | 26 --------------- 4 files changed, 13 insertions(+), 127 deletions(-) delete mode 100644 otel-collector-config.yaml delete mode 100644 prometheus.yaml delete mode 100644 tempo.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml index 1fe829f8..de420e96 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,70 +1,31 @@ services: - otel-collector: - image: otel/opentelemetry-collector-contrib:latest - container_name: otel-collector + otel-lgtm: + image: grafana/otel-lgtm:latest + container_name: otel-lgtm restart: unless-stopped + ports: + - "3000:3000" # Grafana UI + - "4317:4317" # OTLP gRPC + - "4318:4318" # OTLP HTTP volumes: - - "./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml" - ports: - - "4317:4317" - - "4318:4318" + - "lgtm-data:/data" # Persist data across restarts networks: [telemetry] - depends_on: [tempo, loki] - - tempo: - image: grafana/tempo:latest - container_name: tempo - restart: unless-stopped - volumes: - - "./tempo.yaml:/etc/tempo.yaml" - networks: [telemetry] - command: - - "-config.file=/etc/tempo.yaml" - - prometheus: - image: prom/prometheus:latest - container_name: prometheus - restart: unless-stopped - volumes: - - "./prometheus.yaml:/etc/prometheus/prometheus.yml" - ports: - - "9090:9090" # Prometheus UI - networks: [telemetry] - depends_on: [otel-collector] - - loki: - image: grafana/loki:latest - container_name: loki - restart: unless-stopped - networks: [telemetry] - command: - - "-config.file=/etc/loki/local-config.yaml" - - grafana: - image: grafana/grafana:latest - container_name: grafana - restart: unless-stopped - ports: - - "3000:3000" - volumes: - - "grafana-storage:/var/lib/grafana" - networks: [telemetry] - depends_on: [loki, prometheus, tempo] + # Cloudflare Tunnel - Exposes collector for deployed actions cloudflared: image: cloudflare/cloudflared:latest container_name: cloudflared restart: unless-stopped networks: [telemetry] - depends_on: [otel-collector] - command: + depends_on: [otel-lgtm] + command: - "tunnel" - "--url" - - "http://otel-collector:4318" + - "http://otel-lgtm:4318" networks: telemetry: driver: bridge volumes: - grafana-storage: \ No newline at end of file + lgtm-data: \ No newline at end of file diff --git a/otel-collector-config.yaml b/otel-collector-config.yaml deleted file mode 100644 index b863c43e..00000000 --- a/otel-collector-config.yaml +++ /dev/null @@ -1,42 +0,0 @@ -receivers: - otlp: - protocols: - http: - endpoint: 0.0.0.0:4318 - - # Uncomment this if you want to use the gRPC protocol - # grpc: - # endpoint: 0.0.0.0:4317 - -processors: - batch: - -exporters: - # Traces to Tempo - otlphttp/tempo: - endpoint: http://tempo:4318 - - # Metrics to Prometheus - prometheus: - endpoint: "0.0.0.0:8889" - - # Logs to Loki - loki: - endpoint: http://loki:3100/loki/api/v1/push - -service: - pipelines: - traces: - receivers: [otlp] - processors: [batch] - exporters: [otlphttp/tempo] - - metrics: - receivers: [otlp] - processors: [batch] - exporters: [prometheus] - - logs: - receivers: [otlp] - processors: [batch] - exporters: [loki] \ No newline at end of file diff --git a/prometheus.yaml b/prometheus.yaml deleted file mode 100644 index 33c5bb47..00000000 --- a/prometheus.yaml +++ /dev/null @@ -1,7 +0,0 @@ -global: - scrape_interval: 15s - -scrape_configs: - - job_name: 'otel-collector-app-metrics' - static_configs: - - targets: ['otel-collector:8889'] \ No newline at end of file diff --git a/tempo.yaml b/tempo.yaml deleted file mode 100644 index cf1e8245..00000000 --- a/tempo.yaml +++ /dev/null @@ -1,26 +0,0 @@ -server: - http_listen_port: 3200 - -distributor: - receivers: - otlp: - protocols: - http: - endpoint: 0.0.0.0:4318 - -ingester: - trace_idle_period: 10s - max_block_bytes: 100_000_000 - max_block_duration: 5m - -compactor: - compaction: - block_retention: 1h - -storage: - trace: - backend: local - local: - path: /tmp/tempo - wal: - path: /tmp/tempo/wal \ No newline at end of file