diff --git a/docker-compose.yml b/docker-compose.yml index cbf029a..1773c10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,55 +85,9 @@ services: networks: - continuity - prometheus: - container_name: continuity-prometheus - image: prom/prometheus:latest - restart: always - depends_on: - - server - ports: - - 9090:9090 - volumes: - - prom-data:/prometheus - - ./otlp/prometheus.yml:/etc/prometheus/prometheus.yml - networks: - - continuity - - otel-collector: - container_name: continuity-otel-collector - image: otel/opentelemetry-collector-contrib:0.89.0 - restart: always - depends_on: - - prometheus - ports: - - 14278:14278 - - 4317:4317 - - 9091:9091 - volumes: - - ./otlp/otel-config.yaml:/etc/otel-config.yaml - command: [ "--config=/etc/otel-config.yaml" ] - networks: - - continuity - - grafana: - networks: - - continuity - image: grafana/grafana:latest - depends_on: - - prometheus - volumes: - - ./otlp/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml - environment: - - GF_AUTH_ANONYMOUS_ENABLED=true - - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - - GF_AUTH_DISABLE_LOGIN_FORM=true - ports: - - 3000:3000 - networks: continuity: volumes: db-data: - prom-data: server-logs: diff --git a/otlp/datasource.yml b/otlp/datasource.yml deleted file mode 100644 index 9828310..0000000 --- a/otlp/datasource.yml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: 1 -datasources: - - name: Prometheus - type: prometheus - url: http://prometheus:9090 - isDefault: true - access: proxy - editable: true diff --git a/otlp/otel-config.yaml b/otlp/otel-config.yaml deleted file mode 100644 index 0003a8a..0000000 --- a/otlp/otel-config.yaml +++ /dev/null @@ -1,39 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - jaeger: - protocols: - thrift_http: - endpoint: otel-collector:14278 - - -exporters: - prometheus: - endpoint: otel-collector:9091 - zipkin: - endpoint: "http://zipkin:9411/api/v2/spans" - format: proto - otlp: - endpoint: jaeger:4317 - tls: - insecure: true - -processors: - batch: - -extensions: - health_check: - -service: - extensions: [ health_check ] - pipelines: - traces: - receivers: [ otlp, jaeger ] - processors: [ batch ] - exporters: [ otlp, zipkin ] - metrics: - receivers: [ otlp ] - processors: [ batch ] - exporters: [ prometheus ] diff --git a/otlp/prometheus.yml b/otlp/prometheus.yml deleted file mode 100644 index be6cf35..0000000 --- a/otlp/prometheus.yml +++ /dev/null @@ -1,8 +0,0 @@ -global: - scrape_interval: 15s - evaluation_interval: 15s - -scrape_configs: - - job_name: 'otel-collector' - static_configs: - - targets: [ 'otel-collector:9091' ]