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

Delete default configuration files from cluster checks runner #1594

Merged
merged 3 commits into from
Oct 31, 2024

Conversation

celenechang
Copy link
Contributor

What this PR does / why we need it:

Rather than delete the entire conf.d folder, only delete the configuration for checks enabled by default.

Currently, this list is

# find /etc/datadog-agent/conf.d/ -name "*.yaml.default" -type f
/etc/datadog-agent/conf.d/cri.d/conf.yaml.default
/etc/datadog-agent/conf.d/network.d/conf.yaml.default
/etc/datadog-agent/conf.d/container_image.d/conf.yaml.default
/etc/datadog-agent/conf.d/io.d/conf.yaml.default
/etc/datadog-agent/conf.d/ntp.d/conf.yaml.default
/etc/datadog-agent/conf.d/containerd.d/conf.yaml.default
/etc/datadog-agent/conf.d/kubelet.d/conf.yaml.default
/etc/datadog-agent/conf.d/sbom.d/conf.yaml.default
/etc/datadog-agent/conf.d/file_handle.d/conf.yaml.default
/etc/datadog-agent/conf.d/cpu.d/conf.yaml.default
/etc/datadog-agent/conf.d/ecs_fargate.d/conf.yaml.default
/etc/datadog-agent/conf.d/orchestrator_ecs.d/conf.yaml.default
/etc/datadog-agent/conf.d/orchestrator_pod.d/conf.yaml.default
/etc/datadog-agent/conf.d/container.d/conf.yaml.default
/etc/datadog-agent/conf.d/memory.d/conf.yaml.default
/etc/datadog-agent/conf.d/load.d/conf.yaml.default
/etc/datadog-agent/conf.d/container_lifecycle.d/conf.yaml.default
/etc/datadog-agent/conf.d/uptime.d/conf.yaml.default
/etc/datadog-agent/conf.d/eks_fargate.d/conf.yaml.default
/etc/datadog-agent/conf.d/telemetry.d/conf.yaml.default
/etc/datadog-agent/conf.d/service_discovery.d/conf.yaml.default
/etc/datadog-agent/conf.d/disk.d/conf.yaml.default
/etc/datadog-agent/conf.d/docker.d/conf.yaml.default

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • Chart Version bumped
  • Documentation has been updated with helm-docs (run: .github/helm-docs.sh)
  • CHANGELOG.md has been updated
  • Variables are documented in the README.md

@celenechang celenechang added the chart/datadog This issue or pull request is related to the datadog chart label Oct 31, 2024
@celenechang celenechang requested review from a team as code owners October 31, 2024 12:32
@github-actions github-actions bot added the chart/datadog-crds This issue or pull request is related to the datadog-crds chart label Oct 31, 2024
@celenechang celenechang removed the chart/datadog-crds This issue or pull request is related to the datadog-crds chart label Oct 31, 2024
@@ -109,7 +109,7 @@ spec:
image: "{{ include "image-path" (dict "root" .Values "image" .Values.clusterChecksRunner.image) }}"
command: ["bash", "-c"]
args:
- rm -rf /etc/datadog-agent/conf.d && touch /etc/datadog-agent/datadog.yaml && exec agent run
- find /etc/datadog-agent/conf.d/ -name "*.yaml.default" -type f -delete && touch /etc/datadog-agent/datadog.yaml && exec agent run
Copy link
Contributor

Choose a reason for hiding this comment

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

neat!

@celenechang celenechang merged commit 5b33ead into main Oct 31, 2024
27 checks passed
@celenechang celenechang deleted the celene/ccr_checks branch October 31, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chart/datadog This issue or pull request is related to the datadog chart
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants