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

Move APM-specific template defaults to idxmgmt #4458

Merged
merged 5 commits into from
Dec 1, 2020

Conversation

axw
Copy link
Member

@axw axw commented Nov 25, 2020

Motivation/summary

Move APM-specific setup.template.settings defaults
away from using config overrides, and add the logic
to the idxmgmt package.

Similarly drop logging.files.rotateeverbytes, as
we were setting what is already the default defined
by libbeat.

Now when you run apm-server export config, these
defaults do not show up at all. The relevant system
tests have been migrated to Go, and the expectations
updated to match the change in behaviour.

We customise logging.metrics.enabled, and there
is no other way to change the default before it is
interpreted by libbeat, so it remains in config
overrides for now.

Checklist

I have considered changes for:
- [ ] documentation
- [ ] logging (add log lines, choose appropriate log selector, etc.)
- [ ] metrics and monitoring (create issue for Kibana team to add metrics to visualizations, e.g. Kibana#44001)

How to test these changes

  • apm-server export config should not show any template config
  • Run apm-server and check that it sets up templates as expected, including setting the maximum number of fields to 2000.

Related issues

Pulled out of #4449

This is necessary before we can properly warn when data streams and template setup are both configured.

axw added 2 commits November 25, 2020 13:12
Move APM-specific `setup.template.settings` defaults
away from using config overrides, and add the logic
to the idxmgmt package.

Similarly drop `logging.files.rotateeverbytes`, as
we were setting what is already the default defined
by libbeat.

Now when you run `apm-server export config`, these
defaults do not show up at all. The relevant system
tests have been migrated to Go, and the expectations
updated to match the change in behaviour.

We customise `logging.metrics.enabled`, and there
is no other way to change the default before it is
interpreted by libbeat, so it remains in config
overrides for now.
@axw axw marked this pull request as ready for review November 25, 2020 05:17
@apmmachine
Copy link
Contributor

apmmachine commented Nov 25, 2020

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

  • Start Time: 2020-11-30T15:29:08.043+0000

  • Duration: 41 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 4737
Skipped 141
Total 4878

Steps errors 3

Expand to view the steps failures

Compress

  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage

Compress

  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests

Test Sync

  • Took 3 min 50 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@axw axw requested a review from a team November 25, 2020 06:07
@axw axw merged commit e0c86c3 into elastic:master Dec 1, 2020
@axw axw deleted the no-config-overrides branch December 1, 2020 00:16
axw added a commit to axw/apm-server that referenced this pull request Dec 14, 2020
* Move APM-specific template defaults to idxmgmt

Move APM-specific `setup.template.settings` defaults
away from using config overrides, and add the logic
to the idxmgmt package.

Similarly drop `logging.files.rotateeverbytes`, as
we were setting what is already the default defined
by libbeat.

Now when you run `apm-server export config`, these
defaults do not show up at all. The relevant system
tests have been migrated to Go, and the expectations
updated to match the change in behaviour.

We customise `logging.metrics.enabled`, and there
is no other way to change the default before it is
interpreted by libbeat, so it remains in config
overrides for now.
axw added a commit that referenced this pull request Dec 14, 2020
* Move APM-specific template defaults to idxmgmt

Move APM-specific `setup.template.settings` defaults
away from using config overrides, and add the logic
to the idxmgmt package.

Similarly drop `logging.files.rotateeverbytes`, as
we were setting what is already the default defined
by libbeat.

Now when you run `apm-server export config`, these
defaults do not show up at all. The relevant system
tests have been migrated to Go, and the expectations
updated to match the change in behaviour.

We customise `logging.metrics.enabled`, and there
is no other way to change the default before it is
interpreted by libbeat, so it remains in config
overrides for now.
@simitt
Copy link
Contributor

simitt commented Dec 23, 2020

Tested with BC1 - no template related config is shown; templates in ES show the total_fields value.

@simitt simitt self-assigned this Dec 23, 2020
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.

3 participants