Add -n argument in varnish integration

Cristian Juve · Cristian Juve · commit cb01d23f0896 · 2016-07-19T15:08:53.000+02:00
diff --git a/manifests/integrations/varnish.pp b/manifests/integrations/varnish.pp
@@ -6,6 +6,9 @@
 #   varnishstat
 #       Path to the varnishstat binary
 #
+#   name
+#       Used in the varnishstat command for the -n argument
+#
 #   tags
 #       DataDog tags
 #
@@ -20,7 +23,8 @@
 #
 class datadog_agent::integrations::varnish (
   $varnishstat = '/usr/bin/varnishstat',
-  $tags      = [],
+  $name        = undef,
+  $tags        = [],
 ) inherits datadog_agent::params {
   include datadog_agent
 
diff --git a/templates/agent-conf.d/varnish.yaml.erb b/templates/agent-conf.d/varnish.yaml.erb
@@ -2,6 +2,9 @@ init_config:
 
 instances:
     -   varnishstat: <%= @varnishstat %>
+<% if @name -%>
+        name: <%= @name %>
+<% end -%>
 <% if @tags and ! @tags.empty? -%>
         tags:
   <%- Array(@tags).each do |tag| -%>

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`# varnishstat`
`7`	`7`	`# Path to the varnishstat binary`
`8`	`8`	`#`
	`9`	`+# name`
	`10`	`+# Used in the varnishstat command for the -n argument`
	`11`	`+#`
`9`	`12`	`# tags`
`10`	`13`	`# DataDog tags`
`11`	`14`	`#`
`@@ -20,7 +23,8 @@`
`20`	`23`	`#`
`21`	`24`	`class datadog_agent::integrations::varnish (`
`22`	`25`	`$varnishstat = '/usr/bin/varnishstat',`
`23`		`- $tags = [],`
	`26`	`+ $name = undef,`
	`27`	`+ $tags = [],`
`24`	`28`	`) inherits datadog_agent::params {`
`25`	`29`	`include datadog_agent`
`26`	`30`