From 80e1d62c4e4d471063a7efa1ff67a26ecf1dd75c Mon Sep 17 00:00:00 2001 From: Ryan Dyer Date: Tue, 31 May 2022 15:25:39 -0500 Subject: [PATCH] address PR comments Signed-off-by: Ryan Dyer --- manifests/integrations/network.pp | 5 ++--- templates/agent-conf.d/network.yaml.erb | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/manifests/integrations/network.pp b/manifests/integrations/network.pp index 6a8406ca..a6deb32d 100644 --- a/manifests/integrations/network.pp +++ b/manifests/integrations/network.pp @@ -22,17 +22,16 @@ class datadog_agent::integrations::network( Boolean $collect_connection_state = false, Boolean $collect_connection_queues = false, - Array[String] $excluded_interfaces = ['lo','lo0'], + Array[String] $excluded_interfaces = [], String $excluded_interface_re = '', Boolean $combine_connection_states = true, Boolean $collect_rate_metrics = true, Boolean $collect_count_metrics = false, - String $conntrack_path = '/usr/sbin/conntrack', + String $conntrack_path = undef, Boolean $use_sudo_conntrack = true, Array[String] $whitelist_conntrack_metrics = [], Array[String] $blacklist_conntrack_metrics = [], Boolean $collect_aws_ena_metrics = false, - Boolean $collect_ethtool_metrics = false, Array[String] $tags = [], String $service = '', Integer $min_collection_interval = 15, diff --git a/templates/agent-conf.d/network.yaml.erb b/templates/agent-conf.d/network.yaml.erb index 92e333b6..8dd52365 100644 --- a/templates/agent-conf.d/network.yaml.erb +++ b/templates/agent-conf.d/network.yaml.erb @@ -32,7 +32,6 @@ instances: <% end ) -%> <% end -%> collect_aws_ena_metrics: <%= @collect_aws_ena_metrics %> - collect_ethtool_metrics: <%= @collect_ethtool_metrics %> <% if !@tags.empty? -%> tags: <%- (@tags.each do |tag| -%>