Skip to content

[disk] add support for new options #508

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.

Sign up for GitHub

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

Merged
truthbk merged 2 commits into from
Mar 25, 2019
Merged

[disk] add support for new options #508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5bad0e
[disk] add support for new options
truthbk Mar 25, 2019
95598da
[disk] fix optional type for deprecated types
truthbk Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions manifests/integrations/disk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,19 @@
# excluded_disk_re => '/dev/sd[e-z]*'
# }
class datadog_agent::integrations::disk (
String $use_mount = 'no',
$excluded_filesystems = undef,
$excluded_disks = undef,
$excluded_disk_re = undef,
$excluded_mountpoint_re = undef,
$all_partitions = undef,
$tag_by_filesystem = undef
String $use_mount = 'no',
$all_partitions = undef,
$tag_by_filesystem = undef,
Optional[Array[String]] $filesystem_blacklist = undef,
Optional[Array[String]] $device_blacklist = undef,
Optional[Array[String]] $mountpoint_blacklist = undef,
Optional[Array[String]] $filesystem_whitelist = undef,
Optional[Array[String]] $device_whitelist = undef,
Optional[Array[String]] $mountpoint_whitelist = undef,
Optional[Variant[String, Array[String]]] $excluded_filesystems = undef, # deprecated in agent versions >6.9
Optional[Variant[String, Array[String]]] $excluded_disks = undef, # deprecated in agent versions >6.9
Optional[Variant[String, Array[String]]] $excluded_disk_re = undef, # deprecated in agent versions >6.9
Copy link
Copy Markdown

@remeh remeh Mar 25, 2019

Choose a reason for hiding this comment

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

Even if deprecated, I may be wrong but it looks like the Array variant isn't managed in the erb? Same goes for excluded_mountpoint_re. Please discard if I'm wrong.

Copy link
Copy Markdown
Member Author

@truthbk truthbk Mar 25, 2019

Choose a reason for hiding this comment

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

No, you're right, these were strings in the past! Thank you 🙇

Optional[Variant[String, Array[String]]] $excluded_mountpoint_re = undef, # deprecated in agent versions >6.9
) inherits datadog_agent::params {
include datadog_agent

Expand Down
45 changes: 45 additions & 0 deletions spec/classes/datadog_agent_integrations_disk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,51 @@
excluded_disk_re: /dev/sdb.*
excluded_mountpoint_re: /mnt/other.*
all_partitions: yes
tag_by_filesystem: no
HEREDOC
}
it { is_expected.to contain_file(conf_file).with_content(yaml_conf) }
end

context 'we handle new disk configuration option' do
let(:params) {{
use_mount: 'yes',
filesystem_blacklist: ['tmpfs', 'dev'],
device_blacklist: ['/dev/sda1'],
mountpoint_blacklist: ['/mnt/foo'],
filesystem_whitelist: ['ext4', 'hdfs', 'reiserfs'],
device_whitelist: ['/dev/sdc1', '/dev/sdc2', '/dev/sdd2'],
mountpoint_whitelist: ['/mnt/logs', '/mnt/builds'],
all_partitions: 'yes',
tag_by_filesystem: 'no'
}}
let(:yaml_conf) {
<<-HEREDOC
### MANAGED BY PUPPET

init_config:

instances:
- use_mount: yes
file_system_blacklist:
- tmpfs
- dev
device_blacklist:
- /dev/sda1
mount_point_blacklist:
- /mnt/foo
file_system_whitelist:
- ext4
- hdfs
- reiserfs
device_whitelist:
- /dev/sdc1
- /dev/sdc2
- /dev/sdd2
mount_point_whitelist:
- /mnt/logs
- /mnt/builds
all_partitions: yes
tag_by_filesystem: no
HEREDOC
}
Expand Down
36 changes: 36 additions & 0 deletions templates/agent-conf.d/disk.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,42 @@ init_config:

instances:
- use_mount: <%= @use_mount %>
<% if @filesystem_blacklist -%>
file_system_blacklist:
<% (Array(@filesystem_blacklist)).each do |fs| -%>
- <%= fs %>
<%- end -%>
<% end -%>
<% if @device_blacklist -%>
device_blacklist:
<% (Array(@device_blacklist)).each do |disk| -%>
- <%= disk %>
<% end -%>
<% end -%>
<% if @mountpoint_blacklist -%>
mount_point_blacklist:
<% (Array(@mountpoint_blacklist)).each do |mount| -%>
- <%= mount %>
<% end -%>
<% end -%>
<% if @filesystem_whitelist -%>
file_system_whitelist:
<% (Array(@filesystem_whitelist)).each do |fs| -%>
- <%= fs %>
<%- end -%>
<% end -%>
<% if @device_whitelist -%>
device_whitelist:
<% (Array(@device_whitelist)).each do |disk| -%>
- <%= disk %>
<% end -%>
<% end -%>
<% if @mountpoint_whitelist -%>
mount_point_whitelist:
<% (Array(@mountpoint_whitelist)).each do |mount| -%>
- <%= mount %>
<% end -%>
<% end -%>
<% if @excluded_filesystems -%>
excluded_filesystems:
<% (Array(@excluded_filesystems)).each do |fs| -%>
Expand Down
⚡