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

support comma-separated tag values #2179

Merged
merged 1 commit into from
Jan 6, 2023
Merged

support comma-separated tag values #2179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions spring-boot-admin-server-ui/src/main/frontend/services/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,24 @@ class Instance {
}

async fetchMetric(metric, tags) {
const params = tags ? {
tag: Object.entries(tags)
const params = new URLSearchParams();
if (tags) {
let firstElementDuplicated = false;
Object.entries(tags)
.filter(([, value]) => typeof value !== 'undefined' && value !== null)
.map(([name, value]) => `${name}:${value}`)
.join(',')
} : {};
.forEach(([name, value]) => {
params.append('tag', `${name}:${value}`);

if (!firstElementDuplicated) {
// workaround for tags that contains comma
erikpetzold marked this conversation as resolved.
Show resolved Hide resolved
// take a look at https://github.com/spring-projects/spring-framework/issues/23820#issuecomment-543087878
// If there is single tag specified and name or value contains comma then it will be incorrectly split into several parts
// To bypass it we duplicate first tag.
params.append('tag', `${name}:${value}`);
firstElementDuplicated = true;
}
})
}
return this.axios.get(uri`actuator/metrics/${metric}`, {
params
});
Expand Down