Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config is now rooted under "schema" key #5544

Merged

Conversation

stuartnelson3
Copy link
Contributor

@stuartnelson3 stuartnelson3 commented Jun 25, 2021

Update the key under which the apm-server is serialized when sent to kibana.

curl --request POST \
  --url http://localhost:5603/api/apm/fleet/apm_server_schema \
  --header 'Authorization: Basic YWRtaW46Y2hhbmdlbWU=' \
  --header 'Content-Type: application/json' \
  --header 'kbn-xsrf: true' \
  --data '{
	"schema": {
		"apm-server.host": "0.0.0.0:8200",
		"apm-server.rum.enabled": true,
		"output.ssl.enabled": true
	}
}'

cc @ogupte

How to test these changes

Note: This pr supersedes changes originally introduced in #5481. The format listed above is, at the time of writing, the correct format for sending the config to kibana.

Running apm-server under fleet, start an agent that requests its config from apm-server. Update the config, and verify that the timeseries has been ingested into elasticsearch.

@stuartnelson3 stuartnelson3 requested a review from a team June 25, 2021 08:08
@apmmachine
Copy link
Contributor

apmmachine commented Jun 25, 2021

💚 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 #5544 updated

  • Start Time: 2021-06-28T10:02:06.088+0000

  • Duration: 38 min 13 sec

  • Commit: a564003

Test stats 🧪

Test Results
Failed 0
Passed 6140
Skipped 106
Total 6246

Trends 🧪

Image of Build Times

Image of Tests

@axw
Copy link
Member

axw commented Jun 28, 2021

/test

@stuartnelson3 stuartnelson3 enabled auto-merge (squash) June 28, 2021 10:01
@stuartnelson3 stuartnelson3 merged commit 9081652 into elastic:master Jun 28, 2021
@stuartnelson3 stuartnelson3 deleted the kibana-apm-config-key-update branch June 28, 2021 10:50
mergify bot pushed a commit that referenced this pull request Jun 28, 2021
stuartnelson3 added a commit that referenced this pull request Jun 28, 2021
(cherry picked from commit 9081652)

Co-authored-by: stuart nelson <[email protected]>
@axw
Copy link
Member

axw commented Jul 6, 2021

The test instructions reference #5481 and agent config. Isn't this related to #5424? Do they both need to be on the test plan, or can we close this one?

@simitt
Copy link
Contributor

simitt commented Jul 9, 2021

Yes they are covering the same, removing the test label from this one.

mergify bot pushed a commit that referenced this pull request Jul 9, 2021
(cherry picked from commit 9081652)

# Conflicts:
#	kibana/send_config_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants