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.

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

Bux fix for issue #8914 - Alertmanager error using custom function queryFromGeneratorURL #10358

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
* [BUGFIX] PromQL: Ignore native histograms in `topk` and `bottomk` functions and return info annotation instead. #10188
* [BUGFIX] PromQL: Let `limitk` and `limit_ratio` include native histograms if applicable. #10188
* [BUGFIX] PromQL: Fix `changes` and `resets` functions to count switch between float and native histograms sample type as change and reset. #10188
* [BUGFIX] Alertmanager: Fix decoding of queryFromGeneratorURL in templates. #8914

### Mixin

Expand Down
6 changes: 1 addition & 5 deletions pkg/alertmanager/alertmanager_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ func queryFromGeneratorURL(generatorURL string) (string, error) {
if !ok || len(queryParam) < 1 {
return "", fmt.Errorf("query not found in the generator URL")
}
query, err := url.QueryUnescape(queryParam[0])
if err != nil {
return "", fmt.Errorf("failed to URL decode the query: %w", err)
}
return query, nil
return queryParam[0], nil
}

// WithCustomFunctions returns template.Option which adds additional template functions
Expand Down