diff --git a/internal/test/oats/http/configs/grafana-datasources.yaml b/internal/test/oats/http/configs/grafana-datasources.yaml deleted file mode 100644 index c7b118ad5..000000000 --- a/internal/test/oats/http/configs/grafana-datasources.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Prometheus - type: prometheus - uid: prometheus - url: http://prometheus:9090 - jsonData: - exemplarTraceIdDestinations: - - name: trace_id - datasourceUid: tempo - - - name: Tempo - type: tempo - uid: tempo - url: http://tempo:3200 - jsonData: - tracesToLogs: - datasourceUid: 'loki' - mappedTags: [{ key: 'service.name', value: 'job' }] - mapTagNamesEnabled: true - filterByTraceID: true - serviceMap: - datasourceUid: 'prometheus' - search: - hide: false - nodeGraph: - enabled: true - lokiSearch: - datasourceUid: 'loki' - - - name: Loki - type: loki - uid: loki - url: http://loki:3100 - jsonData: - derivedFields: - - name: 'trace_id' - matcherRegex: '"traceid":"(\w+)"' - url: '$${__value.raw}' - datasourceUid: 'tempo' diff --git a/internal/test/oats/http/configs/otelcol-config.yaml b/internal/test/oats/http/configs/otelcol-config.yaml deleted file mode 100644 index b71179c1a..000000000 --- a/internal/test/oats/http/configs/otelcol-config.yaml +++ /dev/null @@ -1,41 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - http: - endpoint: 0.0.0.0:4318 - cors: - allowed_origins: - - "http://*" - - "https://*" - -exporters: - #debug: - # verbosity: detailed - # sampling_initial: 5 - # sampling_thereafter: 200 - prometheusremotewrite: - endpoint: http://prometheus:9090/api/v1/write - add_metric_suffixes: true - otlp: - endpoint: tempo:4317 - tls: - insecure: true - loki: - endpoint: http://loki:3100/loki/api/v1/push - -service: - pipelines: - traces: - receivers: [otlp] - exporters: [otlp] - #exporters: [otlp,debug] - metrics: - receivers: [otlp] - exporters: [prometheusremotewrite] - #exporters: [prometheusremotewrite,debug] - logs: - receivers: [otlp] - exporters: [loki] - #exporters: [loki,logging/logs] diff --git a/internal/test/oats/http/configs/prometheus-config.yml b/internal/test/oats/http/configs/prometheus-config.yml deleted file mode 100644 index cc4215ccc..000000000 --- a/internal/test/oats/http/configs/prometheus-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - evaluation_interval: 30s - scrape_interval: 5s -scrape_configs: - - job_name: otel - honor_labels: true - static_configs: - - targets: - - 'otelcol:9464' - - job_name: otel-collector - static_configs: - - targets: - - 'otelcol:8888' diff --git a/internal/test/oats/http/configs/tempo-config.yaml b/internal/test/oats/http/configs/tempo-config.yaml deleted file mode 100644 index 392dbaf4d..000000000 --- a/internal/test/oats/http/configs/tempo-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 3200 - grpc_listen_port: 9096 - -distributor: - receivers: - otlp: - protocols: - grpc: - -storage: - trace: - backend: local - wal: - path: /tmp/tempo/wal - local: - path: /tmp/tempo/blocks - -#metrics_generator: -# storage: -# path: /tmp/tempo/generator/wal -# remote_write: -# - url: http://localhost:9090/api/v1/write -# send_exemplars: true - -#overrides: -# metrics_generator_processors: [span-metrics] diff --git a/internal/test/oats/http/docker-compose-generic-template.yml b/internal/test/oats/http/docker-compose-generic-template.yml index c1c33e4f3..de068cd4d 100644 --- a/internal/test/oats/http/docker-compose-generic-template.yml +++ b/internal/test/oats/http/docker-compose-generic-template.yml @@ -1,37 +1,8 @@ version: "3.9" services: - grafana: - image: grafana/grafana:10.4.19@sha256:a9043254ba16fb10945cc27333963dfd08eccbb43b51f1222d831cc564e3a1f4 - volumes: - - "{{ .ConfigDir }}/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml" + collector: + image: grafana/otel-lgtm:0.11.14@sha256:95f21ed5744063935a3d8e636d09534bc56f3394ae9d2ec8a38e6d8b711709f1 ports: - "{{ .GrafanaHTTPPort }}:3000" - prometheus: - image: prom/prometheus:v2.47.0@sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331 - command: - - --web.enable-remote-write-receiver - - --enable-feature=exemplar-storage - - --enable-feature=native-histograms - - --config.file=/etc/prometheus/prometheus.yml - ports: - "{{ .PrometheusHTTPPort }}:9090" - tempo: - image: grafana/tempo:2.2.3@sha256:fbf0dea05b736ced1694fde8bd63e9236a49359c94ec24efcad5a7d2047e4d9a - volumes: - - "{{ .ConfigDir }}/tempo-config.yaml:/config.yaml" - command: - - --config.file=/config.yaml - ports: - "{{ .TempoHTTPPort }}:3200" -# loki: -# image: grafana/loki:2.9.0 -# ports: -# - "{{ .LokiHTTPPort }}:3100" - collector: - image: otel/opentelemetry-collector-contrib:0.119.0@sha256:36c35cc213c0f3b64d6e8a3e844dc90822f00725e0e518eaed5b08bcc2231e72 - volumes: - - "{{ .ConfigDir }}/otelcol-config.yaml:/config.yaml" - command: - - --config=file:/config.yaml - # we currently don't support this in our dashboards and grafana agent doesn't understand it yet - - --feature-gates=-pkg.translator.prometheus.NormalizeName diff --git a/internal/test/oats/kafka/configs/grafana-datasources.yaml b/internal/test/oats/kafka/configs/grafana-datasources.yaml deleted file mode 100644 index c7b118ad5..000000000 --- a/internal/test/oats/kafka/configs/grafana-datasources.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Prometheus - type: prometheus - uid: prometheus - url: http://prometheus:9090 - jsonData: - exemplarTraceIdDestinations: - - name: trace_id - datasourceUid: tempo - - - name: Tempo - type: tempo - uid: tempo - url: http://tempo:3200 - jsonData: - tracesToLogs: - datasourceUid: 'loki' - mappedTags: [{ key: 'service.name', value: 'job' }] - mapTagNamesEnabled: true - filterByTraceID: true - serviceMap: - datasourceUid: 'prometheus' - search: - hide: false - nodeGraph: - enabled: true - lokiSearch: - datasourceUid: 'loki' - - - name: Loki - type: loki - uid: loki - url: http://loki:3100 - jsonData: - derivedFields: - - name: 'trace_id' - matcherRegex: '"traceid":"(\w+)"' - url: '$${__value.raw}' - datasourceUid: 'tempo' diff --git a/internal/test/oats/kafka/configs/otelcol-config.yaml b/internal/test/oats/kafka/configs/otelcol-config.yaml deleted file mode 100644 index 2fc6b2669..000000000 --- a/internal/test/oats/kafka/configs/otelcol-config.yaml +++ /dev/null @@ -1,37 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - -exporters: - prometheusremotewrite: - endpoint: http://prometheus:9090/api/v1/write - add_metric_suffixes: true - otlp: - endpoint: tempo:4317 - tls: - insecure: true - loki: - endpoint: http://loki:3100/loki/api/v1/push - logging/metrics: - verbosity: detailed - logging/traces: - verbosity: detailed - logging/logs: - verbosity: detailed - -service: - pipelines: - traces: - receivers: [otlp] - #exporters: [otlp] - exporters: [otlp,logging/traces] - metrics: - receivers: [otlp] - exporters: [prometheusremotewrite] - #exporters: [prometheusremotewrite,logging/metrics] - logs: - receivers: [otlp] - exporters: [loki] - #exporters: [loki,logging/logs] diff --git a/internal/test/oats/kafka/configs/prometheus-config.yml b/internal/test/oats/kafka/configs/prometheus-config.yml deleted file mode 100644 index cc4215ccc..000000000 --- a/internal/test/oats/kafka/configs/prometheus-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - evaluation_interval: 30s - scrape_interval: 5s -scrape_configs: - - job_name: otel - honor_labels: true - static_configs: - - targets: - - 'otelcol:9464' - - job_name: otel-collector - static_configs: - - targets: - - 'otelcol:8888' diff --git a/internal/test/oats/kafka/configs/tempo-config.yaml b/internal/test/oats/kafka/configs/tempo-config.yaml deleted file mode 100644 index 392dbaf4d..000000000 --- a/internal/test/oats/kafka/configs/tempo-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 3200 - grpc_listen_port: 9096 - -distributor: - receivers: - otlp: - protocols: - grpc: - -storage: - trace: - backend: local - wal: - path: /tmp/tempo/wal - local: - path: /tmp/tempo/blocks - -#metrics_generator: -# storage: -# path: /tmp/tempo/generator/wal -# remote_write: -# - url: http://localhost:9090/api/v1/write -# send_exemplars: true - -#overrides: -# metrics_generator_processors: [span-metrics] diff --git a/internal/test/oats/kafka/docker-compose-generic-template.yml b/internal/test/oats/kafka/docker-compose-generic-template.yml index 2e5f97964..de068cd4d 100644 --- a/internal/test/oats/kafka/docker-compose-generic-template.yml +++ b/internal/test/oats/kafka/docker-compose-generic-template.yml @@ -1,37 +1,8 @@ version: "3.9" services: - grafana: - image: grafana/grafana:10.4.19@sha256:a9043254ba16fb10945cc27333963dfd08eccbb43b51f1222d831cc564e3a1f4 - volumes: - - "{{ .ConfigDir }}/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml" + collector: + image: grafana/otel-lgtm:0.11.14@sha256:95f21ed5744063935a3d8e636d09534bc56f3394ae9d2ec8a38e6d8b711709f1 ports: - "{{ .GrafanaHTTPPort }}:3000" - prometheus: - image: prom/prometheus:v2.47.0@sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331 - command: - - --web.enable-remote-write-receiver - - --enable-feature=exemplar-storage - - --enable-feature=native-histograms - - --config.file=/etc/prometheus/prometheus.yml - ports: - "{{ .PrometheusHTTPPort }}:9090" - tempo: - image: grafana/tempo:2.2.3@sha256:fbf0dea05b736ced1694fde8bd63e9236a49359c94ec24efcad5a7d2047e4d9a - volumes: - - "{{ .ConfigDir }}/tempo-config.yaml:/config.yaml" - command: - - --config.file=/config.yaml - ports: - "{{ .TempoHTTPPort }}:3200" -# loki: -# image: grafana/loki:2.9.0 -# ports: -# - "{{ .LokiHTTPPort }}:3100" - collector: - image: otel/opentelemetry-collector-contrib:0.103.0@sha256:0dffde3e58fc3f255cad861deb62d7c51505ce961a8a7e2107c7fc2668b774a3 - volumes: - - "{{ .ConfigDir }}/otelcol-config.yaml:/config.yaml" - command: - - --config=file:/config.yaml - # we currently don't support this in our dashboards and grafana agent doesn't understand it yet - - --feature-gates=-pkg.translator.prometheus.NormalizeName diff --git a/internal/test/oats/mongo/configs/grafana-datasources.yaml b/internal/test/oats/mongo/configs/grafana-datasources.yaml deleted file mode 100644 index c7b118ad5..000000000 --- a/internal/test/oats/mongo/configs/grafana-datasources.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Prometheus - type: prometheus - uid: prometheus - url: http://prometheus:9090 - jsonData: - exemplarTraceIdDestinations: - - name: trace_id - datasourceUid: tempo - - - name: Tempo - type: tempo - uid: tempo - url: http://tempo:3200 - jsonData: - tracesToLogs: - datasourceUid: 'loki' - mappedTags: [{ key: 'service.name', value: 'job' }] - mapTagNamesEnabled: true - filterByTraceID: true - serviceMap: - datasourceUid: 'prometheus' - search: - hide: false - nodeGraph: - enabled: true - lokiSearch: - datasourceUid: 'loki' - - - name: Loki - type: loki - uid: loki - url: http://loki:3100 - jsonData: - derivedFields: - - name: 'trace_id' - matcherRegex: '"traceid":"(\w+)"' - url: '$${__value.raw}' - datasourceUid: 'tempo' diff --git a/internal/test/oats/mongo/configs/otelcol-config.yaml b/internal/test/oats/mongo/configs/otelcol-config.yaml deleted file mode 100644 index 86b5e5bf6..000000000 --- a/internal/test/oats/mongo/configs/otelcol-config.yaml +++ /dev/null @@ -1,41 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - http: - endpoint: 0.0.0.0:4318 - cors: - allowed_origins: - - "http://*" - - "https://*" - -exporters: - debug: - verbosity: detailed - sampling_initial: 5 - sampling_thereafter: 200 - prometheusremotewrite: - endpoint: http://prometheus:9090/api/v1/write - add_metric_suffixes: true - otlp: - endpoint: tempo:4317 - tls: - insecure: true - loki: - endpoint: http://loki:3100/loki/api/v1/push - -service: - pipelines: - traces: - receivers: [otlp] - #exporters: [otlp] - exporters: [otlp,debug] - metrics: - receivers: [otlp] - #exporters: [prometheusremotewrite] - exporters: [prometheusremotewrite,debug] - logs: - receivers: [otlp] - exporters: [loki] - #exporters: [loki,logging/logs] diff --git a/internal/test/oats/mongo/configs/prometheus-config.yml b/internal/test/oats/mongo/configs/prometheus-config.yml deleted file mode 100644 index cc4215ccc..000000000 --- a/internal/test/oats/mongo/configs/prometheus-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - evaluation_interval: 30s - scrape_interval: 5s -scrape_configs: - - job_name: otel - honor_labels: true - static_configs: - - targets: - - 'otelcol:9464' - - job_name: otel-collector - static_configs: - - targets: - - 'otelcol:8888' diff --git a/internal/test/oats/mongo/configs/tempo-config.yaml b/internal/test/oats/mongo/configs/tempo-config.yaml deleted file mode 100644 index 392dbaf4d..000000000 --- a/internal/test/oats/mongo/configs/tempo-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 3200 - grpc_listen_port: 9096 - -distributor: - receivers: - otlp: - protocols: - grpc: - -storage: - trace: - backend: local - wal: - path: /tmp/tempo/wal - local: - path: /tmp/tempo/blocks - -#metrics_generator: -# storage: -# path: /tmp/tempo/generator/wal -# remote_write: -# - url: http://localhost:9090/api/v1/write -# send_exemplars: true - -#overrides: -# metrics_generator_processors: [span-metrics] diff --git a/internal/test/oats/mongo/docker-compose-generic-template.yml b/internal/test/oats/mongo/docker-compose-generic-template.yml index 2e5f97964..de068cd4d 100644 --- a/internal/test/oats/mongo/docker-compose-generic-template.yml +++ b/internal/test/oats/mongo/docker-compose-generic-template.yml @@ -1,37 +1,8 @@ version: "3.9" services: - grafana: - image: grafana/grafana:10.4.19@sha256:a9043254ba16fb10945cc27333963dfd08eccbb43b51f1222d831cc564e3a1f4 - volumes: - - "{{ .ConfigDir }}/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml" + collector: + image: grafana/otel-lgtm:0.11.14@sha256:95f21ed5744063935a3d8e636d09534bc56f3394ae9d2ec8a38e6d8b711709f1 ports: - "{{ .GrafanaHTTPPort }}:3000" - prometheus: - image: prom/prometheus:v2.47.0@sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331 - command: - - --web.enable-remote-write-receiver - - --enable-feature=exemplar-storage - - --enable-feature=native-histograms - - --config.file=/etc/prometheus/prometheus.yml - ports: - "{{ .PrometheusHTTPPort }}:9090" - tempo: - image: grafana/tempo:2.2.3@sha256:fbf0dea05b736ced1694fde8bd63e9236a49359c94ec24efcad5a7d2047e4d9a - volumes: - - "{{ .ConfigDir }}/tempo-config.yaml:/config.yaml" - command: - - --config.file=/config.yaml - ports: - "{{ .TempoHTTPPort }}:3200" -# loki: -# image: grafana/loki:2.9.0 -# ports: -# - "{{ .LokiHTTPPort }}:3100" - collector: - image: otel/opentelemetry-collector-contrib:0.103.0@sha256:0dffde3e58fc3f255cad861deb62d7c51505ce961a8a7e2107c7fc2668b774a3 - volumes: - - "{{ .ConfigDir }}/otelcol-config.yaml:/config.yaml" - command: - - --config=file:/config.yaml - # we currently don't support this in our dashboards and grafana agent doesn't understand it yet - - --feature-gates=-pkg.translator.prometheus.NormalizeName diff --git a/internal/test/oats/redis/configs/grafana-datasources.yaml b/internal/test/oats/redis/configs/grafana-datasources.yaml deleted file mode 100644 index c7b118ad5..000000000 --- a/internal/test/oats/redis/configs/grafana-datasources.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Prometheus - type: prometheus - uid: prometheus - url: http://prometheus:9090 - jsonData: - exemplarTraceIdDestinations: - - name: trace_id - datasourceUid: tempo - - - name: Tempo - type: tempo - uid: tempo - url: http://tempo:3200 - jsonData: - tracesToLogs: - datasourceUid: 'loki' - mappedTags: [{ key: 'service.name', value: 'job' }] - mapTagNamesEnabled: true - filterByTraceID: true - serviceMap: - datasourceUid: 'prometheus' - search: - hide: false - nodeGraph: - enabled: true - lokiSearch: - datasourceUid: 'loki' - - - name: Loki - type: loki - uid: loki - url: http://loki:3100 - jsonData: - derivedFields: - - name: 'trace_id' - matcherRegex: '"traceid":"(\w+)"' - url: '$${__value.raw}' - datasourceUid: 'tempo' diff --git a/internal/test/oats/redis/configs/otelcol-config.yaml b/internal/test/oats/redis/configs/otelcol-config.yaml deleted file mode 100644 index 2fc6b2669..000000000 --- a/internal/test/oats/redis/configs/otelcol-config.yaml +++ /dev/null @@ -1,37 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - -exporters: - prometheusremotewrite: - endpoint: http://prometheus:9090/api/v1/write - add_metric_suffixes: true - otlp: - endpoint: tempo:4317 - tls: - insecure: true - loki: - endpoint: http://loki:3100/loki/api/v1/push - logging/metrics: - verbosity: detailed - logging/traces: - verbosity: detailed - logging/logs: - verbosity: detailed - -service: - pipelines: - traces: - receivers: [otlp] - #exporters: [otlp] - exporters: [otlp,logging/traces] - metrics: - receivers: [otlp] - exporters: [prometheusremotewrite] - #exporters: [prometheusremotewrite,logging/metrics] - logs: - receivers: [otlp] - exporters: [loki] - #exporters: [loki,logging/logs] diff --git a/internal/test/oats/redis/configs/prometheus-config.yml b/internal/test/oats/redis/configs/prometheus-config.yml deleted file mode 100644 index cc4215ccc..000000000 --- a/internal/test/oats/redis/configs/prometheus-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - evaluation_interval: 30s - scrape_interval: 5s -scrape_configs: - - job_name: otel - honor_labels: true - static_configs: - - targets: - - 'otelcol:9464' - - job_name: otel-collector - static_configs: - - targets: - - 'otelcol:8888' diff --git a/internal/test/oats/redis/configs/tempo-config.yaml b/internal/test/oats/redis/configs/tempo-config.yaml deleted file mode 100644 index 392dbaf4d..000000000 --- a/internal/test/oats/redis/configs/tempo-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 3200 - grpc_listen_port: 9096 - -distributor: - receivers: - otlp: - protocols: - grpc: - -storage: - trace: - backend: local - wal: - path: /tmp/tempo/wal - local: - path: /tmp/tempo/blocks - -#metrics_generator: -# storage: -# path: /tmp/tempo/generator/wal -# remote_write: -# - url: http://localhost:9090/api/v1/write -# send_exemplars: true - -#overrides: -# metrics_generator_processors: [span-metrics] diff --git a/internal/test/oats/redis/docker-compose-generic-template.yml b/internal/test/oats/redis/docker-compose-generic-template.yml index 2e5f97964..de068cd4d 100644 --- a/internal/test/oats/redis/docker-compose-generic-template.yml +++ b/internal/test/oats/redis/docker-compose-generic-template.yml @@ -1,37 +1,8 @@ version: "3.9" services: - grafana: - image: grafana/grafana:10.4.19@sha256:a9043254ba16fb10945cc27333963dfd08eccbb43b51f1222d831cc564e3a1f4 - volumes: - - "{{ .ConfigDir }}/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml" + collector: + image: grafana/otel-lgtm:0.11.14@sha256:95f21ed5744063935a3d8e636d09534bc56f3394ae9d2ec8a38e6d8b711709f1 ports: - "{{ .GrafanaHTTPPort }}:3000" - prometheus: - image: prom/prometheus:v2.47.0@sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331 - command: - - --web.enable-remote-write-receiver - - --enable-feature=exemplar-storage - - --enable-feature=native-histograms - - --config.file=/etc/prometheus/prometheus.yml - ports: - "{{ .PrometheusHTTPPort }}:9090" - tempo: - image: grafana/tempo:2.2.3@sha256:fbf0dea05b736ced1694fde8bd63e9236a49359c94ec24efcad5a7d2047e4d9a - volumes: - - "{{ .ConfigDir }}/tempo-config.yaml:/config.yaml" - command: - - --config.file=/config.yaml - ports: - "{{ .TempoHTTPPort }}:3200" -# loki: -# image: grafana/loki:2.9.0 -# ports: -# - "{{ .LokiHTTPPort }}:3100" - collector: - image: otel/opentelemetry-collector-contrib:0.103.0@sha256:0dffde3e58fc3f255cad861deb62d7c51505ce961a8a7e2107c7fc2668b774a3 - volumes: - - "{{ .ConfigDir }}/otelcol-config.yaml:/config.yaml" - command: - - --config=file:/config.yaml - # we currently don't support this in our dashboards and grafana agent doesn't understand it yet - - --feature-gates=-pkg.translator.prometheus.NormalizeName diff --git a/internal/test/oats/sql/configs/grafana-datasources.yaml b/internal/test/oats/sql/configs/grafana-datasources.yaml deleted file mode 100644 index c7b118ad5..000000000 --- a/internal/test/oats/sql/configs/grafana-datasources.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Prometheus - type: prometheus - uid: prometheus - url: http://prometheus:9090 - jsonData: - exemplarTraceIdDestinations: - - name: trace_id - datasourceUid: tempo - - - name: Tempo - type: tempo - uid: tempo - url: http://tempo:3200 - jsonData: - tracesToLogs: - datasourceUid: 'loki' - mappedTags: [{ key: 'service.name', value: 'job' }] - mapTagNamesEnabled: true - filterByTraceID: true - serviceMap: - datasourceUid: 'prometheus' - search: - hide: false - nodeGraph: - enabled: true - lokiSearch: - datasourceUid: 'loki' - - - name: Loki - type: loki - uid: loki - url: http://loki:3100 - jsonData: - derivedFields: - - name: 'trace_id' - matcherRegex: '"traceid":"(\w+)"' - url: '$${__value.raw}' - datasourceUid: 'tempo' diff --git a/internal/test/oats/sql/configs/otelcol-config.yaml b/internal/test/oats/sql/configs/otelcol-config.yaml deleted file mode 100644 index 2fc6b2669..000000000 --- a/internal/test/oats/sql/configs/otelcol-config.yaml +++ /dev/null @@ -1,37 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - -exporters: - prometheusremotewrite: - endpoint: http://prometheus:9090/api/v1/write - add_metric_suffixes: true - otlp: - endpoint: tempo:4317 - tls: - insecure: true - loki: - endpoint: http://loki:3100/loki/api/v1/push - logging/metrics: - verbosity: detailed - logging/traces: - verbosity: detailed - logging/logs: - verbosity: detailed - -service: - pipelines: - traces: - receivers: [otlp] - #exporters: [otlp] - exporters: [otlp,logging/traces] - metrics: - receivers: [otlp] - exporters: [prometheusremotewrite] - #exporters: [prometheusremotewrite,logging/metrics] - logs: - receivers: [otlp] - exporters: [loki] - #exporters: [loki,logging/logs] diff --git a/internal/test/oats/sql/configs/prometheus-config.yml b/internal/test/oats/sql/configs/prometheus-config.yml deleted file mode 100644 index cc4215ccc..000000000 --- a/internal/test/oats/sql/configs/prometheus-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - evaluation_interval: 30s - scrape_interval: 5s -scrape_configs: - - job_name: otel - honor_labels: true - static_configs: - - targets: - - 'otelcol:9464' - - job_name: otel-collector - static_configs: - - targets: - - 'otelcol:8888' diff --git a/internal/test/oats/sql/configs/tempo-config.yaml b/internal/test/oats/sql/configs/tempo-config.yaml deleted file mode 100644 index 392dbaf4d..000000000 --- a/internal/test/oats/sql/configs/tempo-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 3200 - grpc_listen_port: 9096 - -distributor: - receivers: - otlp: - protocols: - grpc: - -storage: - trace: - backend: local - wal: - path: /tmp/tempo/wal - local: - path: /tmp/tempo/blocks - -#metrics_generator: -# storage: -# path: /tmp/tempo/generator/wal -# remote_write: -# - url: http://localhost:9090/api/v1/write -# send_exemplars: true - -#overrides: -# metrics_generator_processors: [span-metrics] diff --git a/internal/test/oats/sql/docker-compose-generic-template.yml b/internal/test/oats/sql/docker-compose-generic-template.yml index 2e5f97964..de068cd4d 100644 --- a/internal/test/oats/sql/docker-compose-generic-template.yml +++ b/internal/test/oats/sql/docker-compose-generic-template.yml @@ -1,37 +1,8 @@ version: "3.9" services: - grafana: - image: grafana/grafana:10.4.19@sha256:a9043254ba16fb10945cc27333963dfd08eccbb43b51f1222d831cc564e3a1f4 - volumes: - - "{{ .ConfigDir }}/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml" + collector: + image: grafana/otel-lgtm:0.11.14@sha256:95f21ed5744063935a3d8e636d09534bc56f3394ae9d2ec8a38e6d8b711709f1 ports: - "{{ .GrafanaHTTPPort }}:3000" - prometheus: - image: prom/prometheus:v2.47.0@sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331 - command: - - --web.enable-remote-write-receiver - - --enable-feature=exemplar-storage - - --enable-feature=native-histograms - - --config.file=/etc/prometheus/prometheus.yml - ports: - "{{ .PrometheusHTTPPort }}:9090" - tempo: - image: grafana/tempo:2.2.3@sha256:fbf0dea05b736ced1694fde8bd63e9236a49359c94ec24efcad5a7d2047e4d9a - volumes: - - "{{ .ConfigDir }}/tempo-config.yaml:/config.yaml" - command: - - --config.file=/config.yaml - ports: - "{{ .TempoHTTPPort }}:3200" -# loki: -# image: grafana/loki:2.9.0 -# ports: -# - "{{ .LokiHTTPPort }}:3100" - collector: - image: otel/opentelemetry-collector-contrib:0.103.0@sha256:0dffde3e58fc3f255cad861deb62d7c51505ce961a8a7e2107c7fc2668b774a3 - volumes: - - "{{ .ConfigDir }}/otelcol-config.yaml:/config.yaml" - command: - - --config=file:/config.yaml - # we currently don't support this in our dashboards and grafana agent doesn't understand it yet - - --feature-gates=-pkg.translator.prometheus.NormalizeName