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

Cherry-pick #21212 to 7.x: Configurable index template loading #21354

Merged
merged 1 commit into from
Oct 2, 2020

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Sep 28, 2020

Cherry-pick of PR #21212 to 7.x branch. Original message:

What does this PR do?

The PR adds a new configuration option named setup.template.type to select the index template type. From ES v7.8 new index templates were introduced. Possible option:

  • legacy: Loads the legacy index template. This is default option, so it does not break existing deployments.
  • component: This loads Beats' index template as a composite template, so it can be used in the users' index templates.
  • index: Loads the new index template.

Why is it important?

Index templates v2 was released in Elasticsearch 7.8. Previously Beats had used the legacy endpoint for installing index templates. Now we are moving to the newer version.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

./filebeat setup

Related issues

Closes #17829

The PR adds a new configuration option named `setup.template.type` to select the index template type. From ES v7.8 new index templates were introduced. Possible option:

* `legacy`: Loads the legacy index template. This is the default option, so it does not break existing deployments.
* `component`: This loads Beats' index template as a composite template, so it can be used in the users' index templates.
* `index`: Loads the new index template.

Index templates v2 was released in Elasticsearch 7.8. Previously Beats had used the legacy endpoint for installing index templates. Now we are moving to the newer version.

Closes elastic#17829

(cherry picked from commit 6bb35c1)
@kvch kvch requested review from a team as code owners September 28, 2020 17:50
@kvch kvch added [zube]: In Review backport Team:Services (Deprecated) Label for the former Integrations-Services team labels Sep 28, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-services (Team:Services)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Sep 28, 2020
@elasticmachine
Copy link
Collaborator

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21354 opened]

  • Start Time: 2020-09-28T17:51:26.793+0000

  • Duration: 66 min 40 sec

Test stats 🧪

Test Results
Failed 3
Passed 15992
Skipped 1350
Total 17345

Test errors

Expand to view the tests failures

  • Name: Build&Test / x-pack/metricbeat-build / TestFetch – ec2

    • Age: 1
    • Duration: 18.91
    • Error Details: Failed
  • Name: Build&Test / libbeat-build / TestOutputReload – pipeline

    • Age: 1
    • Duration: 65.86
    • Error Details: Failed
  • Name: Build&Test / libbeat-build / TestOutputReload/network_client – pipeline

    • Age: 1
    • Duration: 36.09
    • Error Details: Failed

Steps errors

Expand to view the steps failures

  • Name: mage build test

    • Description: mage build test

    • Duration: 22 min 59 sec

    • Start Time: 2020-09-28T18:18:41.451+0000

    • log

  • Name: Notifies GitHub of the status of a Pull Request

    • Description: script returned exit code 1

    • Duration: 0 min 1 sec

    • Start Time: 2020-09-28T18:40:55.138+0000

    • log

  • Name: mage build test

    • Description: mage build test

    • Duration: 26 min 26 sec

    • Start Time: 2020-09-28T18:24:14.126+0000

    • log

  • Name: Notifies GitHub of the status of a Pull Request

    • Description: script returned exit code 1

    • Duration: 0 min 1 sec

    • Start Time: 2020-09-28T18:50:52.694+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-postgresql.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-munin.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-uwsgi.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-etcd.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-docker.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-beat.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-mongodb.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-golang.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-rabbitmq.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-jolokia.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-auditbeat-build/x-pack/auditbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-auditbeat-build/x-pack/auditbeat/build/TEST-python-integration.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-auditbeat-build/x-pack/auditbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-auditbeat-build/x-pack/auditbeat/build/TEST-go-integration.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-filebeat-windows-windows-2019/x-pack/filebeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/x-pack-filebeat-windows-windows-2019/x-pack/filebeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/filebeat-windows-windows-2019/filebeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/filebeat-windows-windows-2019/filebeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-windows-windows-2019/auditbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-windows-windows-2019/auditbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-build/auditbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-build/auditbeat/build/TEST-python-integration.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-build/auditbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/auditbeat-build/auditbeat/build/TEST-go-integration.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/packetbeat-build/packetbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.196Z] ./src/github.com/elastic/beats/packetbeat-build/packetbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-cockroachdb.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-coredns.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-cloudfoundry.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-sql.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-prometheus.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-azure.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-ibmmq.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-mssql.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-aws.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-redisenterprise.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-oracle.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-stan.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-googlecloud.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-statsd.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-appsearch.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-functionbeat-build/x-pack/functionbeat/build/TEST-go-unit.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/x-pack-functionbeat-build/x-pack/functionbeat/build/TEST-python-unit.xml
