From eea719af31d79cd2c379b0459ad748c3db11d78a Mon Sep 17 00:00:00 2001 From: Josh Lee Date: Sun, 14 Jul 2024 16:17:35 -0400 Subject: [PATCH 1/4] Changes interval on grafana dashboards to match scrape interval --- .../dashboards/demo/demo-dashboard.json | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json index 6698b10c2b..6807aca6af 100644 --- a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json @@ -52,6 +52,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -107,6 +108,7 @@ "y": 1 }, "id": 2, + "interval": "60s", "options": { "legend": { "calcs": [], @@ -187,6 +189,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -241,6 +244,7 @@ "y": 1 }, "id": 10, + "interval": "60s", "options": { "legend": { "calcs": [], @@ -281,6 +285,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -336,10 +341,11 @@ "y": 9 }, "id": 12, + "interval": "60s", "options": { "legend": { "calcs": [], - "displayMode": "list", + "displayMode": "table", "placement": "bottom", "showLegend": true }, @@ -431,7 +437,7 @@ }, "showHeader": true }, - "pluginVersion": "10.1.2", + "pluginVersion": "10.4.3", "targets": [ { "alias": "", @@ -518,7 +524,7 @@ }, "showHeader": true }, - "pluginVersion": "10.1.2", + "pluginVersion": "10.4.3", "targets": [ { "alias": "", @@ -577,6 +583,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -695,6 +702,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -798,6 +806,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -892,6 +901,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -978,8 +988,7 @@ ], "refresh": "", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -987,8 +996,8 @@ "allValue": "", "current": { "selected": true, - "text": "adservice", - "value": "adservice" + "text": "frontend", + "value": "frontend" }, "datasource": { "type": "prometheus", @@ -1022,4 +1031,4 @@ "uid": "W2gX2zHVk", "version": 1, "weekStart": "" -} +} \ No newline at end of file From 4a826427dd357fd3ce1fac6c28839a47ad9b4b14 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 19 Jul 2024 00:29:17 -0400 Subject: [PATCH 2/4] fix out of order sample --- src/prometheus/prometheus-config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/prometheus/prometheus-config.yaml b/src/prometheus/prometheus-config.yaml index c828fd8849..fee25beeca 100644 --- a/src/prometheus/prometheus-config.yaml +++ b/src/prometheus/prometheus-config.yaml @@ -4,6 +4,9 @@ global: evaluation_interval: 30s scrape_interval: 5s +storage: + tsdb: + out_of_order_time_window: 5m scrape_configs: - job_name: otel-collector static_configs: From 76f57f608a3750b6e2be136bef5e6b6064829344 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 19 Jul 2024 00:29:35 -0400 Subject: [PATCH 3/4] use 2m interval for spanmetrics --- .../provisioning/dashboards/demo/demo-dashboard.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json index 6807aca6af..eabd1d155e 100644 --- a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json @@ -24,6 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, + "id": 2, "links": [], "liveNow": false, "panels": [ @@ -108,7 +109,7 @@ "y": 1 }, "id": 2, - "interval": "60s", + "interval": "2m", "options": { "legend": { "calcs": [], @@ -244,7 +245,7 @@ "y": 1 }, "id": 10, - "interval": "60s", + "interval": "2m", "options": { "legend": { "calcs": [], @@ -341,7 +342,7 @@ "y": 9 }, "id": 12, - "interval": "60s", + "interval": "2m", "options": { "legend": { "calcs": [], @@ -956,6 +957,7 @@ "y": 35 }, "id": 16, + "interval": "2m", "options": { "legend": { "calcs": [], @@ -975,7 +977,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120", + "expr": "rate(otel_trace_span_processor_spans{job=\"quoteservice\"}[2m])*120", "interval": "2m", "legendFormat": "{{state}}", "range": true, @@ -1022,7 +1024,7 @@ ] }, "time": { - "from": "now-3h", + "from": "now-1h", "to": "now" }, "timepicker": {}, From cd4373184039df29509acac4954fedebb895f8fd Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 19 Jul 2024 00:36:20 -0400 Subject: [PATCH 4/4] use 30m for out of order samples --- src/prometheus/prometheus-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prometheus/prometheus-config.yaml b/src/prometheus/prometheus-config.yaml index fee25beeca..c4404c4840 100644 --- a/src/prometheus/prometheus-config.yaml +++ b/src/prometheus/prometheus-config.yaml @@ -6,7 +6,7 @@ global: scrape_interval: 5s storage: tsdb: - out_of_order_time_window: 5m + out_of_order_time_window: 30m scrape_configs: - job_name: otel-collector static_configs: