Skip to content

Commit fd4975a

Browse files
Vonngclaude
andcommitted
fix: resolve data link merge conflicts for Grafana 12.4.0
Grafana 12.4.0 changed data link behavior: override-level links now merge with panel-level defaults instead of replacing them, causing unwanted dropdown menus on click. Move panel-level data links to field-specific overrides: - inventory-cmdb: Infra Nodes (221), Etcd Cluster (223) - pgsql-cluster: Xacts 5m (90), activity stats (121) - redis-instance: Replication (185) Also update dashboard definitions for Grafana 12.4.0 compatibility. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent ff5472c commit fd4975a

17 files changed

Lines changed: 897 additions & 961 deletions

conf/vibe.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ all:
7373
- { name: dbuser_meta ,password: DBUser.Meta ,pgbouncer: true ,roles: [dbrole_admin ] ,comment: pigsty admin user }
7474
- { name: dbuser_view ,password: DBUser.Viewer ,pgbouncer: true ,roles: [dbrole_readonly] ,comment: read-only viewer }
7575
pg_databases:
76-
- { name: meta, baseline: cmdb.sql ,comment: pigsty meta database ,schemas: [pigsty] ,extensions: [ postgis, timescaledb, vector ]}
76+
- { name: meta, baseline: cmdb.sql ,comment: pigsty meta database ,schemas: [pigsty] ,extensions: [ postgis, timescaledb, vector, age ]}
7777
pg_libs: 'timescaledb, pg_stat_statements, auto_explain, pg_wait_sampling'
7878
pg_hba_rules:
7979
- { user: all ,db: all ,addr: intra ,auth: pwd ,title: 'everyone intranet access with password' ,order: 800 }

files/grafana/infra/etcd-overview.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,4 +1276,4 @@
12761276
"uid":"etcd-overview",
12771277
"version":1,
12781278
"weekStart":""
1279-
}
1279+
}

files/grafana/infra/infra-overview.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,4 +1042,4 @@
10421042
"uid":"infra-overview",
10431043
"version":1,
10441044
"weekStart":""
1045-
}
1045+
}

files/grafana/infra/inventory-cmdb.json

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

files/grafana/mongo/mongo-overview.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"fieldConfig":{
1717
"defaults":{"color":{"mode":"thresholds"},"custom":{"align":"center","cellOptions":{"type":"auto"},"filterable":false,"footer":{"reducers":[]},"inspect":false},"mappings":[],"max":1.2,"min":0,"thresholds":{"mode":"absolute","steps":[{"color":"#e3e3e3e0","value":0}]}},
1818
"overrides":[
19-
{ "matcher":{"id":"byName","options":"Instance"},"properties":[{"id":"links","value":[{"title":"MongoDB Overview : ${cls}","url":"/d/mongo-overview?var-cls=${cls}&${__url_time_range}"}]},{"id":"custom.width"}] },
19+
{ "matcher":{"id":"byName","options":"Instance"},"properties":[{"id":"links","value":[{"title":"MongoDB Overview : ${cls}","url":"/d/mongo-overview?var-cls=${cls}&${__url_time_range}"}]},{"id":"custom.width"}] },
2020
{ "matcher":{"id":"byName","options":"IP"} ,"properties":[{"id":"links","value":[{"title":"Node Instance : ${__data.fields.IP}","url":"/d/node-instance?var-id=${__data.fields.IP}&${__url_time_range}"}]}] },
2121
{ "matcher":{"id":"byName","options":"Alive"} ,"properties":[{"id":"mappings","value":[{"options":{"0":{"color":"#cc4637d9","index":0,"text":"Down"},"1":{"color":"#346f36cc","index":1,"text":"Up"}},"type":"value"}]},{"id":"custom.cellOptions","value":{"type":"color-background"}},{"id":"custom.width","value":60}] },
2222
{ "matcher":{"id":"byName","options":"Address"} ,"properties":[{"id":"custom.width","value":140}] },
@@ -329,4 +329,4 @@
329329
"uid":"mongo-overview",
330330
"version":1,
331331
"weekStart":""
332-
}
332+
}

files/grafana/node/node-cluster.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3440,4 +3440,4 @@
34403440
"uid":"node-cluster",
34413441
"version":1,
34423442
"weekStart":""
3443-
}
3443+
}

files/grafana/node/node-instance.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3727,4 +3727,4 @@
37273727
"uid":"node-instance",
37283728
"version":1,
37293729
"weekStart":""
3730-
}
3730+
}

files/grafana/node/node-overview.json

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

files/grafana/node/node-vip.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,4 +1256,4 @@
12561256
"uid":"node-vip",
12571257
"version":1,
12581258
"weekStart":""
1259-
}
1259+
}

files/grafana/pgsql/pgcat-instance.json

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

0 commit comments

Comments
 (0)