Rollback watcher cleanup

[pchila]

What does this PR do?

Why is it important?

Checklist

• I have read and understood the pull request guidelines of this project.
• 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/fragments using the changelog tool
• I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

• How are we going to support this in production?
• How are we going to measure its adoption?
• How are we going to debug this?
• What are the metrics I should take care of?
• ...

[mergify]

⚠️ The sha of the head commit of this PR conflicts with #8767. Mergify cannot evaluate rules on this PR. ⚠️

[mergify]

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

• backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
• backport-active-all is the label that automatically backports to all active branches.
• backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
• backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

[elastic-sonarqube]

Quality Gate passed

Issues
9 New issues
3 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
49.3% Coverage on New Code
0.3% Duplication on New Code

See analysis details on SonarQube

[elasticmachine]

💔 Build Failed

• Buildkite Build
• Commit: 13eec08

Failed CI Steps

• check-ci
• Unit tests - Ubuntu 22.04
• Unit tests - Ubuntu 22.04
• Unit tests - Ubuntu 22.04 with requirefips build tag
• Unit tests - Ubuntu 22.04 with requirefips build tag
• Unit tests - fips140=only Ubuntu 22.04
• Unit tests - fips140=only Ubuntu 22.04
• Unit tests - Ubuntu 22.04 ARM64
• Unit tests - Ubuntu 22.04 ARM64
• Unit tests - Windows 2022
• Unit tests - Windows 2022
• Unit tests - Windows 2016
• Unit tests - Windows 2016
• Unit tests - macOS 15 ARM
• Unit tests - macOS 15 ARM
• Unit tests - Windows 10
• Unit tests - Windows 10
• Unit tests - Windows 11
• Unit tests - Windows 11
• :junit: Junit annotate
• Merge coverage reports
• :sonarqube: Continuous Code Inspection
• Packaging: linux/amd64 rpm
• Packaging: linux/amd64 rpm
• Packaging: Ubuntu x86_64 FIPS
• Packaging: Ubuntu x86_64 FIPS
• Packaging: linux/arm64 tar.gz
• Packaging: linux/arm64 tar.gz
• Packaging: Ubuntu arm64 FIPS
• Packaging: Ubuntu arm64 FIPS
• Packaging: windows/amd64 zip
• Packaging: windows/amd64 zip
• Packaging: Containers linux/amd64
• Packaging: Containers linux/arm64
• Packaging: Containers linux/amd64 FIPS
• Packaging: Containers linux/arm64 FIPS

History

cc @pchila