cloudstack-nagios 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e0494052a94a877fe3093a37c8cacc67f304e8
-  data.tar.gz: f2b08fa3aacf875ab2739c3bc1b273518df22966
+  metadata.gz: 59bc876fc7ecb06123f39141d71eb4a393ae3894
+  data.tar.gz: 620ceb57080cc1138251e5cd835884eb797ead3e
 SHA512:
-  metadata.gz: 04733f21a90d816f2614fb38af6117b044f2885f6ebfd7e54d574c9fd3d6e4cff72d71b4cc1d9f2f407a8a43eb835feff900bd5d7335cb454ce2a209cc935ef7
-  data.tar.gz: 0c3ab434608fdb024b61dc1a7ef89861a1e266ed90996d6a4a225c1ac5030ba65d07adef67455d4004180d5c40f4ce99d9c61eb9af2d6a7ce9629d24b8e3bca5
+  metadata.gz: 153c7f53b8d820c4cdcefcbae076392f4c311e121831c5f264f917c4f47b7b5687caf68e0fac073bfbd4989266b051d9f37f21343b4f4c12e3203a493aa02145
+  data.tar.gz: a7b73d07ee00d9a79142afa948604d77318908a4884fdd358f28400828f396a8b41d881cd2df3ab98909adef296fad163eb9a069106d0ea3ddc70ce4bfb58a48

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

@@ -82,6 +82,7 @@ class NagiosConfig < CloudstackNagios::Base
   def capacity_services
     service_template = load_template(options[:template])
     puts service_template.result(
+      zones: client.list_zones,
       capacity_types: Capacity::CAPACITY_TYPES,
       bin_path: bin_path,
       config_file: options[:config],

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

@@ -11,25 +11,28 @@
 #
 ###############################################################################
 
+
 <% capacity_types.each do |cap_type, cap_values| -%>
 define command {
-        command_name                   cs-nagios_check-capacity_<%= cap_values[:method_name] %>
-        command_line                   <%= bin_path -%>cs-nagios check capacity <%= cap_values[:method_name] %> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
-        register                       1
+        command_name  cs-nagios_check-capacity_<%= cap_values[:method_name] %>
+        command_line  <%= bin_path -%>cs-nagios check capacity <%= cap_values[:method_name] %> -w $ARG1$ -c $ARG2$ --config <%= config_file %> --zone $ARG3$
+        register      1
 }
 
 <% end -%>
 
-<% capacity_types.each do |cap_type, cap_values| -%>
+<% zones.each do |zone| -%>
+  <% capacity_types.each do |cap_type, cap_values| -%>
 define service {
-        hostgroup_name                  Cloudstack-API
-        service_description             <%= cap_values[:name] %>
-        display_name                    <%= cap_values[:method_name] %>
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-capacity_<%= cap_values[:method_name] -%>!80!90
-        register                        1
+        hostgroup_name       Cloudstack-API
+        service_description  Cloudstack <%= zone %> <%= cap_values[:name] %>
+        display_name         Cloudstack <%= zone %> <%= cap_values[:method_name] %>
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-capacity_<%= cap_values[:method_name] -%>!80!90!<%= zone %>
+        register             1
 }
 
+  <% end -%>
 <% end -%>
 ###############################################################################
 #

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Nik Wolfgramm