Hope to God this is mergeable

.puppet-lint.rc

@@ -1,3 +1,3 @@
---no-80chars-check
+--no-140chars-check
 --no-names_containing_dash-check
 --no-class_inherits_from_params_class-check

files/check_cron_logs.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+LOG_FILE='/var/log/messages'
+DATE=$(date --date="24 hours ago" '+%b %-d %H' | sed -r 's/^([a-zA-Z]+) /\1 {1,2}/g')
+NAME=$(hostname --short)
+CRONS_FAILING=''
+IGNORE_TAG='drush|SERVICE NOTIFICATION|SERVICE ALERT'
+
+while getopts ":i:" o; do
+    case "${o}" in
+        i)
+            IGNORE_TAG="("$(echo "${OPTARG}" | sed 's/ /)|(/g')")"
+            ;;
+        *)
+            echo "Bad param"
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+
+REGEX="("$(echo "$@" | sed 's/ /)|(/g')")"
+
+##By defualt, only logs newer than 24h are checked, let's check if there even are that old logs
+
+if egrep -q "$DATE" /var/log/messages; then
+  if [ $REGEX != '()' ]; then
+    CRONS_FAILING=$(cat $LOG_FILE | sed -r "1,/$DATE/d" |egrep "cron .*\[[0-9]+\].*\[error\]" | egrep -v "$IGNORE_TAG" |
+    sed -r "s/^.*$NAME [^ ]+ ([^ ]* )?cron ([^\[]+).*/\2/g" | sort | uniq | egrep -v $REGEX)
+  else
+    CRONS_FAILING=$(cat $LOG_FILE | sed -r "1,/$DATE/d" |egrep "cron .*\[[0-9]+\].*\[error\]" | egrep -v "$IGNORE_TAG" |
+    sed -r "s/^.*$NAME [^ ]+ ([^ ]* )?cron ([^\[]+).*/\2/g" | sort | uniq)
+  fi
+
+##if not, we're simply reading the whole file
+
+else
+  if [ $REGEX != '()' ]; then
+    CRONS_FAILING=$(cat $LOG_FILE |egrep "cron .*\[[0-9]+\].*\[error\]" | egrep -v "$IGNORE_TAG" |
+    sed -r "s/^.*$NAME [^ ]+ ([^ ]* )?cron ([^\[]+).*/\2/g" | sort | uniq | egrep -v $REGEX)
+  else
+    CRONS_FAILING=$(cat $LOG_FILE |egrep "cron .*\[[0-9]+\].*\[error\]" | egrep -v "$IGNORE_TAG" |
+    sed -r "s/^.*$NAME [^ ]+ ([^ ]* )?cron ([^\[]+).*/\2/g" | sort | uniq)
+  fi
+fi
+
+if [ -z "$CRONS_FAILING" ]; then
+ echo "No cron jobs have failed over the past 24 hours."
+ exit 0
+else
+ echo "Cron jobs that have failed over the past 24 hours: "$CRONS_FAILING
+ exit 1
+fi
+

files/check_gluster.sh

@@ -91,17 +91,11 @@ VOLUME=$1
 ex_stat=OK
 BRICKS=$(sudo gluster volume info $VOLUME | grep "Number of Bricks" | cut -f8 -d" ")
 
-# get volume heal status
-heal=0
-for entries in $(sudo gluster volume heal ${VOLUME} info | awk '/^Number of entries: /{print $4}'); do
-	if [ "$entries" -gt 0 ]; then
-		let $((heal+=entries))
-	fi
-done
-if [ "$heal" -gt 0 ]; then
-	errors=("${errors[@]}" "$heal unsynched entries")
+if sudo gluster volume heal data info split-brain | grep 'Number of entries in split-brain: [1-9]'; then
+	errors=("${errors[@]}" "entries in split-brain present!")
 fi
 
+
 # get volume status
 bricksfound=0
 freegb=9999999
@@ -122,9 +116,9 @@ sudo gluster volume status $VOLUME detail | while IFS='\n' read line; do
 		key=${field[@]:0:3}
 		if [ "${key}" = "Disk Space Free" ]; then
 			freeunit=${field[@]:4}
