Add OAuth 2.0 Config#2560
Merged
Merged
Conversation
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
LeviHarrison
commented
Apr 29, 2021
Comment on lines
+379
to
+383
| ### `oauth2` | ||
|
|
||
| OAuth 2.0 authentication using the client credentials grant type. | ||
| Alertmanager fetches an access token from the specified endpoint with | ||
| the given client access and secret keys. |
Contributor
Author
There was a problem hiding this comment.
I realize that in Prometheus I put oauth2 after tls_config, but given that oauth2 goes along with the other authentication methods and is therefore first, and decided to put it ahead of tls_config here like it's supposed to. That being said, it does make the ordering inconsistent.
Member
There was a problem hiding this comment.
tls_config also contains authentication.
Contributor
Author
There was a problem hiding this comment.
I guess, although the order in common has OAuth 2.0 first anyways. I'm probably making too big of a deal out of this though.
Member
There was a problem hiding this comment.
In prometheus we could reorder everything because the order is messy overall.
In common we could split some of them into separated files.
paulfantom
added a commit
to paulfantom/alertmanager
that referenced
this pull request
Jul 23, 2021
v0.22.2 * tag 'v0.22.2': (181 commits) Release 0.22.2 Include pending silences for future muting decisions Release 0.22.1 Default the isEqual flag to true in alertmanager Add test to expose issue prometheus#2426 Release alertmanager 0.22 Relase 0.22.0-rc.2 API: Only pass cluster peer if empty fixed small typo Release 0.22.0-rc.1 Fix panic when HA is disabled Update matcher examples Add prometheus#2276 to release notes Release 0.22.0-rc.0 Lift moratorium on AlertManager receivers with long-term maintenance plan (prometheus#2561) Add OAuth 2.0 Config (prometheus#2560) Add missing EOL Fix flapping acceptance test Unlock at specific points instead of deferring Dispatch: Make sure mutex gets unlocked on call to Stop ...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 upgrades the common version so that OAuth 2.0 is supported and properly documents the config.
cc @roidelapluie