Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64153 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb7822291ae6169d9b3d91a48fcceacd86d874bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb7822291ae616… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 22:41:39 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years

Check_MK Git: check_mk: Host/Service Icon column is now modularized

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60ad2e642589730e575bc8ecd98b8ade34ba288d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ad2e64258973… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 13:24:51 2011 +0200 Host/Service Icon column is now modularized --- ChangeLog | 3 + web/htdocs/images/icon_www.png | Bin 0 -> 3734 bytes web/htdocs/index.py | 1 + web/plugins/icons/builtin.py | 470 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/painters.py | 217 ++++--------------- 5 files changed, 513 insertions(+), 178 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=60ad2e6425…

13 years

Check_MK Git: check_mk: Removed obsolete old check_mk_agent.hp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d619d506f39d20f6d2aa037243eed492213d7a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d619d506f39d20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 16:06:36 2011 +0200 Removed obsolete old check_mk_agent.hp --- doc/treasures/check_mk_agent.hp | 128 --------------------------------------- 1 files changed, 0 insertions(+), 128 deletions(-) diff --git a/doc/treasures/check_mk_agent.hp b/doc/treasures/check_mk_agent.hp deleted file mode 100644 index 4567fd3..0000000 --- a/doc/treasures/check_mk_agent.hp +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -# This rudimentary agent for HP has been submitted by a -# community member and is not part of Check_MK. It might -# be more than nothing, though - -export MK_LIBDIR="/usr/lib/check_mk_agent" -export MK_CONFDIR="/etc/check_mk_agent" -export TOP_LOG=/tmp/top_info.log - -# All executables in PLUGINSDIR will simply be executed and their -# ouput appended to the output of the agent. Plugins define their own -# sections and must output headers with '<<<' and '>>>' -PLUGINSDIR=$MK_LIBDIR/plugins - -# All executables in LOCALDIR will by executabled and their -# output inserted into the section <<<local>>>. They must -# *not* output a section header. A local extension may output -# zero, one or several lines. Each line must be in the form -# EXITCODE CHECK_NAME PERFDATA CHECK_OUTPUT -# EXITCODE is 0, 1, 2 or 3 -# CHECK_NAME will be used as Nagios's service_descriptions and -# must be unique for this host -# PERFDATA is optional performance data in the standard Nagios -# format for variable=value;warn;crit;min;max. You can send -# only one variable currently. If you do not want to send -# performance data output a single dash instead -# CHECK_OUTPUT will be used by Nagios as the check's output -# EXITCODE, CHECK_NAME and PERFDATA must not contain spaces -# or tabs. CHECK_OUTPUT may contain spaces and tabs -LOCALDIR=$MK_LIBDIR/local -PATH=$PATH:/usr/bin:/usr/sbin -VMLOGDIR=/tmp/vmstat.log - -echo '<<<check_mk>>>' -echo Version: 1.1.0 - -echo '<<<df>>>' -df -kPl | sed 's/ / - /' | grep -v ^Filesystem - -echo '<<<ps>>>' -UNIX95= ps -ex -o user,args - -# Daten holen -#rm -f ${VMLOGDIR} 2>/dev/null -#vmstat 1 5 > ${VMLOGDIR} - -# Speicherauslastung -#echo '<<<mem>>>' -#echo MemTotal: ${cat ${VMLOGDIR}|egrep -v "Time|kthr"|awk '{print $4}'|tail -1} -#echo MemFree: ${cat ${VMLOGDIR}|egrep -v "Time|kthr"|awk '{print $5}'|tail -1} - -## Performancecounter Platten -#echo '<<<iostat>>>' -#date -#/usr/bin/iostat - -# Network interfaces (Link, Autoneg, Speed) -# This requires lanscan -if which lanscan > /dev/null -then - echo '<<<netif>>>' - for eth in $(lanscan -p|cut -d " " -f1) - do - echo $(lanadmin -g $eth|grep "Description"|cut -d " " -f23) $(lanadmin -x $eth|cut -d " " -f22,23) on $(lanadmin -g 0|grep "Operation Status"|cut -d " " -f12|cut -d "(" -f1|sed -e "s/up/yes/") - done -fi - -# Statistik der Netzwerkgeraete (Pakete, Kollisionen, etc) -#echo '<<<netctr_hp>>>' -# Genauen Zeitstempel einfuegen, da Counter von Zeit abhaengen -#date -#/usr/bin/netstat -iw|grep -v "Name" - -# CPU -#echo '<<<cpu_hp>>>' -#cat ${VMLOGDIR}|egrep -v "Time|kthr"|awk '{print $15}'|tail -1 - -# You need statgrab to be installed. You'll find it -# here: http://www.i-scream.org/libstatgrab/ -if statgrab > /tmp/statgrab.$$ 2>/dev/null - then - for s in proc cpu net load disk page general - do - echo "<<<statgrab_$s>>>" - cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' - done - - echo '<<<statgrab_mem>>>' - cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' - - rm -f /tmp/statgrab.$$ -fi - -# PLUGIN -if cd $PLUGINSDIR 2>/dev/null -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - - -echo '<<<local>>>' -if cd $LOCALDIR 2>/dev/null -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - -# MK's Remote Plugin Executor -if [ -e "$MK_CONFDIR/mrpe.cfg" ] -then - echo '<<<mrpe>>>' - grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe.cfg" | \ - while read descr cmdline - do - OUTPUT=$($cmdline) - echo "$? $descr $OUTPUT" - done -fi

