diff --git a/.docker/docker-compose-monitoring.yml b/.docker/docker-compose-monitoring.yml index 1712edc1..7706cf4c 100644 --- a/.docker/docker-compose-monitoring.yml +++ b/.docker/docker-compose-monitoring.yml @@ -57,7 +57,7 @@ services: - "5778:5778" # HTTP otel-collector: - image: otel/opentelemetry-collector-contrib:0.100.0 + image: otel/opentelemetry-collector-contrib:0.146.1 ports: - "4317:4317" # OTLP gRPC receiver - "4318:4318" # OTLP Http receiver diff --git a/.env.sample b/.env.sample index 61b8399a..8ebbeb3b 100644 --- a/.env.sample +++ b/.env.sample @@ -155,8 +155,8 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4317 OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=http://localhost:4317 OTEL_METRICS_EXPORT_INTERVAL_MS=5000 OTEL_METRICS_ENABLED=true -PROMETHEUS_METRICS_ENABLED=true - +OTEL_METRICS_TEMPORALITY=DELTA +PROMETHEUS_METRICS_ENABLED=false LOGFLARE_ENABLED=false LOGFLARE_API_KEY=api_key diff --git a/monitoring/grafana/dashboards/storage.json b/monitoring/grafana/dashboards/storage.json index facef308..de66b249 100644 --- a/monitoring/grafana/dashboards/storage.json +++ b/monitoring/grafana/dashboards/storage.json @@ -5576,7 +5576,7 @@ }, "timepicker": {}, "timezone": "browser", - "title": "Storage API - OTel Metrics", - "uid": "storage-otel-metrics", + "title": "Storage API - OTel Metrics - Pull", + "uid": "storage-otel-pull-metrics", "version": 1 } diff --git a/monitoring/otel/config/otel-collector-config.yml b/monitoring/otel/config/otel-collector-config.yml index 96ac4b29..31f920fd 100644 --- a/monitoring/otel/config/otel-collector-config.yml +++ b/monitoring/otel/config/otel-collector-config.yml @@ -9,6 +9,9 @@ processors: check_interval: 1s limit_percentage: 70 spike_limit_percentage: 20 + deltatocumulative: + max_stale: 2m # how long to keep inactive streams + max_streams: 50000 # how many streams to keep batch/traces: send_batch_size: 10000 timeout: 10s @@ -169,7 +172,13 @@ service: metrics/otel: receivers: [otlp] processors: - [memory_limiter, transform/add_resource_attributes, metricstransform/host, batch/metrics] + [ + memory_limiter, + deltatocumulative, + transform/add_resource_attributes, + metricstransform/host, + batch/metrics, + ] exporters: [prometheusremotewrite] metrics/prometheus: receivers: [otlp]