Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: Improved compile heler file .f12

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e96d24f46b8440e8bba2e7582d499eaf74d11739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e96d24f46b8440… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 15:34:01 2011 +0200 Improved compile heler file .f12 --- web/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/.f12 b/web/.f12 index e328943..49517ea 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,5 +1,5 @@ #!/bin/bash -SITE=${SITE:-dk} +SITE=${SITE:-$(omd sites --bare | head -n 1)} C=$(sudo cp -rv * /omd/versions/default/share/check_mk/web/ | wc -l) echo "$C files copied" sudo omd restart $SITE apache

12 years, 10 months

Check_MK Git: check_mk: View editor: warn if no column has been added

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04b537e9d01d3540dd8e831e82c1ac840a7e9366 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04b537e9d01d35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 15:34:25 2011 +0200 View editor: warn if no column has been added --- .bugs/49 | 10 +++++++--- web/htdocs/views.py | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bugs/49 b/.bugs/49 index ab4e084..3f75c85 100644 --- a/.bugs/49 +++ b/.bugs/49 @@ -1,11 +1,15 @@ Title: View editor: Warnung, wenn keine Spalten ausgewählt Component: multisite +State: done +Class: nastiness +Date: 2010-12-21 21:31:11 Benefit: 1 -State: open Cost: 1 -Date: 2010-12-21 21:31:11 -Class: nastiness +Fun: 0 Wenn der Benutzer keine einzige Spalte ausgewält hat, darf er die View nicht speichern können. Es gab schon User, die sich gewundert haben, dass sie nix sehen. + +2011-08-23 15:33:19: changed state open -> done +Jetzt gibts eine Fehlermeldung, wenn man keine Spalte hat. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 74be45a..1c4f392 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -496,7 +496,7 @@ def page_edit_view(): if oldname and oldname != view["name"] and (html.req.user, oldname) in html.multisite_views: del html.multisite_views[(html.req.user, oldname)] save_views(html.req.user) - return page_message_and_forward("Your view has been saved.", "edit_views.py", + return page_message_and_forward(_("Your view has been saved."), "edit_views.py", "<script type='text/javascript'>top.frames[0].location.reload();</script>\n") except MKUserError, e: @@ -965,6 +965,9 @@ def create_view(): else: painternames.append((pname, viewname, tooltip)) + if len(painternames) == 0: + raise MKUserError("col_1", _("Please add at least one column to your view.")) + return { "name" : name, "owner" : html.req.user,

12 years, 10 months

Check_MK Git: check_mk: Renamed all temperature services to Termperature %s

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3811511ba880ccf0b2bb3c7e4726f8c949444f55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3811511ba880cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 12:24:17 2011 +0200 Renamed all temperature services to Termperature %s Please carefully read the migration notes! --- .bugs/261 | 11 ++++++++--- ChangeLog | 2 ++ checks/akcp_sensor_temp | 2 +- checks/apc_symmetra_ext_temp | 2 +- checks/apc_symmetra_temp | 2 +- checks/decru_temps | 5 +++-- checks/f5_bigip_temp | 4 +--- checks/fsc_temp | 2 +- checks/hp_proliant_temp | 2 +- checks/nvidia | 2 +- checks/smart | 2 +- 11 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.bugs/261 b/.bugs/261 index 28f9bb1..c98bab6 100644 --- a/.bugs/261 +++ b/.bugs/261 @@ -1,10 +1,11 @@ Title: unifiy all temperature checks Component: checks +State: done +Class: cleanup +Date: 2011-04-20 10:48:22 Benefit: 2 -State: open Cost: 2 -Date: 2011-04-20 10:48:22 -Class: cleanup +Fun: 0 There are already a lot of temperature checks. *Each* of them uses a different scheme for the service description. Make @@ -35,3 +36,7 @@ service_descriptions.update({ That way people can decide what to do and new users get a clean environment. + +2011-08-23 12:23:53: changed state open -> done +All checks have been renamed (except the generic sensor checks). +Migration notes have been created. diff --git a/ChangeLog b/ChangeLog index e19caca..d7046cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,8 @@ "Resttonerbehälter". You need to define snmp_character_encodings in main.mk * mem.win: new dedicated memory check for Windows (see Migration notes) * hr_mem: added Perf-O-Meter + * Renamed all temperature checks to "Temperature %s". Please + read the migration notes! MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index 0fdfa7c..3660f93 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -73,7 +73,7 @@ def check_akcp_sensor_temp(item, params, info): return (3, "UNKNOWN - Sensor not found") -check_info['akcp_sensor_temp'] = ( check_akcp_sensor_temp, "Temperature Sensor - %s", 1, inventory_akcp_sensor_temp) +check_info['akcp_sensor_temp'] = ( check_akcp_sensor_temp, "Temperature %s", 1, inventory_akcp_sensor_temp) snmp_info['akcp_sensor_temp'] = ( ".1.3.6.1.4.1.3854.1.2.2.1.16.1", [ diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp index 39e1ef6..0c86631 100644 --- a/checks/apc_symmetra_ext_temp +++ b/checks/apc_symmetra_ext_temp @@ -47,7 +47,7 @@ def check_temp(item, params, info): -check_info['apc_symmetra_ext_temp'] = (check_temp, "APC External Temp %s", 1, inventory_temp) +check_info['apc_symmetra_ext_temp'] = (check_temp, "Temperature External %s", 1, inventory_temp) snmp_info['apc_symmetra_ext_temp'] = ( ".1.3.6.1.4.1.318.1.1.10.2.3.2.1", [ 1, 3, 4 ] ) diff --git a/checks/apc_symmetra_temp b/checks/apc_symmetra_temp index 5365ec0..c56e3ac 100644 --- a/checks/apc_symmetra_temp +++ b/checks/apc_symmetra_temp @@ -67,6 +67,6 @@ def check_apc_temp(item, params, info): return (3, "UNKNOWN - sensor not found in SNMP data") -check_info['apc_symmetra_temp'] = ( check_apc_temp, "%s", 1, inventory_apc_temp ) +check_info['apc_symmetra_temp'] = ( check_apc_temp, "Temperature %s", 1, inventory_apc_temp ) snmp_info['apc_symmetra_temp'] = ( ".1.3.6.1.4.1.318.1.1.10.4.2.3.1", [ "3", "5" ] ) snmp_scan_functions['apc_symmetra_temp'] = lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3") diff --git a/checks/decru_temps b/checks/decru_temps index ef81bf5..9b1a7d1 100644 --- a/checks/decru_temps +++ b/checks/decru_temps @@ -25,7 +25,8 @@ # Boston, MA 02110-1301 USA. def inventory_decru_temps(info): - return [ (l[0], (int(to_celsius(int(l[1]))) + 4.0, int(to_celsius(int(l[1]))) + 8.0 ) ) for l in info ] + return [ (l[0], (int(to_celsius(int(l[1]))) + 4.0, + int(to_celsius(int(l[1]))) + 8.0 ) ) for l in info ] def check_decru_temps(item, params, info): for temp in info: @@ -43,7 +44,7 @@ def check_decru_temps(item, params, info): return (3, "UNKNOWN - sensor not found") -check_info['decru_temps'] = (check_decru_temps, "TEMP %s", 1, inventory_decru_temps) +check_info['decru_temps'] = (check_decru_temps, "Temperature %s", 1, inventory_decru_temps) snmp_info['decru_temps'] = ( ".1.3.6.1.4.1.12962.1.2.4.1", [ 2, 3 ] ) snmp_scan_functions['decru_temps'] = \ diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index c2ab53b..50b4c68 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -36,8 +36,6 @@ # 1.3.6.1.4.1.3375.2.1.3.1.2.1.2.1 54 - - def f5_bigip_temp_genitem(info): sensors = [] # parse all detected sensors and name them according to the mib section they came from. @@ -91,7 +89,7 @@ snmp_info["f5_bigip_temp"] = \ ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] -check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 0, inventory_f5_bigip_temp ) +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "Temperature %s", 0, inventory_f5_bigip_temp ) # Get ID and Speed from the CPU and chassis fan tables diff --git a/checks/fsc_temp b/checks/fsc_temp index 81fc622..bbcebc7 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -46,5 +46,5 @@ def check_fsc_temp(item, no_params, info): return (3, "UNKNOWN - Sensor %s not found in SNMP data" % item) -check_info['fsc_temp'] = (check_fsc_temp, "FSC TEMP %s", 1, inventory_fsc_temp) +check_info['fsc_temp'] = (check_fsc_temp, "Temperature %s", 1, inventory_fsc_temp) snmp_info['fsc_temp'] = ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ) diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index a037701..8a30dcb 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -66,7 +66,7 @@ def check_hp_proliant_temp(item, params, info): return (3, "UNKNOWN - item not found in snmp data") -check_info['hp_proliant_temp'] = (check_hp_proliant_temp, "HW Temp%s", 1, inventory_hp_proliant_temp) +check_info['hp_proliant_temp'] = (check_hp_proliant_temp, "Temperature %s", 1, inventory_hp_proliant_temp) snmp_info['hp_proliant_temp'] = ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ "1", # cpqHeTemperatureChassis "2", # cpqHeTemperatureIndex "3", # cpqHeTemperatureLocale diff --git a/checks/nvidia b/checks/nvidia index c15da85..5b252ed 100644 --- a/checks/nvidia +++ b/checks/nvidia @@ -49,7 +49,7 @@ def check_nvidia_temp(item, params, info): return (0, "OK" + infotext, perfdata) return (3, 'UNKNOWN - sensor not found in agent output') -check_info['nvidia.temp'] = ( check_nvidia_temp, "NVIDIA Temperature %s", 1, inventory_nvidia_temp ) +check_info['nvidia.temp'] = ( check_nvidia_temp, "Temperature NVIDIA %s", 1, inventory_nvidia_temp ) diff --git a/checks/smart b/checks/smart index bde2d6e..5c2a73a 100644 --- a/checks/smart +++ b/checks/smart @@ -138,4 +138,4 @@ def check_smart_temp(item, params, info): check_info['smart.stats'] = (check_smart_stats, "SMART %s Stats", 1, lambda info: inventory_smart("smart.stats", info)) -check_info['smart.temp'] = (check_smart_temp, "SMART %s Temperature", 1, lambda info: inventory_smart("smart.temp", info)) +check_info['smart.temp'] = (check_smart_temp, "Temperature SMART %s", 1, lambda info: inventory_smart("smart.temp", info))

12 years, 10 months

Check_MK Git: check_mk: Do not load config an several options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd8d1e1ea67a14321e88cc3ee4ad4d61bfe762c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd8d1e1ea67a14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 11:58:41 2011 +0200 Do not load config an several options such as --help and --version. --- .bugs/135 | 10 ++- ChangeLog | 2 + modules/check_mk.py | 233 ++++++++++++++++++++++++++------------------------ 3 files changed, 130 insertions(+), 115 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fd8d1e1ea6…

12 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81b6f7ee803312e79176f6b76609a062a4ea8ccf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b6f7ee803312… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 00:05:29 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97c583a3c81e63bb72cc68687489db479476e039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c583a3c81e63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 23 00:05:26 2011 +0200 Updated bug entries --- .bugs/112 | 7 ++++--- .bugs/183 | 13 ++++++++++--- .bugs/208 | 5 +++++ .bugs/28 | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.bugs/112 b/.bugs/112 index dc0ba39..ca50fe4 100644 --- a/.bugs/112 +++ b/.bugs/112 @@ -1,10 +1,11 @@ Title: PNP-Links in Perf-O-Meter should be intelligent Component: multisite -Benefit: 1 State: open -Cost: 1 -Date: 2011-01-28 09:34:33 Class: cleanup +Date: 2011-01-28 09:34:33 +Benefit: 1 +Cost: 1 +Fun: 0 If there is no PNP database the perfometer should not contain a hlink to PNP. We can use the same logic as in the intelligent PNP icon. diff --git a/.bugs/183 b/.bugs/183 index 6647e82..eed8e9a 100644 --- a/.bugs/183 +++ b/.bugs/183 @@ -1,10 +1,10 @@ -Title: bluecoat_sensors pnp links/hover menus are broken +Title: Services with + in their names break PNP links Component: multisite Benefit: 2 -State: open +State: wontfix Cost: 3 Date: 2011-03-22 15:25:58 -Class: cleanup +Class: bug The bluecoat sensors check creates checks with plus signs in the name, eg +12V bus voltage. This seems to break the links/hovers to pnp. This might also be a problem in pnp. @@ -12,3 +12,10 @@ This seems to break the links/hovers to pnp. This might also be a problem in pnp The rrd files are named '+12V_bus_voltage.rrd'. Need to be analyzed. + +2011-08-22 16:44:03: changed state open -> wontfix +This seems to be a bug in PNP. Even in the PNP native +GUI services with a + in the name do not work. I've +contacted Jörg Linge... +~ + diff --git a/.bugs/208 b/.bugs/208 index 6b31dae..21a3a46 100644 --- a/.bugs/208 +++ b/.bugs/208 @@ -8,3 +8,8 @@ Class: cleanup The article about filesystems should contain all information about trends. Also hints to the various filesystem checks. + +Read also bug #208. And please check out, why the Demoserver +show so nasty steps in the trend graphs... +~ + diff --git a/.bugs/28 b/.bugs/28 index 2049666..b783d48 100644 --- a/.bugs/28 +++ b/.bugs/28 @@ -4,7 +4,7 @@ Benefit: 2 State: open Cost: 4 Date: 2010-12-21 16:41:20 -Class: feature +Class: nastiness Dazu müsste man aber erstmal rausfinden, wie man bei Windows dies anstellt. Es hängt ja von der Landeseinstellung ab. Vielleicht

12 years, 10 months

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 ---

12 years, 10 months

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…

12 years, 10 months

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

12 years, 10 months

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 -

12 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011