cloudstack-nagios 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db714aeb227dbff19bb0f1b61d483d73fcabb31
-  data.tar.gz: 8359ab172f92207628985fe890ad19a70a823306
+  metadata.gz: dd79f250d420ee0506a8efdafd3b92f79070ef7d
+  data.tar.gz: 0419a67d851a0b97d598bdf6968713f1a157dd8e
 SHA512:
-  metadata.gz: 86072a8aa5057f708584c3424ad3b2401e6eb1a1976338d32f4e99a5d2e24503fdf905babee20c6029e329fa26d12b8bafca9974b37de35b6870a1c7f72dc7c0
-  data.tar.gz: b02be7ff9f51068b36b9c54a84b4370e708f8bf39325855e42a649077c7931fae8daa05861f88f7a7d593507a76b77a5ac273d9f8e0cad30574434673414b119
+  metadata.gz: 1f6f08315d50ef0559d759b1a2b83f3c250f5bd457036d91caa76c2b0032fbb8e142c6f849090c1679b019c210b168d3fc4a7ff70f7b914e6613f0569b980070
+  data.tar.gz: b13037841df8235e9970102d3f2fc3692e54a80d8d9a30700405be68f65d52c7894ac895537c5e0bb5dcfd7ea4fe1927f59d4792f110e1771482148476847375

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.12.2)
+    cloudstack-nagios (0.13.0)
       cloudstack_client (~> 0.5, >= 0.5.0)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
@@ -11,14 +11,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.6.1)
+    cloudstack_client (0.6.4)
     erubis (2.7.0)
     highline (1.6.21)
     json (1.8.1)
-    net-scp (1.2.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    rake (10.3.1)
+    net-ssh (2.9.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     sshkit (1.3.0)
@@ -28,7 +28,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.1.0)
+    tins (1.3.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -12,7 +12,7 @@ The following checks are supported:
 
   * Cloudstack Root Admin keys have to be used.
   * In order to connect to system VMs the private ssh key found on the Cloudstack management server under /var/lib/cloud/management/.ssh/id_rsa are required.
-  * The system vms must be reachable over SSH (default port 3922) from the nagios server executing the checks (check with 'ssh -i /var/lib/cloud/management/.ssh/id_rsa -p 3922 <router_mgmt_ip>').
+  * The system vms must be reachable on the Cloudstack Management Network over SSH (default port 3922) from the nagios server executing the checks (check with 'ssh -i /var/lib/cloud/management/.ssh/id_rsa -p 3922 <router_mgmt_ip>').
 
 ## Installation
 
@@ -152,4 +152,4 @@ $ cs-nagios check async_jobs
 
 ## License
 
-Released under the MIT License. See the [LICENSE](https://bitbucket.org/swisstxt/cloudstack-cli/raw/master/LICENSE.txt) file for further details.
+Released under the MIT License. See the [LICENSE](https://bitbucket.org/swisstxt/cloudstack-cli/raw/master/LICENSE.txt) file for further details.

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

@@ -32,7 +32,7 @@ class Router < CloudstackNagios::Base
         mpstat_output = capture(:mpstat)
       end
       values = mpstat_output.scan(/\d+\.\d+/)
-      usage = 100 - values[-1].to_f 
+      usage = 100 - values[-1].to_f
       data = check_data(100, usage, options[:warning], options[:critical])
       puts "CPU #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
       exit data[0]
@@ -45,17 +45,20 @@ class Router < CloudstackNagios::Base
   def rootfs_rw
     begin
       host = systemvm_host
-      proc_out = ""
+      test_file = '/rootdiskcheck.txt'
+      rootfs_rw = false
       on host do |h|
-        proc_out = capture(:cat, '/proc/mounts')
+        rootfs_rw = execute(:touch, test_file)
+        execute(:rm, '-f', test_file)
       end
-      rootfs_rw = proc_out.match(/rootfs\srw\s/)
-      status = rootfs_rw ? 0 : 2
-      puts "ROOTFS_RW #{rootfs_rw ? 'OK - rootfs writeable' : 'CRITICAL - rootfs NOT writeable'}"
-      exit status
+    rescue SSHKit::Command::Failed
+      rootfs_rw = false
     rescue => e
       exit_with_failure(e)
     end
+    status = rootfs_rw ? 0 : 2
+    puts "ROOTFS_RW #{rootfs_rw ? 'OK - rootfs writeable' : 'CRITICAL - rootfs NOT writeable'}"
+    exit status
   end
 
   desc "disk_usage", "check the disk space usage of the root volume"

data/lib/cloudstack-nagios/files/create_cs_router_config.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# Create Icinga Configuration upon CS router changes 
+# Add this script in crontab 
+
+date=`date +%Y%m%d%H%M`
+
+config_path=/var/icinga/.cloudstack-nagios.yml
+bin_path=/usr/local/bin/
+icinga_dir=/etc/icinga/dynamic_hosts
+ssh_key=/var/icinga/cloud/management/.ssh/id_rsa
+
+#Create Icinga Cloudstack Configuration
+echo "generate hostgroups"
+/usr/local/bin/cs-nagios nagios_config generate hostgroups --config $config_path --ssh-key $ssh_key --bin_path $bin_path | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_hostgroups.cfg
+echo "generate router_hosts"
+/usr/local/bin/cs-nagios nagios_config generate router_hosts --config $config_path --ssh-key $ssh_key --bin_path $bin_path | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_router_hosts.cfg
+echo "generate router_services"
+/usr/local/bin/cs-nagios nagios_config generate router_services --config $config_path --ssh-key $ssh_key --bin_path $bin_path --if-speed 1000000000 | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_router_services.cfg
+echo "generate zone_hosts"
+/usr/local/bin/cs-nagios nagios_config generate zone_hosts --config $config_path --ssh-key $ssh_key --bin-path $bin_path | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_zone_hosts.cfg
+echo "generate storage_pools"
+/usr/local/bin/cs-nagios nagios_config generate storage_pools --config $config_path --ssh-key $ssh_key --bin_path $bin_path --over_provisioning 2.0 | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_storage_pools.cfg
+echo "generate capacities"
+/usr/local/bin/cs-nagios nagios_config generate capacities --config $config_path --ssh-key $ssh_key --bin_path $bin_path | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_capacity.cfg
+echo "generate async_jobs"
+/usr/local/bin/cs-nagios nagios_config generate async_jobs --config $config_path --ssh-key $ssh_key --bin_path $bin_path | grep -v Date > /var/icinga/core/dynamic_hosts/cloudstack_async_jobs.cfg
+
+
+#Check if gengerated configuration is valid
+/usr/bin/icinga -vp /var/icinga/core/icingalocaltest.cfg > /dev/null 2>&1
+
+if [ $? -eq 0 ]
+  then
+  ### check if services have changed
+  diff -r /var/icinga/core/dynamic_hosts /etc/icinga/dynamic_hosts > /dev/null 2>&1
+  ### if config is changed copy files 
+  if [ $? -eq 1 ]  
+     then
+     echo "Config Changed, updating now"
+     cp -rp /etc/icinga/dynamic_hosts /etc/icinga/dynamic_hosts.$date
+     rm -rf /etc/icinga/dynamic_hosts/*
+     cp -rp /var/icinga/core/dynamic_hosts /etc/icinga/
+     /usr/bin/icinga -vp /etc/icinga/icinga.cfg > /dev/null 2>&1
+     if [ $? -eq 0 ]; then
+        echo "Config reloaded, please reload icinga (script ready for auto reload)"
+        /etc/init.d/icinga reload
+     else
+	echo "Problem with Global Nagios Configuration, try /usr/bin/icinga -vp /etc/icinga/icinga.cfg"
+     fi
+  else
+      echo "Cloudstack Icinga Configuration not changed, nothing to do"
+  fi
+ 
+else
+ echo "Problem with new Cloudstack Icinga Checks, try /usr/bin/icinga -vp /var/icinga/core/icingalocaltest.cfg"
+fi

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -138,6 +138,7 @@ files:
 - lib/cloudstack-nagios/commands/nagios_config.rb
 - lib/cloudstack-nagios/commands/router.rb
 - lib/cloudstack-nagios/commands/snmpd_config.rb
+- lib/cloudstack-nagios/files/create_cs_router_config.sh
 - lib/cloudstack-nagios/files/snmpd.conf
 - lib/cloudstack-nagios/helper.rb
 - lib/cloudstack-nagios/templates/cloudstack_async_jobs.cfg.erb