[tomcat] jmx_url support + reports regex extraction should use undef (Thanks @evansj) (DataDog#482)

* Add jmx_url parameter to tomcat integration

* Fix tags indenting

* Fix hostname_extraction_regex, should be undef

* Fix more nil / undef confusion

* [reports] parameter typo - missing comma

Author: truthbk

manifests/init.pp

@@ -238,7 +238,7 @@
   $service_ensure = 'running',
   $service_enable = true,
   $manage_repo = true,
-  $hostname_extraction_regex = nil,
+  $hostname_extraction_regex = undef,
   $hostname_fqdn = false,
   $dogstatsd_port = 8125,
   $dogstatsd_socket = '',

manifests/integrations/tomcat.pp

@@ -7,6 +7,8 @@
 #       The host tomcat is running on. Defaults to 'localhost'
 #   $port
 #       The JMX port.
+#   $jmx_url
+#       The JMX URL.
 #   $username
 #       The username for connecting to the running JVM. Optional.
 #   $password
@@ -29,6 +31,7 @@
 class datadog_agent::integrations::tomcat(
   $hostname             = 'localhost',
   $port                 = 7199,
+  $jmx_url              = undef,
   $username             = undef,
   $password             = undef,
   $java_bin_path        = undef,

manifests/reports.pp

@@ -17,7 +17,7 @@
   $api_key,
   $puppetmaster_user,
   $dogapi_version,
-  $hostname_extraction_regex = nil,
+  $hostname_extraction_regex = undef,
   $datadog_site = 'datadoghq.com',
 ) {
 

templates/agent-conf.d/tomcat.yaml.erb

@@ -2,6 +2,9 @@
 
 instances:
   - host: <%= @hostname %>
+<% if @jmx_url -%>
+    jmx_url: "<%= @jmx_url %>"
+<% end -%>
     port: <%= @port %>
 <% if @username -%>
     user: <%= @username %>
@@ -18,10 +21,10 @@ instances:
     trust_store_password: <%= @trust_store_password %>
 <% end -%>
 <% if @tags and ! @tags.empty? -%>
-        tags:
-  <%- @tags.each do |key, val| -%>
-          <%= "#{key}: #{val}" %>
-  <%- end -%>
+    tags:
+<%- @tags.each do |key, val| -%>
+        <%= "#{key}: #{val}" %>
+<%- end -%>
 <% end -%>
 
 

templates/datadog-reports.yaml.erb

@@ -3,6 +3,6 @@
 ---
 :datadog_api_key: '<%= @api_key %>'
 :api_url: api.<%= @datadog_site %>
-<% if !@hostname_extraction_regex.nil? -%>
+<% if @hostname_extraction_regex -%>
 :hostname_extraction_regex: '<%= @hostname_extraction_regex %>'
 <% end -%>