Introduce apm-server.auth.* config#5457
Merged
axw merged 5 commits intoelastic:masterfrom Jun 17, 2021
Merged
Conversation
💔 Build Failed
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Steps errors
Expand to view the steps failures
|
f43315f to
410009c
Compare
Introduce the new AgentAuth config structure, which holds API Key and secret token auth. Later we will add "anonymous" auth here too. We also introduce a new YAML naming scheme for the config, `apm-server.auth.*`. The old config is deprecated and copied across to the new config fields.
Member
Author
|
@bmorelli25 would you please take a look at the docs changes? I've renamed some config, and added new deprecation sections for the deprecated config names. I've also moved "api_key.* configuration options" into the "API keys" section, not sure if it was intentional that it was separate? I can move back if you prefer, but then I'm not sure where the deprecation section should go. |
Contributor
|
This pull request is now in conflicts. Could you fix it @axw? 🙏 |
simitt
suggested changes
Jun 16, 2021
Contributor
simitt
left a comment
There was a problem hiding this comment.
Can you also change the apmpackage please. I suggest we remove the deprecated settings and only support the new ones.
Member
Author
simitt
approved these changes
Jun 16, 2021
Contributor
|
This pull request is now in conflicts. Could you fix it @axw? 🙏 |
bmorelli25
approved these changes
Jun 16, 2021
Member
bmorelli25
left a comment
There was a problem hiding this comment.
Docs look great–thanks!
It looks like there's one additional change that needs to be made to the command reference file. I'll fix that in the Beats repo and copy it over to apm-server before 7.14.
Member
Author
|
Failure is related to the beats update, which will be resolved by #5471 |
mergify bot
pushed a commit
that referenced
this pull request
Jun 17, 2021
* Introduce `apm-server.auth.*` config Introduce the new AgentAuth config structure, which holds API Key and secret token auth. Later we will add "anonymous" auth here too. We also introduce a new YAML naming scheme for the config, `apm-server.auth.*`. The old config is deprecated and copied across to the new config fields. * docs: update config names * apmpackage: update auth config keys (cherry picked from commit fc60576) # Conflicts: # changelogs/head.asciidoc
axw
added a commit
that referenced
this pull request
Jun 17, 2021
* Introduce `apm-server.auth.*` config (#5457) * Introduce `apm-server.auth.*` config Introduce the new AgentAuth config structure, which holds API Key and secret token auth. Later we will add "anonymous" auth here too. We also introduce a new YAML naming scheme for the config, `apm-server.auth.*`. The old config is deprecated and copied across to the new config fields. * docs: update config names * apmpackage: update auth config keys (cherry picked from commit fc60576) Co-authored-by: Andrew Wilkins <axw@elastic.co>
mergify bot
pushed a commit
that referenced
this pull request
Jul 9, 2021
* Introduce `apm-server.auth.*` config Introduce the new AgentAuth config structure, which holds API Key and secret token auth. Later we will add "anonymous" auth here too. We also introduce a new YAML naming scheme for the config, `apm-server.auth.*`. The old config is deprecated and copied across to the new config fields. * docs: update config names * apmpackage: update auth config keys (cherry picked from commit fc60576) # Conflicts: # apmpackage/apm/agent/input/template.yml.hbs # beater/config/config.go # beater/jaeger/server.go # beater/processors.go # beater/server.go # changelogs/head.asciidoc
Contributor
|
Tested with BC2:
|
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
4 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.
Motivation/summary
Introduce the new AgentAuth config structure, which holds API Key and secret token auth. Later we will add "anonymous" auth here too, and deprecate/replace some RUM config (rate limiting and allowed service names).
We also introduce a new YAML naming scheme for the config,
apm-server.auth.*. The old config is deprecated and copied across to the new config fields.Checklist
How to test these changes
apm-server.secret_tokenandapm-server.api_key.*, make sure they are honoured (e.g. query "GET /" with/out auth)apm-server.auth.secret_tokenandapm-server.auth.api_key.*, same again.Related issues
#5347