Skip to content

Commit d1fcd81

Browse files
committed
Upgraded to Grafana 12
1 parent 00897f0 commit d1fcd81

File tree

6 files changed

+33
-20
lines changed

6 files changed

+33
-20
lines changed

compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ services:
4040
- "--web.enable-otlp-receiver"
4141

4242
grafana:
43-
image: grafana/grafana-oss:11.6.1
43+
image: grafana/grafana:12.2.0
4444
restart: unless-stopped
4545
ports:
4646
- 3000:3000
4747
volumes:
4848
- ./metrics/grafana:/etc/grafana/provisioning:ro
4949
environment:
5050
GF_AUTH_ANONYMOUS_ENABLED: true
51-
GF_AUTH_ANONYMOUS_ORG_ROLE: Admin
51+
GF_AUTH_ANONYMOUS_ORG_ROLE: Admin # According to the logs, this is deprecated ("auth.anonymous.org_role is deprecated, only viewer role is supported").
5252
GF_SECURITY_ADMIN_USER: admin
5353
GF_SECURITY_ADMIN_PASSWORD: changeme
54+
# GF_FEATURE_TOGGLES_ENABLE: dashboardNewLayouts,kubernetesDashboards,dashboardScene # Required to access the new experimental dynamic dashboards.

metrics/grafana/dashboards/json/abwcf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4330,7 +4330,7 @@
43304330
],
43314331
"preload": false,
43324332
"refresh": "",
4333-
"schemaVersion": 41,
4333+
"schemaVersion": 42,
43344334
"tags": [],
43354335
"templating": {
43364336
"list": [

metrics/grafana/dashboards/json/crawl-database.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
}
336336
],
337337
"preload": false,
338-
"schemaVersion": 41,
338+
"schemaVersion": 42,
339339
"tags": [],
340340
"templating": {
341341
"list": []

metrics/grafana/dashboards/json/jvm.json

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"editable": true,
1919
"fiscalYearStartMonth": 0,
2020
"graphTooltip": 2,
21-
"id": 2,
21+
"id": 3,
2222
"links": [],
2323
"panels": [
2424
{
@@ -58,6 +58,7 @@
5858
"type": "linear"
5959
},
6060
"showPoints": "auto",
61+
"showValues": false,
6162
"spanNulls": false,
6263
"stacking": {
6364
"group": "A",
@@ -73,7 +74,8 @@
7374
"mode": "absolute",
7475
"steps": [
7576
{
76-
"color": "green"
77+
"color": "green",
78+
"value": 0
7779
},
7880
{
7981
"color": "red",
@@ -105,7 +107,7 @@
105107
"sort": "none"
106108
}
107109
},
108-
"pluginVersion": "11.6.1",
110+
"pluginVersion": "12.2.0",
109111
"targets": [
110112
{
111113
"datasource": {
@@ -160,6 +162,7 @@
160162
"type": "linear"
161163
},
162164
"showPoints": "auto",
165+
"showValues": false,
163166
"spanNulls": false,
164167
"stacking": {
165168
"group": "A",
@@ -175,7 +178,8 @@
175178
"mode": "absolute",
176179
"steps": [
177180
{
178-
"color": "green"
181+
"color": "green",
182+
"value": 0
179183
},
180184
{
181185
"color": "red",
@@ -207,7 +211,7 @@
207211
"sort": "none"
208212
}
209213
},
210-
"pluginVersion": "11.6.1",
214+
"pluginVersion": "12.2.0",
211215
"targets": [
212216
{
213217
"datasource": {
@@ -262,6 +266,7 @@
262266
"type": "linear"
263267
},
264268
"showPoints": "auto",
269+
"showValues": false,
265270
"spanNulls": false,
266271
"stacking": {
267272
"group": "A",
@@ -277,7 +282,8 @@
277282
"mode": "absolute",
278283
"steps": [
279284
{
280-
"color": "green"
285+
"color": "green",
286+
"value": 0
281287
},
282288
{
283289
"color": "red",
@@ -309,7 +315,7 @@
309315
"sort": "none"
310316
}
311317
},
312-
"pluginVersion": "11.6.1",
318+
"pluginVersion": "12.2.0",
313319
"targets": [
314320
{
315321
"datasource": {
@@ -364,6 +370,7 @@
364370
"type": "linear"
365371
},
366372
"showPoints": "auto",
373+
"showValues": false,
367374
"spanNulls": false,
368375
"stacking": {
369376
"group": "A",
@@ -380,7 +387,8 @@
380387
"mode": "absolute",
381388
"steps": [
382389
{
383-
"color": "green"
390+
"color": "green",
391+
"value": 0
384392
},
385393
{
386394
"color": "red",
@@ -412,7 +420,7 @@
412420
"sort": "none"
413421
}
414422
},
415-
"pluginVersion": "11.6.1",
423+
"pluginVersion": "12.2.0",
416424
"targets": [
417425
{
418426
"datasource": {
@@ -467,6 +475,7 @@
467475
"type": "linear"
468476
},
469477
"showPoints": "auto",
478+
"showValues": false,
470479
"spanNulls": false,
471480
"stacking": {
472481
"group": "A",
@@ -482,7 +491,8 @@
482491
"mode": "absolute",
483492
"steps": [
484493
{
485-
"color": "green"
494+
"color": "green",
495+
"value": 0
486496
},
487497
{
488498
"color": "red",
@@ -514,7 +524,7 @@
514524
"sort": "none"
515525
}
516526
},
517-
"pluginVersion": "11.6.1",
527+
"pluginVersion": "12.2.0",
518528
"targets": [
519529
{
520530
"datasource": {
@@ -570,6 +580,7 @@
570580
"type": "linear"
571581
},
572582
"showPoints": "auto",
583+
"showValues": false,
573584
"spanNulls": false,
574585
"stacking": {
575586
"group": "A",
@@ -585,7 +596,8 @@
585596
"mode": "absolute",
586597
"steps": [
587598
{
588-
"color": "green"
599+
"color": "green",
600+
"value": 0
589601
},
590602
{
591603
"color": "red",
@@ -616,7 +628,7 @@
616628
"sort": "none"
617629
}
618630
},
619-
"pluginVersion": "11.6.1",
631+
"pluginVersion": "12.2.0",
620632
"targets": [
621633
{
622634
"datasource": {
@@ -639,7 +651,7 @@
639651
}
640652
],
641653
"preload": false,
642-
"schemaVersion": 41,
654+
"schemaVersion": 42,
643655
"tags": [],
644656
"templating": {
645657
"list": [

metrics/grafana/datasources/postgres.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ datasources:
2222
maxOpenConns: 3
2323
maxIdleConnsAuto: true
2424
connMaxLifetime: 14400
25-
postgresVersion: 1700
25+
postgresVersion: 1800
2626
timescaledb: false
2727
timeInterval: 10s
2828
editable: true

metrics/grafana/datasources/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ datasources:
1818
httpMethod: POST
1919
manageAlerts: true
2020
prometheusType: Prometheus
21-
prometheusVersion: 3.3.0
21+
prometheusVersion: 3.6.0
2222
cacheLevel: High
2323
incrementalQuerying: true
2424
incrementalQueryOverlapWindow: 10m

0 commit comments

Comments
 (0)