Skip to content

Commit 9e8ca1b

Browse files
DoDiODevDoDiODev
authored
feat(grafana): upgrade dashboards and provisioning for Grafana 13 (apache#8992)
Update the Grafana SQL converter dependency to sqlglot 30.12.0. Upgrade Grafana from 11.6.2 through 12.4.5 to 13.0.2 and harden dashboard provisioning, home-dashboard resolution, legacy-volume handling, and datasource cleanup. Align dashboard datasource references and plugin metadata with Grafana 13, and remove duplicate AI Model ROI dashboards. Keep postgresVersion at 1400; the PostgreSQL 18 server-version bump remains scoped to its dedicated change. Signed-off-by: DoDiODev <DoDiDev@proton.me>
1 parent 27c771a commit 9e8ca1b

121 files changed

Lines changed: 3855 additions & 3789 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎grafana/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#While incubation status is not necessarily a reflection of the completeness or stability of the code,
2424
#it does indicate that the project has yet to be fully endorsed by the ASF.
2525

26-
FROM grafana/grafana:11.6.2
26+
FROM grafana/grafana:13.0.2
2727
COPY ./provisioning/dashboards /etc/grafana/provisioning/dashboards
2828
COPY ./dashboards /etc/grafana/dashboards
2929
COPY ./scripts/entrypoint.sh /entrypoint.sh
@@ -37,8 +37,8 @@ ENV GF_SERVER_PROTOCOL=http
3737
ENV GF_SERVER_DOMAIN=localhost:3000
3838
ENV GF_SERVER_ROOT_URL=http://localhost:3000/grafana
3939
USER root
40-
RUN grafana-cli plugins install grafana-piechart-panel && \
41-
chmod +x /entrypoint.sh && \
40+
# grafana-piechart-panel removed: dashboards use the core "piechart" panel type
41+
RUN chmod +x /entrypoint.sh && \
4242
chgrp -R 0 /etc/grafana /usr/share/grafana /var/lib/grafana && \
4343
chmod -R g=u /etc/grafana /usr/share/grafana /var/lib/grafana
4444
USER 101

‎grafana/dashboards/ClaudeCodeAdoption.json‎

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

‎grafana/dashboards/ClaudeCodeAdoptionByUser.json‎

Lines changed: 60 additions & 60 deletions
Large diffs are not rendered by default.

‎grafana/dashboards/Linear.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"content": "- Use Cases: This dashboard shows the basic project management metrics from Linear.\n- Data Source Required: Linear",
7878
"mode": "markdown"
7979
},
80-
"pluginVersion": "9.5.15",
80+
"pluginVersion": "13.0.2",
8181
"targets": [
8282
{
8383
"datasource": {
@@ -116,7 +116,7 @@
116116
"type": "row"
117117
},
118118
{
119-
"datasource": "mysql",
119+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
120120
"description": "Total number of issues created in the selected time range and board.",
121121
"fieldConfig": {
122122
"defaults": {
@@ -165,10 +165,10 @@
165165
"text": {},
166166
"textMode": "auto"
167167
},
168-
"pluginVersion": "9.5.15",
168+
"pluginVersion": "13.0.2",
169169
"targets": [
170170
{
171-
"datasource": "mysql",
171+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
172172
"editorMode": "code",
173173
"format": "table",
174174
"group": [],
@@ -218,7 +218,7 @@
218218
"type": "stat"
219219
},
220220
{
221-
"datasource": "mysql",
221+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
222222
"description": "",
223223
"fieldConfig": {
224224
"defaults": {
@@ -268,10 +268,10 @@
268268
"text": {},
269269
"textMode": "auto"
270270
},
271-
"pluginVersion": "9.5.15",
271+
"pluginVersion": "13.0.2",
272272
"targets": [
273273
{
274-
"datasource": "mysql",
274+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
275275
"editorMode": "code",
276276
"format": "table",
277277
"group": [],
@@ -321,7 +321,7 @@
321321
"type": "stat"
322322
},
323323
{
324-
"datasource": "mysql",
324+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
325325
"description": "",
326326
"fieldConfig": {
327327
"defaults": {
@@ -404,10 +404,10 @@
404404
"sort": "none"
405405
}
406406
},
407-
"pluginVersion": "8.0.6",
407+
"pluginVersion": "13.0.2",
408408
"targets": [
409409
{
410-
"datasource": "mysql",
410+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
411411
"format": "time_series",
412412
"group": [],
413413
"metricColumn": "none",
@@ -439,7 +439,7 @@
439439
"type": "timeseries"
440440
},
441441
{
442-
"datasource": "mysql",
442+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
443443
"description": "Issue Delivery Rate = count(Delivered Issues)/count(Issues)",
444444
"fieldConfig": {
445445
"defaults": {
@@ -493,10 +493,10 @@
493493
"text": {},
494494
"textMode": "auto"
495495
},
496-
"pluginVersion": "9.5.15",
496+
"pluginVersion": "13.0.2",
497497
"targets": [
498498
{
499-
"datasource": "mysql",
499+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
500500
"format": "time_series",
501501
"group": [],
502502
"metricColumn": "none",
@@ -528,7 +528,7 @@
528528
"type": "stat"
529529
},
530530
{
531-
"datasource": "mysql",
531+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
532532
"description": "Issue Delivery Rate = count(Delivered Issues)/count(Issues)",
533533
"fieldConfig": {
534534
"defaults": {
@@ -609,10 +609,10 @@
609609
"sort": "none"
610610
}
611611
},
612-
"pluginVersion": "8.0.6",
612+
"pluginVersion": "13.0.2",
613613
"targets": [
614614
{
615-
"datasource": "mysql",
615+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
616616
"format": "time_series",
617617
"group": [],
618618
"metricColumn": "none",
@@ -670,7 +670,7 @@
670670
"type": "row"
671671
},
672672
{
673-
"datasource": "mysql",
673+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
674674
"description": "",
675675
"fieldConfig": {
676676
"defaults": {
@@ -721,10 +721,10 @@
721721
"text": {},
722722
"textMode": "auto"
723723
},
724-
"pluginVersion": "9.5.15",
724+
"pluginVersion": "13.0.2",
725725
"targets": [
726726
{
727-
"datasource": "mysql",
727+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
728728
"format": "table",
729729
"group": [],
730730
"metricColumn": "none",
@@ -757,7 +757,7 @@
757757
"type": "stat"
758758
},
759759
{
760-
"datasource": "mysql",
760+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
761761
"description": "",
762762
"fieldConfig": {
763763
"defaults": {
@@ -807,10 +807,10 @@
807807
"text": {},
808808
"textMode": "auto"
809809
},
810-
"pluginVersion": "9.5.15",
810+
"pluginVersion": "13.0.2",
811811
"targets": [
812812
{
813-
"datasource": "mysql",
813+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
814814
"format": "table",
815815
"group": [],
816816
"metricColumn": "none",
@@ -843,7 +843,7 @@
843843
"type": "stat"
844844
},
845845
{
846-
"datasource": "mysql",
846+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
847847
"description": "",
848848
"fieldConfig": {
849849
"defaults": {
@@ -928,10 +928,10 @@
928928
"xTickLabelRotation": 0,
929929
"xTickLabelSpacing": 0
930930
},
931-
"pluginVersion": "8.0.6",
931+
"pluginVersion": "13.0.2",
932932
"targets": [
933933
{
934-
"datasource": "mysql",
934+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
935935
"format": "table",
936936
"group": [],
937937
"metricColumn": "none",
@@ -968,7 +968,7 @@
968968
"bars": false,
969969
"dashLength": 10,
970970
"dashes": false,
971-
"datasource": "mysql",
971+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
972972
"description": "The cumulative distribution of issue lead time. Each point refers to the percent rank of a lead time.",
973973
"fill": 0,
974974
"fillGradient": 4,
@@ -1005,7 +1005,7 @@
10051005
"alertThreshold": false
10061006
},
10071007
"percentage": false,
1008-
"pluginVersion": "9.5.15",
1008+
"pluginVersion": "13.0.2",
10091009
"pointradius": 0.5,
10101010
"points": false,
10111011
"renderer": "flot",
@@ -1015,7 +1015,7 @@
10151015
"steppedLine": false,
10161016
"targets": [
10171017
{
1018-
"datasource": "mysql",
1018+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
10191019
"format": "time_series",
10201020
"group": [],
10211021
"metricColumn": "none",
@@ -1109,7 +1109,7 @@
11091109
"content": "<br/>\n\nThis dashboard is created based on this [data schema](https://devlake.apache.org/docs/DataModels/DevLakeDomainLayerSchema). Want to add more metrics? Please follow the [guide](https://devlake.apache.org/docs/Configuration/Dashboards/GrafanaUserGuide).",
11101110
"mode": "markdown"
11111111
},
1112-
"pluginVersion": "9.5.15",
1112+
"pluginVersion": "13.0.2",
11131113
"targets": [
11141114
{
11151115
"datasource": {
@@ -1141,7 +1141,7 @@
11411141
"$__all"
11421142
]
11431143
},
1144-
"datasource": "mysql",
1144+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
11451145
"definition": "select concat(name, '--', id) from boards where id like 'linear%'",
11461146
"hide": 0,
11471147
"includeAll": true,
@@ -1162,7 +1162,7 @@
11621162
"text": "All",
11631163
"value": "$__all"
11641164
},
1165-
"datasource": "mysql",
1165+
"datasource": {"type": "mysql", "uid": "devlake-mysql-api"},
11661166
"definition": "select distinct type from issues",
11671167
"hide": 0,
11681168
"includeAll": true,

0 commit comments

Comments
 (0)