[7.17](backport #38862) Centralised pipeline xpack/dockerlogbeat fixes

[mergify]

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3072 - applied PR comments from #38826
BK Builds: https://buildkite.com/elastic/beats/builds?branch=oakrizan%3Acentralised-pipeline-xpack-dockerlogbeat

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.

Author's Checklist

• [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

---

This is an automatic backport of pull request #38862 done by [Mergify](https://mergify.com).

[mergify]

Cherry-pick of aff4f8d has failed:

On branch mergify/bp/7.17/pr-38862
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit aff4f8d836.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

[mergify]

This pull request is now in conflicts. Could you fix it? 🙏
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 mergify/bp/7.17/pr-38862 upstream/mergify/bp/7.17/pr-38862
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-38862

[elasticmachine]

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

[elasticmachine]

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

• Duration: 14 min 47 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /package : Generate the packages and run the E2E tests.

• /beats-tester : Run the installation tests with beats-tester.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)