-			free=${freeunit%'GB'}
+                        unit=${freeunit: -2}
+                        free=${freeunit::${#freeunit}-2}
 			freeconvgb=`echo "($free*1024)" | bc`
-			unit=${freeunit#$free}
 			if [ "$unit" = "TB" ]; then
 				free=$freeconvgb
 				unit="GB"

files/check_haproxy.rb

@@ -1,20 +1,33 @@
 #!/usr/bin/ruby
 
-require "net/http"
+# This file is managed by puppet.
+#
+# Source of this script: https://github.com/benprew/nagios-checks
+# which actually contains the changes from this pull request
+# https://github.com/benprew/nagios-checks/pull/8/commits
+
 require 'optparse'
 require 'open-uri'
 require 'ostruct'
 require 'csv'
+require 'openssl'
+
 
 OK = 0
 WARNING = 1
 CRITICAL = 2
 UNKNOWN = 3
 
+# allows https with invalid certificate on ruby 1.8+
+#
+# src: also://snippets.aktagon.com/snippets/370-hack-for-using-openuri-with-ssl
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
 status = ['OK', 'WARN', 'CRIT', 'UNKN']
 
 @proxies = []
 @errors = []
+@perfdata = []
 exit_code = OK
 
 options = OpenStruct.new
@@ -28,22 +41,10 @@
 
   # Required arguments
   opts.on("-u", "--url URL", "Statistics URL to check (eg. http://demo.1wt.eu/)") do |v|
-    options.url = v+":18080"
-#    puts options.url
+    options.url = v
     options.url += "/;csv" unless options.url =~ /;/
-    options.url="http://"+options.url
-
-  begin
-    response = Net::HTTP.get_response(URI(options.url));
-  rescue
-    puts "Service not running"
-    exit CRITICAL
   end
 
-
- end
-
-
   # Optional Arguments
   opts.on("-p", "--proxies [PROXIES]", "Only check these proxies (eg. proxy1,proxy2,proxylive)") do |v|
     options.proxies = v.split(/,/)
@@ -97,54 +98,103 @@
   exit UNKNOWN
 end
 
-open(options.url, :http_basic_authentication => [options.user, options.password]) do |f|
-  f.each do |line|
 
-    if line =~ /^# /
-      HAPROXY_COLUMN_NAMES = line[2..-1].split(',')
-      next
-    elsif ! defined? HAPROXY_COLUMN_NAMES
-      puts "ERROR: CSV header is missing"
-      exit UNKNOWN
-    end
+tries = 2
+
+begin
+  f = open(options.url, :http_basic_authentication => [options.user, options.password])
+rescue OpenURI::HTTPError => e
+  puts "ERROR: #{e.message}"
+  exit CRITICAL
+rescue Errno::ECONNREFUSED => e
+  puts "ERROR: #{e.message}"
+  exit CRITICAL
+rescue Exception => e
+  if e.message =~ /redirection forbidden/
+    options.url = e.message.gsub(/.*-> (.*)/, '\1')  # extract redirect URL
+    retry if (tries -= 1) > 0
+    raise
+  else
+    exit UNKNOWN
+  end
+end
 
-    row = HAPROXY_COLUMN_NAMES.zip(CSV.parse(line)[0]).reduce({}) { |hash, val| hash.merge({val[0] => val[1]}) }
-
-    next unless options.proxies.empty? || options.proxies.include?(row['pxname'])
-    next if row['pxname'] == 'statistics'
-
-    role = row['act'].to_i > 0 ? 'active ' : (row['bck'].to_i > 0 ? 'backup ' : '')
-    message = sprintf("%s: %s %s%s", row['pxname'], row['status'], role, row['svname'])
-
-    if %w(FRONTEND BACKEND).include? row['svname']
-      if options.critical && row['scur'].to_i * 100 >= options.critical.to_i * row['slim'].to_i
-        @errors << sprintf("%s has too many sessions (%s/%s) on %s proxy",
-                           row['svname'],
-                           row['scur'],
-                           row['slim'],
-                           row['pxname'])
-        exit_code = CRITICAL
-      elsif options.warning && row['scur'].to_i * 100 >= options.warning.to_i * row['slim'].to_i
-        @errors << sprintf("%s has too many sessions (%s/%s) on %s proxy",
-                           row['svname'],
-                           row['scur'],
-                           row['slim'],
-                           row['pxname'])
-        exit_code = WARNING if exit_code == OK || exit_code == UNKNOWN
-      end
 
-      if row['status'] != 'OPEN' && row['status'] != 'UP'
-        @errors << message
-        exit_code = CRITICAL
-      end
+f.each do |line|
+
+  if line =~ /^# /
+    HAPROXY_COLUMN_NAMES = line[2..-1].split(',')
+    next
+  elsif ! defined? HAPROXY_COLUMN_NAMES
+    puts "ERROR: CSV header is missing"
+    exit UNKNOWN
+  end
 
-    elsif row['status'] != 'no check'
-      @proxies << message
+  row = HAPROXY_COLUMN_NAMES.zip(CSV.parse(line)[0]).reduce({}) { |hash, val| hash.merge({val[0] => val[1]}) }
 
-      if row['status'] != 'UP'
-        @errors << message
-        exit_code = WARNING if exit_code == OK || exit_code == UNKNOWN
+  next unless options.proxies.empty? || options.proxies.include?(row['pxname'])
+  next if ['statistics', 'admin_stats', 'stats'].include? row['pxname']
+
+  role = row['act'].to_i > 0 ? 'active ' : (row['bck'].to_i > 0 ? 'backup ' : '')
+  message = sprintf("%s: %s %s%s", row['pxname'], row['status'], role, row['svname'])
+  perf_id = "#{row['pxname']}".downcase
+
+  if row['svname'] == 'FRONTEND'
+    if row['slim'].to_i == 0
+      session_percent_usage = 0
+    else
+      session_percent_usage = row['scur'].to_i * 100 / row['slim'].to_i
+    end
+    @perfdata << "#{perf_id}_sessions=#{session_percent_usage}%;#{options.warning ? options.warning : ""};#{options.critical ? options.critical : ""};;"
+    @perfdata << "#{perf_id}_rate=#{row['rate']};;;;#{row['rate_max']}"
+    if options.critical && session_percent_usage > options.critical.to_i
+      @errors << sprintf("%s has way too many sessions (%s/%s) on %s proxy",
+                         row['svname'],
+                         row['scur'],
+                         row['slim'],
+                         row['pxname'])
+      exit_code = CRITICAL
+    elsif options.warning && session_percent_usage > options.warning.to_i
+      @errors << sprintf("%s has too many sessions (%s/%s) on %s proxy",
+                         row['svname'],
+                         row['scur'],
+                         row['slim'],
+                         row['pxname'])
+      exit_code = WARNING if exit_code == OK || exit_code == UNKNOWN
+    end
+
+    if row['status'] != 'OPEN' && row['status'] != 'UP'
+      @errors << message
+      exit_code = CRITICAL
+    end
+
+  elsif row['svname'] == 'BACKEND'
+    # It has no point to check sessions number for backends, against the alert limits,
+    # as the SLIM number is actually coming from the "fullconn" parameter.
+    # So we just collect perfdata. See the following url for more info:
+    # http://comments.gmane.org/gmane.comp.web.haproxy/9715
+    current_sessions = row['scur'].to_i
+    @perfdata << "#{perf_id}_sessions=#{current_sessions};;;;"
+    @perfdata << "#{perf_id}_rate=#{row['rate']};;;;#{row['rate_max']}"
+    if row['status'] != 'OPEN' && row['status'] != 'UP'
+      @errors << message
+      exit_code = CRITICAL
+    end
+
+  elsif row['status'] != 'no check'
+    @proxies << message
+
+    if row['status'] != 'UP'
+      @errors << message
+      exit_code = WARNING if exit_code == OK || exit_code == UNKNOWN
+    else
+      if row['slim'].to_i == 0
+        session_percent_usage = 0
+      else
+        session_percent_usage = row['scur'].to_i * 100 / row['slim'].to_i
       end
+      @perfdata << "#{perf_id}-#{row['svname']}_sessions=#{session_percent_usage}%;;;;"
+      @perfdata << "#{perf_id}-#{row['svname']}_rate=#{row['rate']};;;;#{row['rate_max']}"
     end
   end
 end
@@ -158,25 +208,24 @@
   exit_code = UNKNOWN if exit_code == OK
 end
 
-puts "HAPROXY " + status[exit_code] + ": " + @errors.join('; ')
+puts "HAPROXY " + status[exit_code] + ": " + @errors.join('; ') + "|" + @perfdata.join(" ")
 puts @proxies
 
 exit exit_code
 
 =begin
 Copyright (C) 2013 Ben Prew
 Copyright (C) 2013 Mark Ruys, Peercode <[email protected]>
-
+Copyright (C) 2015 Hector Sanjuan. Nugg.ad <[email protected]>
+Copyright (C) 2015 Roger Torrentsgeneros <[email protected]>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
-
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end