OnCall plugin use service accounts instead of api keys #2385
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
mderynck
added
the
pr:no public docs
|
@mderynck will this changes work with older grafana versions ( for example OSS) with no service accounts? |
|
@Konstantinov-Innokentii w/ this PR it might be worthwhile bumping our minimum required grafana version in 
|
joeyorlando
approved these changes
Jun 29, 2023
There was a problem hiding this comment.
nit PluginState.getGrafanaToken is called in the PluginState.syncDataWithOnCall method, there's a small comment there mentioning "API keys", we might to remove/update that comment
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
# What this PR does Changes OnCall plugin to use service accounts and api tokens instead of api keys. API keys will continue to work but if the plugin ever replaces them it will use a service account instead. Previously this was thought to be unnecessary but it was missing the case where the API key was converted to a service account which it could no longer find when searching the `/api/auth/keys` endpoint. That key would not be deleted and it would conflict with a newly created one of the same name. Now the behaviour is as follows: 1. Anytime a new token is needed all API keys and tokens under the service account matching the defined names will be deleted 2. A service account will be created named `sa-autogen-OnCall` if one does not already exist 3. An api token will be created under that service account named `OnCall` ## Which issue(s) this PR fixes #1806 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --------- Co-authored-by: Joey Orlando <joey.orlando@grafana.com>
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.
What this PR does
Changes OnCall plugin to use service accounts and api tokens instead of api keys. API keys will continue to work but if the plugin ever replaces them it will use a service account instead. Previously this was thought to be unnecessary but it was missing the case where the API key was converted to a service account which it could no longer find when searching the
/api/auth/keysendpoint. That key would not be deleted and it would conflict with a newly created one of the same name.Now the behaviour is as follows:
sa-autogen-OnCallif one does not already existOnCallWhich issue(s) this PR fixes
#1806
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)