13 years

Check_MK Git: check_mk: Cleaned up a bit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6f4ff2abdd0c2e8f1367c83a8566d6c5f139593 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6f4ff2abdd0c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 16:08:50 2011 +0200 Cleaned up a bit --- .bugs/105 | 9 +++ .bugs/124 | 7 ++ .bugs/261 | 16 +++++ doc/treasures/notify_by_email | 127 ----------------------------------------- 4 files changed, 32 insertions(+), 127 deletions(-) diff --git a/.bugs/105 b/.bugs/105 index 24429a7..5ea656c 100644 --- a/.bugs/105 +++ b/.bugs/105 @@ -8,3 +8,12 @@ Class: cleanup All SNMP checks must define scan functions. Otherwise the scan can take a long time on some slow devices. + +Currently these are: + +$ doc/helpers/validate_checks -a | grep scan +bluecoat_diskcpu snmp_scan manpage pnp_rra pnp_tmpl perfometer +fsc_fans snmp_scan pnp_rra pnp_tmpl perfometer +fsc_temp snmp_scan pnp_rra pnp_tmpl perfometer +ibm_imm_health snmp_scan manpage +fsc_subsystems snmp_scan diff --git a/.bugs/124 b/.bugs/124 index 80f4b25..c7028d9 100644 --- a/.bugs/124 +++ b/.bugs/124 @@ -10,3 +10,10 @@ This is an incompatible change. Make sure that the old variable is still defined for some time. Also look for further checks using that variable or doing an utilization check (windows) and bring these checks together (maybe with an include)? + +In order to make migration easier, we could catch configurations +still using the old variable, automatically set the new, and +output a Warning. + +Then write a README in doc/ that describes how to rename +configuration variables (for us developers). diff --git a/.bugs/261 b/.bugs/261 index 9482830..28f9bb1 100644 --- a/.bugs/261 +++ b/.bugs/261 @@ -19,3 +19,19 @@ path - at least for OMD. This includes: - Events in Nagios log files - RRDs - ??? + +Probleme here is, that the services in question bear the item +in their description - some even have "%s" as description. So +a migration will be tricky. + +Further thoughts: We also could live without a migration script +if we simply give the hint in the migration notes of how to +rename the services back to the old scheme: + +service_descriptions.update({ + "cisco_temp", "%s", + ... +} + +That way people can decide what to do and new users get +a clean environment. diff --git a/doc/treasures/notify_by_email b/doc/treasures/notify_by_email deleted file mode 100755 index ffc1523..0000000 --- a/doc/treasures/notify_by_email +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash -# -# Diese Skript wird bei jeder Notifikation durch Nagios -# aufgerufen. In Umgebungsvariablen mit $NAGIOS_... bekommt -# es alle Kontextinformationen. -# Zum Testen der Variablen: - -# set | grep NAGIOS_ | sort > /tmp/nagios.env -# Beispiel: -# NAGIOS_COMMANDFILE=/var/run/nagios/rw/nagios.cmd -# NAGIOS_CONTACTALIAS='RZ Notfall' -# NAGIOS_CONTACTEMAIL=rz-emergency@localhost -# NAGIOS_CONTACTGROUPALIAS='Alle Kontakte' -# NAGIOS_CONTACTGROUPMEMBERS=rz-emerg,rz-infra -# NAGIOS_CONTACTGROUPNAME=all -# NAGIOS_CONTACTGROUPNAMES=all -# NAGIOS_CONTACTNAME=rz-emerg -# NAGIOS_DATE=2010-01-19 -# NAGIOS_EVENTSTARTTIME=1263919318 -# NAGIOS_HOSTACTIONURL='/pnp4nagios/graph?host=s06_usv1' -# NAGIOS_HOSTADDRESS=192.168.1.50 -# NAGIOS_HOSTALIAS=s06_usv1 -# NAGIOS_HOSTATTEMPT=1 -# NAGIOS_HOSTCHECKCOMMAND=check-mk-ping -# NAGIOS_HOSTCHECKTYPE=ACTIVE -# NAGIOS_HOSTDISPLAYNAME=s06_usv1 -# NAGIOS_HOSTDOWNTIME=0 -# NAGIOS_HOSTDURATION='0d 1h 13m 5s' -# NAGIOS_HOSTDURATIONSEC=4385 -# NAGIOS_HOSTEVENTID=0 -# NAGIOS_HOSTEXECUTIONTIME=0.022 -# NAGIOS_HOSTGROUPALIAS=USV -# NAGIOS_HOSTGROUPMEMBERS=ad214_usv1,ik026_usv1,s06_usv1,s06_usv2,s48_usv1 -# NAGIOS_HOSTGROUPNAMES=usv -# NAGIOS_HOSTGROUPNAME=usv -# NAGIOS_HOSTLATENCY=0.400 -# NAGIOS_HOSTNAME=s06_usv1 -# NAGIOS_HOSTNOTIFICATIONID=0 -# NAGIOS_HOSTNOTIFICATIONNUMBER=0 -# NAGIOS_HOSTOUTPUT='OK - 192.168.1.50: rta 3,014ms, lost 0%' -# NAGIOS_HOSTPERCENTCHANGE=0.00 -# NAGIOS_HOSTPERFDATAFILE=/var/spool/nagios/pnp/host-perfdata -# NAGIOS_HOSTPERFDATA='rta=3,014ms;200,000;500,000;0; pl=0%;40;80;; rtmax=3,916ms;;;; rtmin=2,543ms;;;;' -# NAGIOS_HOSTPROBLEMID=0 -# NAGIOS_HOSTSTATEID=0 -# NAGIOS_HOSTSTATETYPE=HARD -# NAGIOS_HOSTSTATE=UP -# NAGIOS_LASTHOSTCHECK=1263919442 -# NAGIOS_LASTHOSTDOWN=0 -# NAGIOS_LASTHOSTEVENTID=0 -# NAGIOS_LASTHOSTPROBLEMID=0 -# NAGIOS_LASTHOSTSTATECHANGE=1263915110 -# NAGIOS_LASTHOSTSTATEID=0 -# NAGIOS_LASTHOSTSTATE=UP -# NAGIOS_LASTHOSTUNREACHABLE=0 -# NAGIOS_LASTHOSTUP=1263919443 -# NAGIOS_LASTSERVICECHECK=1263919456 -# NAGIOS_LASTSERVICECRITICAL=0 -# NAGIOS_LASTSERVICEEVENTID=0 -# NAGIOS_LASTSERVICEOK=1263919456 -# NAGIOS_LASTSERVICEPROBLEMID=0 -# NAGIOS_LASTSERVICESTATECHANGE=1263916696 -# NAGIOS_LASTSERVICESTATEID=0 -# NAGIOS_LASTSERVICESTATE=OK -# NAGIOS_LASTSERVICEUNKNOWN=0 -# NAGIOS_LASTSERVICEWARNING=0 -# NAGIOS_LOGFILE=/var/log/nagios/nagios.log -# NAGIOS_LONGDATETIME='Tue Jan 19 17:44:55 CET 2010' -# NAGIOS_MAINCONFIGFILE=/etc/nagios/nagios.cfg -# NAGIOS_MAXHOSTATTEMPTS=1 -# NAGIOS_MAXSERVICEATTEMPTS=1 -# NAGIOS_NOTIFICATIONAUTHOR=nagiosadmin -# NAGIOS_NOTIFICATIONCOMMENT=of -# NAGIOS_NOTIFICATIONNUMBER=0 -# NAGIOS_NOTIFICATIONRECIPIENTS=rz-emerg,check_mk -# NAGIOS_NOTIFICATIONTYPE=RECOVERY -# NAGIOS_OBJECTCACHEFILE=/var/cache/nagios/objects.cache -# NAGIOS_PROCESSSTARTTIME=1263919317 -# NAGIOS_RESOURCEFILE=/etc/nagios/resource.cfg -# NAGIOS_RETENTIONDATAFILE=/var/lib/nagios/retention.dat -# NAGIOS_SERVICEACTIONURL='/pnp4nagios/graph?host=s06_usv1&srv=Power+phase+1' -# NAGIOS_SERVICEATTEMPT=1 -# NAGIOS_SERVICECHECKCOMMAND=check_mk-apc_symmetra_power -# NAGIOS_SERVICECHECKTYPE=PASSIVE -# NAGIOS_SERVICEDESC='Power phase 1' -# NAGIOS_SERVICEDISPLAYNAME='Power phase 1' -# NAGIOS_SERVICEDOWNTIME=0 -# NAGIOS_SERVICEDURATION='0d 0h 46m 39s' -# NAGIOS_SERVICEDURATIONSEC=2799 -# NAGIOS_SERVICEEVENTID=0 -# NAGIOS_SERVICEEXECUTIONTIME=0.000 -# NAGIOS_SERVICEISVOLATILE=0 -# NAGIOS_SERVICELATENCY=0.636 -# NAGIOS_SERVICENOTIFICATIONID=9762 -# NAGIOS_SERVICENOTIFICATIONNUMBER=0 -# NAGIOS_SERVICEOUTPUT='OK - current power: 9940 W, warn/crit at and below 20/1 W' -# NAGIOS_SERVICEPERCENTCHANGE=0.00 -# NAGIOS_SERVICEPERFDATAFILE=/var/spool/nagios/pnp/service-perfdata -# NAGIOS_SERVICEPERFDATA='power=9940;20;1;0;' -# NAGIOS_SERVICEPROBLEMID=0 -# NAGIOS_SERVICESTATEID=0 -# NAGIOS_SERVICESTATE=OK -# NAGIOS_SERVICESTATETYPE=HARD -# NAGIOS_SHORTDATETIME='2010-01-19 17:44:55' -# NAGIOS_STATUSDATAFILE=/var/spool/nagios/status.dat -# NAGIOS_TEMPFILE=/var/spool/nagios/nagios.tmp -# NAGIOS_TEMPPATH=/var/spool/nagios/tmp -# NAGIOS_TIME=17:44:55 -# NAGIOS_TIMET=1263919495 -# NAGIOS_TOTALHOSTSERVICES=6 -# NAGIOS_TOTALHOSTSERVICESCRITICAL=0 -# NAGIOS_TOTALHOSTSERVICESOK=6 -# NAGIOS_TOTALHOSTSERVICESUNKNOWN=0 -# NAGIOS_TOTALHOSTSERVICESWARNING=0 - -cat <<EOF | mail -s "Nagios: $NAGIOS_HOSTNAME / $NAGIOS_SERVICEDESC" $NAGIOS_CONTACTEMAIL - - Hostname: $NAGIOS_HOSTNAME - Alias: $NAGIOS_HOSTALIAS - IP: $NAGIOS_HOSTADDRESS - Service: $NAGIOS_SERVICEDESC - - Hoststate: $NAGIOS_HOSTSTATE ($NAGIOS_HOSTOUTPUT) - Service: $NAGIOS_SERVICESTATE ($NAGIOS_SERVICEOUTPUT) - -EOF -

13 years

Check_MK Git: check_mk: Remove 'Agent version (unknown)' for SNMP-only hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 793effada7d03f1c492b9dec3dda058bb1eb6635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793effada7d03f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:54:59 2011 +0200 Remove 'Agent version (unknown)' for SNMP-only hosts --- .bugs/181 | 14 ++++++++++---- ChangeLog | 1 + modules/check_mk_base.py | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.bugs/181 b/.bugs/181 index ace4d98..2de5fac 100644 --- a/.bugs/181 +++ b/.bugs/181 @@ -1,9 +1,15 @@ Title: Check_MK Dienst zeigt "Agent version (unknown)" bei nur SNMP hosts Component: core +State: done +Class: cleanup +Date: 2011-03-17 11:55:38 Benefit: 1 -State: open Cost: 2 -Date: 2011-03-17 11:55:38 -Class: cleanup +Fun: 0 + +Das ist letztlich nur ein Schönheitsfehler. Man sollte den String bei reinen SNMP Checks +einfach komplett rausnehmen. Oder vielleicht die SNMP Version dort anzeigen - das (unknown) +ist eher verwirrend. -Das ist letztlich nur ein Schönheitsfehler. Man sollte den String bei reinen SNMP Checks einfach komplett rausnehmen. Oder vielleicht die SNMP Version dort anzeigen - das (unknown) ist eher verwirrend. +2011-08-22 15:54:42: changed state open -> done +Der Text wird jetzt einfach weggelassen, wenn es ein SNMP host ist. diff --git a/ChangeLog b/ChangeLog index b41bbda..1734417 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * Remove .f12 compile helper files from agents directory * Output missing sections in case of "WARNING - Only __ output of __..." * Remove obsolete code of snmp_info_single + * Remove 'Agent version (unknown)' for SNMP-only hosts Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8fd7fa7..44ce064 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -679,25 +679,27 @@ def do_check(hostname, ipaddress): num_errors = len(error_sections) save_counters(hostname) if problems: - output = "CRIT - %s" % problems + output = "CRIT - %s, " % problems status = 2 elif num_errors > 0 and num_success > 0: - output = "WARN - Missing agent sections: %s" % ", ".join(error_sections) + output = "WARN - Missing agent sections: %s - " % ", ".join(error_sections) status = 1 elif num_errors > 0: - output = "CRIT - Got no information from host" + output = "CRIT - Got no information from host, " status = 2 elif agent_min_version and agent_version < agent_min_version: - output = "WARN - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) + output = "WARN - old plugin version %s (should be at least %s), " % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent version %s" % agent_version + output = "OK - " + if agent_version != None: + output += "Agent version %s, " % agent_version status = 0 except MKGeneralException, e: if opt_debug: raise - output = "UNKNOWN - %s" % e + output = "UNKNOWN - %s, " % e status = 3 if aggregate_check_mk: @@ -708,7 +710,7 @@ def do_check(hostname, ipaddress): raise run_time = time.time() - start_time - output += ", execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) sys.stdout.write(output) sys.exit(status) @@ -809,7 +811,7 @@ def do_all_checks_on_host(hostname, ipaddress): version_info = get_host_info(hostname, ipaddress, 'check_mk') agent_version = version_info[0][1] else: - agent_version = "(unknown)" + agent_version = None except MKAgentError, e: g_broken_agent_hosts.add(hostname) agent_version = "(unknown)"

13 years

Check_MK Git: check_mk: Removed obsolete code of snmp_info_single

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56b3f060ece92f678837536d6c6ab44deba7da01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56b3f060ece92f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:46:03 2011 +0200 Removed obsolete code of snmp_info_single --- .bugs/110 | 13 ++++++++++--- ChangeLog | 1 + doc/helpers/validate_checks | 2 +- modules/check_mk.py | 6 +----- modules/check_mk_base.py | 14 -------------- modules/snmp.py | 42 ------------------------------------------ 6 files changed, 13 insertions(+), 65 deletions(-) diff --git a/.bugs/110 b/.bugs/110 index 5583786..4614bea 100644 --- a/.bugs/110 +++ b/.bugs/110 @@ -1,10 +1,17 @@ Title: Remove obsolete code of snmp_info_single Component: core +State: done +Class: cleanup +Date: 2011-01-27 09:39:10 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-27 09:39:10 -Class: cleanup +Fun: 0 Obsolete code formerly used by snmp_info_single should be removed from the code. + +Seems that no (shipped) check uses this anymore, so we can go +forward. The documentation does not mention this anyway. + +2011-08-22 15:44:37: changed state open -> done +Removed the code. diff --git a/ChangeLog b/ChangeLog index 6f0c22e..b41bbda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Show datasource program on cmk -D * Remove .f12 compile helper files from agents directory * Output missing sections in case of "WARNING - Only __ output of __..." + * Remove obsolete code of snmp_info_single Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 65b97d4..49fcc41 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -82,7 +82,7 @@ def get_all_checks(): return k def is_snmp_check(check): - return check in snmp_info or check in snmp_info_single + return check in snmp_info def all_nonfunction_vars(): return set([ name for name,value in globals().items() if name[0] != '_' and type(value) != type(lambda:0) ]) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d8d9f9..328a2d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -317,7 +317,6 @@ check_default_levels = {} # dictionary-configured checks declare t factory_settings = {} # factory settings for dictionary-configured checks check_config_variables = [] # variables (names) in checks/* needed for check itself snmp_info = {} # whichs OIDs to fetch for which check (for tabular information) -snmp_info_single = {} # similar, but for single SNMP variables (MIB-Name BASE-OID List-of-Suffixes) snmp_scan_functions = {} # SNMP autodetection @@ -612,7 +611,7 @@ def get_snmp_character_encoding(hostname): def check_uses_snmp(check_type): check_name = check_type.split(".")[0] - return snmp_info.has_key(check_name) or snmp_info_single.has_key(check_name) + return snmp_info.has_key(check_name) def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) @@ -2266,7 +2265,6 @@ no_inventory_possible = None "check_config_variables = []\n" + "check_default_levels = {}\n" + "snmp_info = {}\n" + - "snmp_info_single = {}\n" + "snmp_scan_functions = {}\n") for filename in filenames: @@ -2650,8 +2648,6 @@ def show_check_manual(checkname): agent = agent.strip() ags.append({ "vms" : "VMS", "linux":"Linux", "aix": "AIX", "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP"}.get(agent, agent.upper())) print_splitline(header_color_left, "Supported Agents: ", header_color_right, ", ".join(ags)) - if checkname in snmp_info_single: - print_splitline(header_color_left, "Required MIB: ", header_color_right, snmp_info_single[checkname][0]) empty_line() print_textbody(header['description']) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 23f7dbe..8fd7fa7 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -329,20 +329,6 @@ def get_realhost_info(hostname, ipaddress, checkname, max_cache_age): write_cache_file(cache_relpath, repr(table) + "\n") return table - # now try SNMP explicity values - try: - mib, baseoid, suffixes = snmp_info_single[checkname] - except: - baseoid = None - if baseoid: - content = read_cache_file(cache_relpath, max_cache_age) - if content: - return eval(content) - table = get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes) - store_cached_checkinfo(hostname, checkname, table) - write_cache_file(cache_relpath, repr(table) + "\n") - return table - # No SNMP check. Then we must contact the check_mk_agent. Have we already # to get data from the agent? If yes we must not do that again! Even if # no cache file is present diff --git a/modules/snmp.py b/modules/snmp.py index 4d5450e..211a164 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -70,48 +70,6 @@ def convert_from_hex(value): def oid_to_bin(oid): return u"".join([ unichr(int(p)) for p in oid.strip(".").split(".") ]) -# Fetch single values via SNMP. This function is only used by snmp_info_single, -# which is only rarely used. Most checks use snmp_info, which is handled by -# get_snmp_table. -def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): - if opt_debug: - sys.stderr.write('Fetching misc values from OID %s%s%s%s from IP %s\n' % \ - (tty_bold, tty_green, baseoid, tty_normal, ipaddress)) - - info = [] - cmd = snmp_walk_command(hostname) - for suffix in suffixes: - if mib: - mibinfo = " -m %s" % mib - else: - mibinfo = "" - portspec = snmp_port_spec(hostname) - command = cmd + "%s -OQ -OU -Oe %s%s %s.%s 2>/dev/null" % \ - (mibinfo, ipaddress, portspec, baseoid, suffix) - if opt_debug: - sys.stderr.write(' Running %s\n' % (command,)) - num_found = 0 - snmp_process = os.popen(command, "r") - for line in snmp_process.readlines(): - if not '=' in line: # TODO: join onto previous line - continue - item, value = line.split("=") - value_text = strip_snmp_value(value) - # try to remove text, only keep number - value_num = value_text.split(" ")[0] - value_num = value_num.lstrip("+") - value_num = value_num.rstrip("%") - item = strip_snmp_value(item.split(":")[-1]) - if item.endswith(".0"): - item = item[:-2] - info.append( [ item, value_num, value_text ] ) - num_found += 1 - exitstatus = snmp_process.close() - if exitstatus: - if opt_verbose: - sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error on %s" % ipaddress) - return info def snmpwalk_on_suboid(hostname, ip, oid): portspec = snmp_port_spec(hostname)

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70744a4db6f3db9be853ce871f31ee806a58f0fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70744a4db6f3db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:45:51 2011 +0200 Updated bug entries --- .bugs/102 | 10 +++++++--- .bugs/135 | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/102 b/.bugs/102 index dce6241..b3831c2 100644 --- a/.bugs/102 +++ b/.bugs/102 @@ -1,12 +1,16 @@ Title: SNMP scan gets OID twice Component: core +State: done +Class: nastiness +Date: 2011-01-24 15:07:41 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-24 15:07:41 -Class: nastiness +Fun: 0 In some scan functions 1.3.6.1.2.1.1.1.0 is used, in other ones .1.3.6.1.2.1.1.1.0. Therefore the OID is fetched twice. Either fix all checks or automatically normalize OIDs to always or never begin with a dot. + +2011-08-22 15:14:01: changed state open -> done +All checks are now normalized to using .1.3.6.1 (with dot) diff --git a/.bugs/135 b/.bugs/135 index be65c0a..7138ada 100644 --- a/.bugs/135 +++ b/.bugs/135 @@ -7,4 +7,10 @@ Date: 2011-02-15 10:02:09 Class: cleanup When calling check_mk --help the config check should -be skipped. +be skipped. Same holds for --version (and maybe others +like --packager). + +We also could restrict the config check positively +to -C, -U, -R, -O (all code that actually influences +the productive Nagios daemon). +

13 years

Check_MK Git: check_mk: Perf-O-Meter: strip arguments from command (after ! )

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c92a80bef4f7acb894fca554dc651a3a36d1882c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c92a80bef4f7ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:08:50 2011 +0200 Perf-O-Meter: strip arguments from command (after !) --- .bugs/263 | 10 +++++++--- ChangeLog | 2 ++ web/plugins/views/perfometer.py | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.bugs/263 b/.bugs/263 index a5c76f2..626605b 100644 --- a/.bugs/263 +++ b/.bugs/263 @@ -1,13 +1,17 @@ Title: Perf-O-Meter should not honor command arguments Component: multisite +State: done +Class: cleanup +Date: 2011-05-04 12:41:53 Benefit: 1 -State: open Cost: 1 -Date: 2011-05-04 12:41:53 -Class: cleanup +Fun: 0 When creating perfometers for custom commands (such as legacy checks) it would be better, if the Perf-O-Meter would not honor the complete check command but drop everything after the first !. check_http!www.hirni.de!123 should display the Perf-O-Meter of check_http, without the !... + +2011-08-22 15:08:11: changed state open -> done +Done. We strip everything after ! diff --git a/ChangeLog b/ChangeLog index e2db174..6f0c22e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy * nicer output of substates, translate (!) and (!!) into HTML code * new command for clearing modified attributes (red cross, green checkmark) + * Perf-O-Meters: strip away arguments from check_command (e.g. + "check-foo!17!31" -> "check-foo"). WATO: * Show error message in case of empty inventory due to agent error diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9506e77..126512b 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -115,6 +115,9 @@ def paint_perfometer(row): else: check_command = row["service_check_command"] + # Strip away arguments like in "check_http!-H mathias-kettner.de" + check_command = check_command.split("!")[0] + # Find matching perf-o-meter function perf_painter = perfometers.get(check_command) if not perf_painter:

13 years

Check_MK Git: check_mk: text_area: show error, add default value, content quoting

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 316532c7870d19ecf4434555242b3e743abbff05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=316532c7870d19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 14:57:09 2011 +0200 text_area: show error, add default value, content quoting --- .bugs/15 | 17 ++++++++++++++--- .bugs/261 | 8 ++++++++ .bugs/313 | 10 +++++++--- .bugs/46 | 13 +++++++++++++ .bugs/97 | 11 ++++++++++- web/htdocs/check_mk.css | 2 +- web/htdocs/htmllib.py | 20 +++++++++++++++----- web/htdocs/views.py | 8 +++++--- 8 files changed, 73 insertions(+), 16 deletions(-) diff --git a/.bugs/15 b/.bugs/15 index 9117096..30e9aa5 100644 --- a/.bugs/15 +++ b/.bugs/15 @@ -1,13 +1,24 @@ Title: Counter-Wrap: bei service aggregation fehlen Checks Component: core +State: wontfix +Class: nastiness +Date: 2010-12-21 12:14:07 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 12:14:07 -Class: nastiness +Fun: 0 Wenn ein Counter Wrap passiert und der check selbst die Exception nicht abfängt, dann wird das Ergebnis nicht an Nagios weitergeleitet. Der Service wird auch nicht in die aggregierten Services eines Summary Hosts aufgenommen. Das kann dazu führen, dass die Anzahl der Services in einem Summary-Host variabel ist. + +Das Problem ist, dass das Problem nur schwer zu lösen ist. Man müsste ja +den aktuellen Status der fehlenden Checks per Livestatus ermitteln, was +natürlich ein viel zu großer Häck wäre, der nicht in Frage kommt. + +Daher: wir lassen das Problem bestehen. Die Service Aggregation ist +ohnehin ein Auslaufmodell, dass mit zunehmend stabilem BI überflüssig +ist und früher oder später rausfliegt. + +2011-08-22 14:20:05: changed state open -> wontfix diff --git a/.bugs/261 b/.bugs/261 index 21fb7e5..9482830 100644 --- a/.bugs/261 +++ b/.bugs/261 @@ -11,3 +11,11 @@ uses a different scheme for the service description. Make all checks use "Temperature %s". Also use a common PNP-template that handles a missing WARN/CRIT. Maybe use a common code base, if this makes sense. + +We also need a tool for renaming service descriptions later on +without loosing history data. That way we have a migration +path - at least for OMD. This includes: + +- Events in Nagios log files +- RRDs +- ??? diff --git a/.bugs/313 b/.bugs/313 index 55b9918..b60d155 100644 --- a/.bugs/313 +++ b/.bugs/313 @@ -1,12 +1,16 @@ Title: htmllib: text_area does not have default value Component: multisite +State: done +Class: nastiness +Date: 2011-07-22 10:48:50 Benefit: 1 -State: open Cost: 1 -Date: 2011-07-22 10:48:50 -Class: nastiness +Fun: 0 The function htmllib.text_area should accept a default value, just as all other input elements. Furthermore the quoting for > and < is missing. And yet furthermore the complain about a bad user input is not visualized. + +2011-08-22 14:56:49: changed state open -> done +All three topics fixed. diff --git a/.bugs/46 b/.bugs/46 index 49cd147..838b7f2 100644 --- a/.bugs/46 +++ b/.bugs/46 @@ -19,3 +19,16 @@ Visualisierung machen. Kernel (Context switches) und diskstat ist bereits umgestellt. Unklar, was noch fehlt. Aktuell fällt mir z.B. die Linux-NICS ein. Winperf auch? + +winperf --> Macht nix: wird durch winperf_* ersetzt +diskstat.include --> Macht nix: nur noch für den legacy modus +fc_brocade_port --> Macht nix: wird durch brocade_fcport ersetzt +fc_brocade_port_detailed --> Macht nix: wird durch brocade_fcport ersetzt +netctr --> Macht nix: wird durch lnx_if abgelöst +vms_netif --> Macht nix: verwendet eh kaum jemand + +Bleiben drei Checks: + +aironet_errors +statgrab_disk +statgrab_net diff --git a/.bugs/97 b/.bugs/97 index f2cedac..572e8a1 100644 --- a/.bugs/97 +++ b/.bugs/97 @@ -2,10 +2,19 @@ Title: Restart nagios on OMD - use OMD method Component: core Benefit: 1 State: open -Cost: 1 +Cost: 2 Date: 2011-01-22 13:53:40 Class: cleanup When doing a restart of Nagios or a config check while running under OMD, then better not call the start scripts directly, but use omd to do this 'omd restart nagios'. + +Solution: if we detect OMD then do not use the value from defaults, +but directly call 'omd re{start,load} core'. + +Problem is: I've just fixed a problem in OMD (2011-08-22), that +makes 'omd restart core' work in the first place. + +--> better wait a time until all Check_MK users surely use + OMD versions that have that fix. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 372faae..7ba718b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -970,7 +970,7 @@ table.boxlayout td.boxcolumn { } -.inputerror input { +.inputerror input, .inputerror textarea { background-color: #f84; } diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2b12878..4183ae6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -63,8 +63,8 @@ class uriinfo: if i[0] not in omit ]) -# Encode HTML attributes: replace " with " This code -# is slow. +# Encode HTML attributes: replace " with ", also replace +# < and >. This code is slow. def attrencode(value): if type(value) == int: return str(value) @@ -72,6 +72,10 @@ def attrencode(value): for c in value: if c == '"': new += """ + elif c == '<': + new += "<" + elif c == '>': + new += ">" else: new += c return new @@ -337,9 +341,15 @@ class html: self.write(html) self.form_vars.append(varname) - def text_area(self, varname, rows): - value = self.req.vars.get(varname, "") - self.write("<textarea name=\"%s\">%s</textarea>\n" % (varname, value)) + def text_area(self, varname, deflt="", rows=8): + value = self.req.vars.get(varname, deflt) + error = self.user_errors.get(varname) + if error: + self.write("<x class=inputerror>") + self.write("<textarea name=\"%s\">%s</textarea>\n" % (varname, attrencode(value))) + if error: + self.write("</x>") + self.set_focus(varname) self.form_vars.append(varname) def sorted_select(self, varname, options, deflt="", onchange=None): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4f11b50..74be45a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -384,7 +384,9 @@ def page_edit_views(msg=None): view = html.multisite_views[(owner, viewname)] if owner == html.req.user or (view["public"] and (owner == "" or config.user_may(owner, "publish_views"))): if first: - html.write("<tr><th>Name</th><th>Title / Description</th><th>Owner</th><th>Public</th><th>linked</th><th>Datasource</th><th></th></tr>\n") + html.write("<tr><th>Name</th><th>Title / Description</th>" + "<th>Owner</th><th>Public</th><th>linked</th>" + "<th>Datasource</th><th></th></tr>\n") first = False html.write("<tr><td class=legend>%s</td>" % viewname) html.write("<td class=content>") @@ -394,7 +396,7 @@ def page_edit_views(msg=None): html.write(view["title"]) description = view.get("description") if description: - html.write("<br><div class=viewdescription>%s</div>" % description) + html.write("<br><div class=viewdescription>%s</div>" % htmllib.attrencode(description)) html.write("</td>") if owner == "": ownertxt = "<i>builtin</i>" @@ -534,7 +536,7 @@ def page_edit_view(): html.write("</td></tr>\n") html.write("<tr><td class=legend>" + _("Description") + "</td><td class=content>") - html.text_area("view_description", 4) + html.text_area("view_description", "", 4) html.write("</td></tr>\n") # Larger sections are foldable and closed by default

13 years

Check_MK Git: check_mk: Output missing sections in case of " WARNING - Only __ output of"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2640aa0f1b0d5183fcfb468d41e5b5a80dc9c730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2640aa0f1b0d51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 13:45:42 2011 +0200 Output missing sections in case of "WARNING - Only __ output of" --- .bugs/314 | 10 +++++++--- ChangeLog | 1 + modules/check_mk_base.py | 20 ++++++++++++-------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.bugs/314 b/.bugs/314 index 970a8c6..de48a6c 100644 --- a/.bugs/314 +++ b/.bugs/314 @@ -1,10 +1,14 @@ Title: WARNING - Got only 15 out of 18 infos: which? Component: core +State: done +Class: nastiness +Date: 2011-07-22 10:49:16 Benefit: 1 -State: open Cost: 2 -Date: 2011-07-22 10:49:16 -Class: nastiness +Fun: 0 When this error occurs, we should output the list of missing agent sections (i.e. *which* information is missing). + +2011-08-22 13:45:06: changed state open -> done +Missing section names are now output. diff --git a/ChangeLog b/ChangeLog index c6dd74a..e2db174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ style FUNC(checkname, info) is still supported but deprecated. * Show datasource program on cmk -D * Remove .f12 compile helper files from agents directory + * Output missing sections in case of "WARNING - Only __ output of __..." Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a6b2009..23f7dbe 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -689,19 +689,20 @@ def do_check(hostname, ipaddress): try: load_counters(hostname) - agent_version, num_success, num_errors, problems = do_all_checks_on_host(hostname, ipaddress) + agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress) + num_errors = len(error_sections) save_counters(hostname) if problems: output = "CRIT - %s" % problems status = 2 elif num_errors > 0 and num_success > 0: - output = "WARNING - Got only %d out of %d infos" % (num_success, num_success + num_errors) + output = "WARN - Missing agent sections: %s" % ", ".join(error_sections) status = 1 elif num_errors > 0: output = "CRIT - Got no information from host" status = 2 elif agent_min_version and agent_version < agent_min_version: - output = "WARNING - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) + output = "WARN - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) status = 1 else: output = "OK - Agent version %s" % agent_version @@ -736,7 +737,7 @@ def do_all_checks_on_host(hostname, ipaddress): global g_hostname g_hostname = hostname num_success = 0 - num_errors = 0 + error_sections = set([]) check_table = get_sorted_check_table(hostname) problems = [] @@ -754,14 +755,14 @@ def do_all_checks_on_host(hostname, ipaddress): except MKSNMPError, e: if str(e): problems.append(str(e)) - num_errors += 1 + error_sections.add(infotype) g_broken_snmp_hosts.add(hostname) continue except MKAgentError, e: if str(e): problems.append(str(e)) - num_errors += 1 + error_sections.add(infotype) g_broken_agent_hosts.add(hostname) continue @@ -811,7 +812,7 @@ def do_all_checks_on_host(hostname, ipaddress): if not dont_submit: submit_check_result(hostname, description, result, aggrname) else: - num_errors += 1 + error_sections.add(infotype) submit_aggregated_results(hostname) if checkresult_file_fd != None: @@ -828,7 +829,10 @@ def do_all_checks_on_host(hostname, ipaddress): agent_version = "(unknown)" except: agent_version = "(unknown)" - return agent_version, num_success, num_errors, ", ".join(problems) + error_sections = list(error_sections) + error_sections.sort() + return agent_version, num_success, error_sections, ", ".join(problems) + def open_checkresult_file():

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits