Skip to content

[7.x] Introduce apm-server.auth.* config (backport #5457)#5472

Merged
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-5457
Jun 17, 2021
Merged

[7.x] Introduce apm-server.auth.* config (backport #5457)#5472
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-5457

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 17, 2021

This is an automatic backport of pull request #5457 done by Mergify.
Cherry-pick of fc60576 has failed:

On branch mergify/bp/7.x/pr-5457
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit fc605761.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   _meta/beat.yml
	modified:   apm-server.docker.yml
	modified:   apm-server.yml
	modified:   apmpackage/apm/agent/input/template.yml.hbs
	modified:   beater/api/mux.go
	modified:   beater/api/mux_config_agent_test.go
	modified:   beater/api/mux_intake_backend_test.go
	modified:   beater/api/mux_intake_rum_test.go
	modified:   beater/api/mux_root_test.go
	modified:   beater/api/mux_sourcemap_handler_test.go
	modified:   beater/authorization/apikey_test.go
	modified:   beater/authorization/builder.go
	modified:   beater/authorization/builder_test.go
	modified:   beater/authprocessor.go
	renamed:    beater/config/api_key.go -> beater/config/auth.go
	renamed:    beater/config/api_key_test.go -> beater/config/auth_test.go
	modified:   beater/config/config.go
	modified:   beater/config/config_test.go
	modified:   beater/http.go
	modified:   beater/jaeger/server.go
	modified:   beater/jaeger/server_test.go
	modified:   beater/middleware/authorization_middleware_test.go
	modified:   beater/server.go
	modified:   beater/telemetry.go
	modified:   beater/telemetry_test.go
	modified:   cmd/apikey.go
	modified:   docs/configuration-process.asciidoc
	modified:   docs/secure-communication-agents.asciidoc
	modified:   systemtest/rum_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@axw
Introduce apm-server.auth.* config (#5457)
494bd71 
* 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
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 17, 2021
@mergify mergify bot assigned axw Jun 17, 2021
@axw axw removed the conflicts There is a conflict in the backported pull request label Jun 17, 2021
@axw axw enabled auto-merge (squash) June 17, 2021 03:23
@ghost
Copy link
Copy Markdown

ghost commented Jun 17, 2021 •
edited by ghost
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5472 updated

  • Start Time: 2021-06-17T03:22:42.684+0000

  • Duration: 54 min 5 sec

  • Commit: 6893ee7

Test stats 🧪

Test Results
Failed 0
Passed 4664
Skipped 121
Total 4785

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit de96bca into 7.x Jun 17, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5457 branch June 17, 2021 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@axw axw

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@axw