Skip to content

Conversation

axw
Copy link
Member

@axw axw commented Nov 17, 2023

Motivation/summary

Updates docker-compose.yml to enable the apm-data Elasticsearch plugin, which installs the built-in Elasticsearch index templates and ingest pipelines. Update the system tests to stop installing the integration package.

apm-server.data_streams.wait_for_integration configuration has been removed. This PR should therefore not be merged until the apm-data Elasticsearch plugin is enabled by default.

Checklist

  • Update CHANGELOG.asciidoc
    - [ ] Update package changelog.yml (only if changes to apmpackage have been made)
    - [ ] Documentation has been updated docs will be updated separately, they're not in this repo anymore

How to test these changes

Run the system tests.

Related issues

#11528
#11529

Copy link
Contributor

mergify bot commented Nov 17, 2023

This pull request does not have a backport label. Could you fix it @axw? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.

NOTE: backport-skip has been added to this pull request.

Copy link
Contributor

mergify bot commented Dec 5, 2023

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b systemtest-elasticsearch-apmdata upstream/systemtest-elasticsearch-apmdata
git merge upstream/main
git push upstream systemtest-elasticsearch-apmdata

@axw axw force-pushed the systemtest-elasticsearch-apmdata branch from a01fcb6 to 96e4e83 Compare December 5, 2023 10:09
Copy link
Contributor

mergify bot commented Dec 5, 2023

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b systemtest-elasticsearch-apmdata upstream/systemtest-elasticsearch-apmdata
git merge upstream/main
git push upstream systemtest-elasticsearch-apmdata

Copy link
Contributor

mergify bot commented Feb 5, 2024

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b systemtest-elasticsearch-apmdata upstream/systemtest-elasticsearch-apmdata
git merge upstream/main
git push upstream systemtest-elasticsearch-apmdata

@v1v
Copy link
Member

v1v commented Feb 9, 2024

run docs-build

@axw axw force-pushed the systemtest-elasticsearch-apmdata branch from 96e4e83 to 2ca8889 Compare March 18, 2024 04:10
@axw axw force-pushed the systemtest-elasticsearch-apmdata branch from aebd28e to 360eb97 Compare May 20, 2024 09:35
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

generally approach looks good

@axw axw force-pushed the systemtest-elasticsearch-apmdata branch from 70756a7 to 03a54a1 Compare May 22, 2024 06:11
@axw axw marked this pull request as ready for review May 22, 2024 08:49
@axw axw requested a review from a team as a code owner May 22, 2024 08:49
@axw axw added the v8.15.0 label May 22, 2024
@axw axw merged commit 538feb4 into elastic:main May 22, 2024
@axw axw deleted the systemtest-elasticsearch-apmdata branch May 22, 2024 10:06
v1v added a commit to v1v/apm-server that referenced this pull request May 27, 2024
…impler

* upstream/main: (28 commits)
  chore: Update to elastic/beats@19499ae5ab94 (elastic#13240)
  [updatecli] Bump elastic stack version to 8.15.0-561c6014 (elastic#13241)
  buildkite: create chainguard images (elastic#13226)
  chore: Update to elastic/beats@d5bfebb8940d (elastic#13231)
  [updatecli] Bump elastic stack version to 8.15.0-04e5793a (elastic#13227)
  build and push Docker image based on Chainguard base image (elastic#13137)
  buildkite(dra): support list for feature branches (elastic#13139)
  [updatecli] Bump elastic stack version to 8.15.0-e7873a67 (elastic#13218)
  chore: Update to elastic/beats@2419622b1b33 (elastic#13220)
  build(deps): bump the otel group with 3 updates (elastic#13213)
  [updatecli] Bump elastic stack version to 8.15.0-21ea2af3 (elastic#13206)
  chore: Update to elastic/beats@4a670391a6e2 (elastic#13209)
  build(deps): bump github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger from 0.100.0 to 0.101.0 in the jaeger group (elastic#13214)
  build(deps): bump the otel group with 2 updates (elastic#13205)
  Depend on apm-data plugin (elastic#12066)
  chore: Update to elastic/beats@d8072923498c (elastic#13203)
  [updatecli] Bump elastic stack version to 8.15.0-9bce1e63 (elastic#13200)
  build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.10.1 to 0.10.2 (elastic#13195)
  chore: Update to elastic/beats@062cc9b191b5 (elastic#13190)
  [updatecli] Bump elastic stack version to 8.15.0-1a872dbc (elastic#13185)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Skip notification from the automated backport with mergify v8.15.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants