瀏覽代碼

Set template parameters to undef and don't create ini settings unless they're set.

Eric Zounes 8 年之前
父節點
當前提交
4fa1812fbd
共有 1 個文件被更改,包括 14 次插入10 次删除
  1. 14 10
      manifests/mod/graphite.pp

+ 14 - 10
manifests/mod/graphite.pp

@@ -5,8 +5,8 @@ class icingaweb2::mod::graphite (
   $git_revision           = undef,
   $graphite_base_url      = 'http://graphite.com/render?',
   $graphite_metric_prefix = undef,
-  $service_name_template  = 'icinga2.$host.name$.services.$service.name$.$service.check_command$.perfdata.$metric$.value',
-  $host_name_template     = 'icinga2.$host.name$.host.$host.check_command$.perfdata.$metric$.value',
+  $service_name_template  = undef,
+  $host_name_template     = undef,
   $install_method         = 'git',
   $pkg_deps               = undef,
   $pkg_ensure             = 'present',
@@ -58,16 +58,20 @@ class icingaweb2::mod::graphite (
     }
   }
 
-  ini_setting { 'service_name_template':
-    section => 'graphite',
-    setting => 'service_name_template',
-    value   => $service_name_template,
+  if $service_name_template {
+    ini_setting { 'service_name_template':
+      section => 'graphite',
+      setting => 'service_name_template',
+      value   => $service_name_template,
+    }
   }
 
-  ini_setting { 'host_name_template':
-    section => 'graphite',
-    setting => 'host_name_template',
-    value   => $host_name_template,
+  if $host_name_template {
+    ini_setting { 'host_name_template':
+      section => 'graphite',
+      setting => 'host_name_template',
+      value   => $host_name_template,
+    }
   }