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

Updates APM defaults and CI settings #117749

Merged
merged 12 commits into from
Nov 23, 2021

Conversation

tylersmalley
Copy link
Contributor

@tylersmalley tylersmalley commented Nov 5, 2021

Updates the default APM server to use that which we have for production use. Our APM cluster for CI is now being set only for CI to ensure they are separate.

Closes #116496

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
@tylersmalley tylersmalley added Team:Operations Team label for Operations Team v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v8.1.0 ci:collect-apm labels Nov 5, 2021
@tylersmalley tylersmalley requested review from vigneshshanmugam and a team as code owners November 5, 2021 22:10
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Copy link
Contributor

@lizozom lizozom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@sqren and I were talking about doing this.
This will obviously apply to 7.16+, but will definitely allow us to have a smaller set of configs we need to sync everywhere.

captureBody: 'off',
captureHeaders: false,
breakdownMetrics: false,
metricsInterval: '120s',
transactionSampleRate: 0.1,
Copy link
Contributor

@lizozom lizozom Nov 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love that transactionSampleRate can be also overridden from an env var

captureBody: 'off',
captureHeaders: false,
breakdownMetrics: false,
metricsInterval: '120s',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mshustov mentioned adding propagateTracestate?
If we make sure CORS is properly enabled on our server, we could enable it here too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lizozom #117492 (comment)

propagateTracestate: true should work out of the box for API calls to the Kibana server

Copy link
Member

@jbudz jbudz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after snapshots are updated

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
@tylersmalley
Copy link
Contributor Author

@elasticmachine merge upstream

@tylersmalley tylersmalley added the auto-backport Deprecated - use backport:version if exact versions are needed label Nov 10, 2021
Tyler Smalley and others added 2 commits November 10, 2021 21:16
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Tyler Smalley added 4 commits November 18, 2021 16:10
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@tylersmalley tylersmalley merged commit a181ff3 into elastic:main Nov 23, 2021
@tylersmalley tylersmalley deleted the update-apm-settings branch November 23, 2021 22:48
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Nov 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Nov 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
8.0
7.16

The backport PRs will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Nov 24, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Tyler Smalley <tyler.smalley@elastic.co>
kibanamachine added a commit that referenced this pull request Nov 24, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Tyler Smalley <tyler.smalley@elastic.co>
dmlemeshko pushed a commit that referenced this pull request Nov 29, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
TinLe pushed a commit to TinLe/kibana that referenced this pull request Dec 22, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed ci:collect-apm release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.16.0 v8.0.0 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ci] Fix APM labels on CI
8 participants