[2020-09-28T18:56:43.197Z] ./src/github.com/elastic/beats/metricbeat-pythonIntegTest/metricbeat/build/TEST-python-integration.xml
[2020-09-28T18:56:43.197Z] + cat
[2020-09-28T18:56:43.197Z] + /usr/local/bin/runbld ./runbld-script --job-name elastic+beats+pull-request
[2020-09-28T18:56:43.197Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-09-28T18:56:49.803Z] runbld>>> runbld started
[2020-09-28T18:56:49.803Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-09-28T18:56:51.200Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-09-28T18:56:51.200Z] runbld>>> Matches in the system config:
[2020-09-28T18:56:51.200Z] runbld>>> - Matched ^elastic\+beats
[2020-09-28T18:56:51.200Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-09-28T18:56:52.614Z] runbld>>> Debug logging enabled.
[2020-09-28T18:56:52.614Z] runbld>>> Storing result
[2020-09-28T18:56:52.883Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-09-28T18:56:52.883Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200928185652-AF70B765
[2020-09-28T18:56:52.883Z] runbld>>> Adding system facts.
[2020-09-28T18:56:54.284Z] runbld>>> Adding vcs info for the latest commit:  65180226bfa5deaea1a95b866c0b94826228f779
[2020-09-28T18:56:54.285Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-09-28T18:56:54.285Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-09-28T18:56:54.285Z] + echo 'Processing JUnit reports with runbld...'
[2020-09-28T18:56:54.285Z] Processing JUnit reports with runbld...
[2020-09-28T18:56:54.549Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-09-28T18:56:54.549Z] runbld>>> DURATION: 45ms
[2020-09-28T18:56:54.549Z] runbld>>> STDOUT: 40 bytes
[2020-09-28T18:56:54.549Z] runbld>>> STDERR: 49 bytes
[2020-09-28T18:56:54.549Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-09-28T18:56:54.549Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-21354
[2020-09-28T18:56:55.509Z] runbld>>> Storing build metadata: 
[2020-09-28T18:56:55.509Z] runbld>>> Adding test report.
[2020-09-28T18:56:55.509Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats
[2020-09-28T18:56:56.086Z] runbld>>> Found 121 test output files
[2020-09-28T18:56:58.647Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-graphite.xml
[2020-09-28T18:56:58.647Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/metricbeat-goIntegTest/metricbeat/build/TEST-go-integration-windows.xml
[2020-09-28T18:56:58.910Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-09-28T18:56:58.910Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-09-28T18:56:58.910Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-09-28T18:56:58.910Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-09-28T18:56:58.910Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21354/src/github.com/elastic/beats/x-pack-metricbeat-build/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-09-28T18:56:59.173Z] runbld>>> Test output logs contained: Errors: 0 Failures: 3 Tests: 17345 Skipped: 1083
[2020-09-28T18:56:59.436Z] runbld>>> Storing result
[2020-09-28T18:56:59.436Z] runbld>>> FAILURES: 3
[2020-09-28T18:57:00.383Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-09-28T18:57:00.383Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200928185652-AF70B765
[2020-09-28T18:57:00.383Z] runbld>>> Email notification disabled by environment variable.
[2020-09-28T18:57:00.383Z] runbld>>> Slack notification disabled by environment variable.
[2020-09-28T18:57:05.891Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-21354
[2020-09-28T18:57:05.979Z] [INFO] getVaultSecret: Getting secrets
[2020-09-28T18:57:06.065Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-09-28T18:57:06.938Z] + chmod 755 generate-build-data.sh
[2020-09-28T18:57:06.938Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21354/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21354/runs/1 FAILURE 3939873
[2020-09-28T18:57:06.938Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21354/runs/1/steps/?limit=10000 -o steps-info.json

@kvch kvch merged commit e46b5f7 into elastic:7.x Oct 2, 2020
@zube zube bot removed the [zube]: Done label Dec 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Services (Deprecated) Label for the former Integrations-Services team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants