Bug #9738, enable ITL for resource eventcommand

Icinga · Jul 28, 2015 · 057ab5e · 057ab5e
1 parent 0ee5475
commit 057ab5e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/providers/eventcommand.rb b/providers/eventcommand.rb
@@ -39,29 +39,56 @@ def object_resources
 end
 
 # collect objects and create resource template
-def object_template
+def objects
   # collect objects
   icinga2_objects = {}
+  icinga2_templates = {}
   object_resources.reduce({}) do |_hash, resource|
-    next if resource.action != :create || icinga2_objects.key?(resource.name)
-    icinga2_objects[resource.name] = {}
-    icinga2_objects[resource.name] = { 'import' => resource.send('import'),
-                                       'command' => resource.send('command'),
-                                       'env' => resource.send('env'),
-                                       'timeout' => resource.send('timeout'),
-                                       'arguments' => resource.send('arguments'),
-                                       'custom_vars' => resource.send('custom_vars') }
+    next unless resource.action == :create
+    if resource.send('template') && !icinga2_templates.key?(resource.name)
+      icinga2_templates[resource.name] = {}
+      icinga2_templates[resource.name] = { 'import' => resource.send('import'),
+                                           'command' => resource.send('command'),
+                                           'env' => resource.send('env'),
+                                           'timeout' => resource.send('timeout'),
+                                           'arguments' => resource.send('arguments'),
+                                           'custom_vars' => resource.send('custom_vars'),
+                                           'object_class' => 'template' }
+    elsif icinga2_objects.key?(resource.name)
+      icinga2_objects[resource.name] = {}
+      icinga2_objects[resource.name] = { 'import' => resource.send('import'),
+                                         'command' => resource.send('command'),
+                                         'env' => resource.send('env'),
+                                         'timeout' => resource.send('timeout'),
+                                         'arguments' => resource.send('arguments'),
+                                         'custom_vars' => resource.send('custom_vars'),
+                                         'object_class' => 'object' }
+    end
   end
+  [icinga2_objects, icinga2_templates]
+end
 
+# create object / template resource
+def object_template
+  objs, tmpls = objects
   # create object resource
-  ot = template ::File.join(node['icinga2']['objects_dir'], "#{::File.basename(__FILE__, '.rb')}.conf") do
+  ob = template ::File.join(node['icinga2']['objects_dir'], "#{::File.basename(__FILE__, '.rb')}.conf") do
+    source "object.#{::File.basename(__FILE__, '.rb')}.conf.erb"
+    cookbook 'icinga2'
+    owner node['icinga2']['user']
+    group node['icinga2']['group']
+    mode 0640
+    variables(:objects => objs)
+    notifies :reload, 'service[icinga2]', :delayed
+  end
+  te = template ::File.join(node['icinga2']['objects_dir'], "#{::File.basename(__FILE__, '.rb')}_template.conf") do
     source "object.#{::File.basename(__FILE__, '.rb')}.conf.erb"
     cookbook 'icinga2'
     owner node['icinga2']['user']
     group node['icinga2']['group']
     mode 0640
-    variables(:objects => icinga2_objects)
+    variables(:objects => tmpls)
     notifies :reload, 'service[icinga2]', :delayed
   end
-  ot.updated?
+  ob.updated? || te.updated?
 end
diff --git a/resources/eventcommand.rb b/resources/eventcommand.rb
@@ -27,3 +27,4 @@
 attribute :timeout,     :kind_of => [String, Integer], :default => nil
 attribute :arguments,   :kind_of => Hash, :default => nil
 attribute :custom_vars, :kind_of => Hash, :default => nil
+attribute :template,    :kind_of => [TrueClass, FalseClass], :default => false
diff --git a/templates/default/object.eventcommand.conf.erb b/templates/default/object.eventcommand.conf.erb
@@ -8,7 +8,7 @@
 */
 
 <% @objects.sort.map do |object, options|%>
-object EventCommand <%= object.inspect -%> {
+<%= options['object_class'] -%> EventCommand <%= object.inspect -%> {
   <% if options['import'] -%>
   import <%= options['import'].inspect %>
   <% end -%>