Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes interval on grafana dashboards to match scrape interval #1669

Merged
merged 9 commits into from
Jul 23, 2024
Merged

Changes interval on grafana dashboards to match scrape interval #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eea719a
Changes interval on grafana dashboards to match scrape interval
joshleecreates Jul 14, 2024
ce23391
Merge branch 'main' into fix-grafana-visualizations
julianocosta89 Jul 16, 2024
4a82642
fix out of order sample
puckpuck Jul 19, 2024
76f57f6
use 2m interval for spanmetrics
puckpuck Jul 19, 2024
88e08a5
Merge branch 'main' into fix-grafana-visualizations
puckpuck Jul 19, 2024
cd43731
use 30m for out of order samples
puckpuck Jul 19, 2024
132afa8
Merge remote-tracking branch 'joshleecreates/fix-grafana-visualizatio…
puckpuck Jul 19, 2024
4081f58
Merge branch 'main' into fix-grafana-visualizations
julianocosta89 Jul 23, 2024
3ae5b4a
Merge branch 'main' into fix-grafana-visualizations
julianocosta89 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/grafana/provisioning/dashboards/demo/demo-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 2,
"links": [],
"liveNow": false,
"panels": [
Expand Down Expand Up @@ -52,6 +53,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -107,6 +109,7 @@
"y": 1
},
"id": 2,
"interval": "2m",
"options": {
"legend": {
"calcs": [],
Expand Down Expand Up @@ -187,6 +190,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -241,6 +245,7 @@
"y": 1
},
"id": 10,
"interval": "2m",
"options": {
"legend": {
"calcs": [],
Expand Down Expand Up @@ -281,6 +286,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -336,10 +342,11 @@
"y": 9
},
"id": 12,
"interval": "2m",
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"displayMode": "table",
"placement": "bottom",
"showLegend": true
},
Expand Down Expand Up @@ -431,7 +438,7 @@
},
"showHeader": true
},
"pluginVersion": "10.1.2",
"pluginVersion": "10.4.3",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -518,7 +525,7 @@
},
"showHeader": true
},
"pluginVersion": "10.1.2",
"pluginVersion": "10.4.3",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -577,6 +584,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -695,6 +703,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -798,6 +807,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -892,6 +902,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -946,6 +957,7 @@
"y": 35
},
"id": 16,
"interval": "2m",
"options": {
"legend": {
"calcs": [],
Expand All @@ -965,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,
Expand All @@ -978,17 +990,16 @@
],
"refresh": "",
"revision": 1,
"schemaVersion": 38,
"style": "dark",
"schemaVersion": 39,
"tags": [],
"templating": {
"list": [
{
"allValue": "",
"current": {
"selected": true,
"text": "adservice",
"value": "adservice"
"text": "frontend",
"value": "frontend"
},
"datasource": {
"type": "prometheus",
Expand All @@ -1013,7 +1024,7 @@
]
},
"time": {
"from": "now-3h",
"from": "now-1h",
"to": "now"
},
"timepicker": {},
Expand All @@ -1022,4 +1033,4 @@
"uid": "W2gX2zHVk",
"version": 1,
"weekStart": ""
}
}
3 changes: 3 additions & 0 deletions src/prometheus/prometheus-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
global:
evaluation_interval: 30s
scrape_interval: 5s
storage:
tsdb:
out_of_order_time_window: 30m
scrape_configs:
- job_name: otel-collector
static_configs:
Expand Down
Loading