Skip to content

metrics,scripts: keep TiCDC dashboard titles consistent #4765

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

Merged
ti-chi-bot merged 4 commits into from
Apr 8, 2026
+15 −3
Merged

metrics,scripts: keep TiCDC dashboard titles consistent #4765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11b8c8d
metrics: use datasource variable in TiCDC dashboard titles
tenfyzhong Apr 8, 2026
e84c815
scripts: validate next gen metrics outputs
tenfyzhong Apr 8, 2026
e581214
scripts: remove next gen metrics test file
tenfyzhong Apr 8, 2026
cf6ef50
metrics: remove cluster from TiCDC dashboard title
tenfyzhong Apr 8, 2026
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
2 changes: 1 addition & 1 deletion metrics/grafana/ticdc_new_arch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27296,7 +27296,7 @@
]
},
"timezone": "browser",
"title": "test-cluster-TiCDC-New-Arch",
"title": "${DS_TEST-CLUSTER}-TiCDC-New-Arch",
"uid": "YiGL8hBZ0aac",
"version": 40
}
2 changes: 1 addition & 1 deletion metrics/nextgengrafana/ticdc_new_arch_next_gen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27296,7 +27296,7 @@
]
},
"timezone": "browser",
"title": "test-cluster-TiCDC-New-Arch",
"title": "${DS_TEST-CLUSTER}-TiCDC-New-Arch",
"uid": "YiGL8hBZ0aac",
"version": 40
}
2 changes: 1 addition & 1 deletion metrics/nextgengrafana/ticdc_new_arch_with_keyspace_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11488,7 +11488,7 @@
]
},
"timezone": "browser",
"title": "test-cluster-TiCDC-New-Arch",
"title": "${DS_TEST-CLUSTER}-TiCDC-New-Arch-KeyspaceName",
"uid": "lGT5hED6vqTn",
"version": 40
}
12 changes: 12 additions & 0 deletions scripts/generate-next-gen-metrics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ if [ ! -f "$NEXT_GEN_SHARED_FILE" ]; then
exit 1
fi

require_file_contains() {
local file="$1"
local expected="$2"

if ! grep -Fq -- "$expected" "$file"; then
echo "Error: Generated file '$file' must contain '$expected'" >&2
exit 1
fi
}

# This jq script filters the panels in the Grafana dashboard.
# It defines a recursive function `filter_panels` that:
# 1. For panels of type "row", it recursively filters their sub-panels.
Expand All @@ -64,9 +74,11 @@ jq '

"$SED_CMD" "${SED_INPLACE_ARGS[@]}" "s/\${DS_TEST-CLUSTER}-TiCDC-New-Arch/&-KeyspaceName/" "$NEXT_GEN_USER_FILE"
"$SED_CMD" "${SED_INPLACE_ARGS[@]}" "s/YiGL8hBZ0aac/lGT5hED6vqTn/" "$NEXT_GEN_USER_FILE"
require_file_contains "$NEXT_GEN_USER_FILE" "-KeyspaceName"

echo "Userscope dashboard created at '$NEXT_GEN_USER_FILE'"

"$SED_CMD" "${SED_INPLACE_ARGS[@]}" 's/\([^$]\)tidb_cluster/\1sharedpool_id/g' "$NEXT_GEN_SHARED_FILE"
require_file_contains "$NEXT_GEN_SHARED_FILE" "sharedpool_id"

echo "Sharedscope dashboard created at '$NEXT_GEN_SHARED_FILE'"
Loading