cloudstack-nagios 0.3.1 → 0.3.2

data/lib/cloudstack-nagios/cli.rb

@@ -8,7 +8,9 @@ module CloudstackNagios
     map %w(-v --version) => :version
 
     class_option :config,
-      default: ENV['HOME'] ? File.join(Dir.home, '.cloudstack-nagios.yml') : '',
+      default: ENV['HOME'] ?
+                File.join(Dir.home, '.cloudstack-nagios.yml') :
+                '/var/icinga/.cloudstack-nagios.yml',
       desc: 'location of your cloudstack-nagios configuration file'
 
     class_option :environment,

data/lib/cloudstack-nagios/commands/nagios_config.rb

@@ -7,7 +7,10 @@ class NagiosConfig < CloudstackNagios::Base
     aliases: '-t'
   def hosts
   	host_template = load_template(options[:template])
-    puts host_template.result(routers: cs_routers)
+    puts host_template.result(
+      routers: cs_routers,
+      date: date_string
+    )
   end
 
   desc "services", "generate nagios services configuration for virtual routers"
@@ -16,8 +19,21 @@ class NagiosConfig < CloudstackNagios::Base
     default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_routers_services.cfg.erb'),
     aliases: '-t'
   def services
+    bin_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'bin'))
+    config_file = options[:config]
   	service_template = load_template(options[:template])
-    puts service_template.result(routers: cs_routers)
+    puts service_template.result(
+      routers: cs_routers,
+      bin_path: bin_path,
+      config_file: config_file,
+      date: date_string
+    )
+  end
+
+  no_commands do
+    def date_string
+      Time.new.strftime("%d.%m.%Y - %H:%M:%S")
+    end
   end
 
  end

data/lib/cloudstack-nagios/helper.rb

@@ -2,8 +2,9 @@ module CloudstackNagios
   module Helper
     def load_template(template_path)
       if File.file?(template_path)
-        templ = File.read(template_path)
-        return Erubis::Eruby.new(templ)
+        templ = Erubis::Eruby.new(File.read template_path)
+        templ.filename = template_path
+        return templ
       else
         say "Error: template not found #{template_path}"
         exit 1

data/lib/cloudstack-nagios/templates/cloudstack_routers_hosts.cfg.erb

@@ -2,12 +2,12 @@
 #
 # Host configuration file
 #
-# Created by: 
-# Date:       <%= Time.new.strftime("%d.%m.%Y %H:%M:%S") -%>
+# Created by: cloudstack-nagios
+# Date:       <%= date %>
 # Version:    Nagios 3.x config file
 #
 # --- DO NOT EDIT THIS FILE BY HAND ---
-# cloudstack-cli will overwite all manual settings during the next update
+# cloudstack-nagios will overwite all manual settings during the next update
 #
 ###############################################################################
 
@@ -23,7 +23,7 @@ define host {
         host_name                     <%= router['name'] %>
         display_name                  <%= router['name'] %> (<%= <%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %><%= " - #{router['zonename'] %>
         address                       <%= router['linklocalip'] %>
-        use			      Linux-Host,host-pnp
+        use			                  Linux-Host,host-pnp
         hostgroups                    Cloudstack-SystemVM
         check_command                 check-host-alive
         register                      1
@@ -37,4 +37,4 @@ define host {
 #
 # END OF FILE
 #
-###############################################################################
+###############################################################################

data/lib/cloudstack-nagios/templates/cloudstack_routers_services.cfg.erb

@@ -1,10 +1,10 @@
 
 ###############################################################################
 #
-# Host configuration file
+# Service configuration file
 #
-# Created by: 
-# Date:       <%= Time.new.strftime("%d.%m.%Y %H:%M:%S") -%>
+# Created by: cloudstack-nagios
+# Date:       <%= date %>
 # Version:    Nagios 3.x config file
 #
 # --- DO NOT EDIT THIS FILE BY HAND ---
@@ -14,25 +14,25 @@
 
 define command {
         command_name                   cs-nagios_check-memory
-        command_line                   /usr/local/bin/cs-nagios check memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        command_line                   <%= bin_path -%>/cs-nagios check memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-cpu
-        command_line                   /usr/local/bin/cs-nagios check cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        command_line                   <%= bin_path -%>/cs-nagios check cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-network
-        command_line                   /usr/local/bin/cs-nagios check network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        command_line                   <%= bin_path -%>/cs-nagios check network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-rootfsrw
-        command_line                   /usr/local/bin/cs-nagios check rootfs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        command_line                   <%= bin_path -%>/cs-nagios check rootfs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
@@ -74,8 +74,8 @@ define service {
 
 ###############################################################################
 #
-# Host configuration file
+# Service configuration file
 #
 # END OF FILE
 #
-###############################################################################
+###############################################################################

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.3.1"
-end
+  VERSION = "0.3.2"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors: