New hostname_whitelist_regex configuration variable

lib/puppet/reports/datadog_reports.rb

@@ -22,6 +22,14 @@
     raise(Puppet::ParseError, "Invalid hostname_extraction_regex #{HOSTNAME_REGEX}")
   end
 
+  unless config[:hostname_whitelist_regex].nil?
+    begin
+      HOSTNAME_WHITELIST_REGEX = Regexp.new config[:hostname_whitelist_regex]
+    rescue
+      raise(Puppet::ParseError, "Invalid hostname_whitelist_regex #{config[:hostname_whitelist_regex]}")
+    end
+  end
+
   desc <<-DESC
   Send notification of metrics to Datadog
   DESC
@@ -53,6 +61,11 @@ def process
       end
     end
 
+    if !HOSTNAME_WHITELIST_REGEX.nil? && !@msg_host.match(HOSTNAME_WHITELIST_REGEX)
+      Puppet.info "Not reporting #{@msg_host} to Datadog (does not match white list)"
+      return
+    end
+
     event_title = ''
     alert_type = ''
     event_priority = 'low'
@@ -106,7 +119,7 @@ def process
       event_data << "\n@@@\n"
     end
 
-    Puppet.debug "Sending metrics for #{@msg_host} to Datadog"
+    Puppet.info "Sending run info for #{@msg_host} to Datadog"
     @dog = Dogapi::Client.new(API_KEY)
     @dog.batch_metrics do
       self.metrics.each { |metric,data|
@@ -118,7 +131,6 @@ def process
       }
     end
 
-    Puppet.debug "Sending events for #{@msg_host} to Datadog"
     @dog.emit_event(Dogapi::Event.new(event_data,
                                       :msg_title => event_title,
                                       :event_type => 'config_management.run',

manifests/init.pp

@@ -41,6 +41,9 @@
 #       Instead of reporting the puppet nodename, use this regex to extract the named
 #       'hostname' captured group to report the run in Datadog.
 #       ex.: '^(?<hostname>.*\.datadoghq\.com)(\.i-\w{8}\..*)?$'
+#   $hostname_whitelist_regex
+#       Completely optional.
+#       Only report the host to Datadog if its name matches this regular expression.
 #   $log_to_syslog
 #       Set value of 'log_to_syslog' variable. Default is true -> yes as in dd-agent.
 #       Valid values here are: true or false.
@@ -198,6 +201,7 @@
   $service_enable = true,
   $manage_repo = true,
   $hostname_extraction_regex = nil,
+  $hostname_whitelist_regex = nil,
   $dogstatsd_port = 8125,
   $statsd_forward_host = '',
   $statsd_forward_port = '',
@@ -430,6 +434,7 @@
       puppetmaster_user         => $puppetmaster_user,
       dogapi_version            => $datadog_agent::params::dogapi_version,
       hostname_extraction_regex => $hostname_extraction_regex,
+      hostname_whitelist_regex  => $hostname_whitelist_regex,
     }
   }
 

manifests/reports.pp

@@ -18,7 +18,8 @@
   $puppet_gem_provider,
   $puppetmaster_user,
   $dogapi_version,
-  $hostname_extraction_regex = nil
+  $hostname_extraction_regex = nil,
+  $hostname_whitelist_regex = nil
 ) {
 
   include datadog_agent::params

spec/classes/datadog_agent_reports_spec.rb

@@ -6,6 +6,7 @@
       {
         api_key: 'notanapikey',
         hostname_extraction_regex: nil,
+        hostname_whitelist_regex: nil,
         puppetmaster_user: 'puppet',
         dogapi_version: 'installed',
         puppet_gem_provider: 'gem'
@@ -59,6 +60,7 @@
       {
         api_key: 'notanapikey',
         hostname_extraction_regex: nil,
+        hostname_whitelist_regex: nil,
         puppetmaster_user: 'puppet',
         dogapi_version: '1.2.2',
         puppet_gem_provider: 'gem'

templates/datadog.yaml.erb

@@ -6,3 +6,6 @@
 <% if !@hostname_extraction_regex.nil? -%>
 :hostname_extraction_regex: '<%= @hostname_extraction_regex %>'
 <% end -%>
+<% if !@hostname_whitelist_regex.nil? -%>
+:hostname_whitelist_regex: '<%= @hostname_whitelist_regex %>'
+<% end -%>