Alertmanager: Add Grafana's external URL #8498
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
santihernandezc
changed the title
santihernandezc
commented
Jun 24, 2024
| @@ -290,6 +291,8 @@ func (am *MultitenantAlertmanager) GetUserGrafanaConfig(w http.ResponseWriter, r | |||
| Hash: cfg.Hash, | |||
| CreatedAt: cfg.CreatedAtTimestamp, | |||
| Default: cfg.Default, | |||
| Promoted: cfg.Promoted, | |||
There was a problem hiding this comment.
Quick fix, we forgot to add this field in the response to GET api/v1/grafana/config
stevesg
reviewed
Jun 25, 2024
There was a problem hiding this comment.
I'm finding this a little confusing. I'm not too keen on:
a) passing this extra string around as a parameter on the end of all these functions
b) the fact we pass the Mimir ExternalURL in completely different way
I think a nicer approach would be:
computeConfigdetermines the ExternalURL based on what configuration is in use- If the Mimir configuration is in use, pass the ExternalURL configured on the command line
- If the Grafana configuration is in use, pass the ExternalURL from the configuration
- That is then to
ApplyConfig, which uses it to create the template
I'd rather see it passed around in a struct of some type, perhaps bundling a alertspb.AlertConfigDesc and the ExternalURL string together.
| @@ -99,6 +99,7 @@ type Config struct { | |||
| PersisterConfig PersisterConfig | |||
|
|
|||
| GrafanaAlertmanagerCompatibility bool | |||
| GrafanaExternalURL string | |||
There was a problem hiding this comment.
I don't think we need to store it - it will only get used in ApplyConfig.
|
Closing in favor of #8465 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the Grafana external URL to an Alertmanager at creation time. This URL is sent from Grafana and will be used when templating notifications.
Related PoC: #8376