Skip to content

Expose new parameters for disk check#679

Merged
mx-psi merged 5 commits intoDataDog:masterfrom
Aramack:aramack_deprecated_disk_params
Dec 29, 2020
Merged

Expose new parameters for disk check#679
mx-psi merged 5 commits intoDataDog:masterfrom
Aramack:aramack_deprecated_disk_params

Conversation

@Aramack
Copy link
Copy Markdown
Contributor

@Aramack Aramack commented Dec 14, 2020

What does this PR do?

This pull request exposes the new parameters for the disk check where whitelist/blacklist have been replaced with include/exclude: DataDog/integrations-core#7627

This does not modify the existing parameters to avoid introducing a regression.

Motivation

With the release of datadog-agent 7.24.0 (https://github.com/DataDog/integrations-core/blob/master/disk/CHANGELOG.md#400--2020-10-31--agent-7240), several parameters for the disk check were deprecated and replaced with new names.

As a result, continuing to use these variables will result in a deprecation warning such as:
2020-12-14 14:59:15 EST | CORE | WARN | (pkg/collector/python/datadog_agent.go:120 in LogMessage) | | (disk.py:95) | file_system_blacklistis deprecated and will be removed in a future release. Please usefile_system_exclude instead.

Describe your test plan

This includes a new unit test for the new parameters. I've also tested this on my personal puppet stack and confirmed that it generates a valid config:

sudo cat /etc/datadog-agent/conf.d/disk.d/conf.yaml
### MANAGED BY PUPPET

init_config:

instances:
  - use_mount: yes
    file_system_exclude:
      - nfs
      - nfs4
      - devtmpfs
    mount_point_exclude:
      - /boot
      - /run
      - /sys
      - /dev
    all_partitions: no
    tag_by_filesystem: yes

@Aramack Aramack requested a review from a team as a code owner December 14, 2020 22:21
@Aramack Aramack changed the title Work-in-progress: Expose new parameters for disk check Expose new parameters for disk check Dec 15, 2020
Copy link
Copy Markdown
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for your contribution!

@mx-psi mx-psi merged commit 21cbd69 into DataDog:master Dec 29, 2020
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Feb 5, 2026
* Expose the newly created _exclude and _include variable that were introduced to the disk core integration

* Update disk comments

* Unit tests for new module parameters

* Whitespace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants