Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Fixed little typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 421256a73f215ae9e0988ad6f1d494a82f9055d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=421256a73f215a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 8 16:10:33 2013 +0200 Fixed little typo --- agents/special/agent_fritz | 9 ++++++++- doc/skeleton_check | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_fritz b/agents/special/agent_fritz index 140524b..8160b42 100755 --- a/agents/special/agent_fritz +++ b/agents/special/agent_fritz @@ -13,7 +13,14 @@ sid = login_page.findtext('SID') block = login_page.findtext('BlockTime') if sid == "0000000000000000": challenge = login_page.findtext('Challenge') - response = challenge + '-' + hashlib.md5(challenge + '-' + password ).hexdigest() + challenge = "123456z" + password = ".abc" + rep = challenge + '-' + password + rep = rep.encode('utf-16le') + print rep + response = challenge + '-' + hashlib.md5(rep).hexdigest() + + print response login_page = etree.parse(url+"?username=%s&response=%s" % (username, response)).getroot() print url+"?username=%s&response=%s" % (username, response) diff --git a/doc/skeleton_check b/doc/skeleton_check index 53b76c7..d539282 100644 --- a/doc/skeleton_check +++ b/doc/skeleton_check @@ -32,7 +32,7 @@ def inventory_foobar(info): return [] def check_foobar(item, _no_params, info): - return 3, "UNKNOWN - Check no implemented" + return 3, "UNKNOWN - Check not implemented" check_info["foobar"] = { "check_function" : check_foobar,

10 years, 11 months

Check_MK Git: check_mk: Repair folging in vim, added #. to comments

by Mathias Kettner

Module: check_mk Branch: master Commit: d8b13a8f82e84e8f3dd2371d3d4e269be0d64409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8b13a8f82e84e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 8 15:34:18 2013 +0200 Repair folging in vim, added #. to comments --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c64d8e1..daed091 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5417,6 +5417,7 @@ def render_main_menu(some_modules, columns = 2): html.write("</div>") +#. # .--LDAP Config---------------------------------------------------------. # | _ ____ _ ____ ____ __ _ | # | | | | _ \ / \ | _ \ / ___|___ _ __ / _(_) __ _ | @@ -13100,6 +13101,7 @@ def mode_bi_edit_rule(phase): html.set_focus("rule_p_title") html.end_form() +#. # .--Custom-Attrs.-------------------------------------------------------. # | ____ _ _ _ _ | # | / ___| _ ___| |_ ___ _ __ ___ / \ | |_| |_ _ __ ___ |

10 years, 11 months

Check_MK Git: check_mk: FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds

by Mathias Kettner

Module: check_mk Branch: master Commit: 47e86381768c79f382ce3f89c7d82cf123a1bef0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47e86381768c79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 23:29:46 2013 +0200 FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 451d601..8f9a4e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ (typo in tag) * FIX: netapp_volumes: better output when volume is missing * FIX: winperf_phydisk: handle case where not performance counters are available + * FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e76e27c..cfdce00 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -459,7 +459,7 @@ then do if [ -S "/omd/sites/$site/tmp/run/live" ] ; then echo "[$site]" - echo -e "GET status" | /omd/sites/$site/bin/unixcat /omd/sites/$site/tmp/run/live + echo -e "GET status" | waitmax 3 /omd/sites/$site/bin/unixcat /omd/sites/$site/tmp/run/live fi done fi

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0979

by Mathias Kettner

Module: check_mk Branch: master Commit: 80ab9a27dd5d67e361834a572e62c512bde50cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80ab9a27dd5d67… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 21:46:39 2013 +0200 Updated bug entries #0979 --- .bugs/979 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/979 b/.bugs/979 new file mode 100644 index 0000000..269f6f0 --- /dev/null +++ b/.bugs/979 @@ -0,0 +1,13 @@ +Title: winperf_phydisk: better handle counter wraps +Component: checks +State: open +Date: 2013-10-07 21:44:26 +Targetversion: 1.2.3i3 +Class: nastiness + +If you reboot a server then the diskstat.include based checks +need many cycles before the produce output again. This shows +up with the new staleness feature. + +Resolution: handle CounterWrapped exceptions and make sure, that +all counters are handled, even if one exception occurs.

10 years, 11 months

Check_MK Git: check_mk: winperf_phydisk: fail if no disk is found

by Mathias Kettner

Module: check_mk Branch: master Commit: a06d558b61c6365233cc494baf251d3606fe64ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a06d558b61c636… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 21:05:17 2013 +0200 winperf_phydisk: fail if no disk is found --- checks/diskstat.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/diskstat.include b/checks/diskstat.include index ac50687..5f68c3b 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -205,6 +205,8 @@ def check_diskstat_generic(item, params, this_time, info): # summary mode if item == 'SUMMARY': # summary mode (only summarize physical disks!) summary_line = [0] * 13 + if len(info) == 0: + return 3, "No performance information about any disk found" for line in info: devname = line[0] if ' ' in devname:

10 years, 11 months

Check_MK Git: check_mk: FIX: winperf_phydisk: handle case where not performance counters are available

by Mathias Kettner

Module: check_mk Branch: master Commit: ecc455835e9f41e480c6017e424af22770d151a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc455835e9f41… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 20:36:57 2013 +0200 FIX: winperf_phydisk: handle case where not performance counters are available --- ChangeLog | 1 + checks/winperf_phydisk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 404710a..451d601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * FIX: host notification email in html format: fixed formating error (typo in tag) * FIX: netapp_volumes: better output when volume is missing + * FIX: winperf_phydisk: handle case where not performance counters are available Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 7703041..7881971 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -63,6 +63,10 @@ check_includes['winperf_phydisk'] = [ "diskstat.include" ] def winperf_phydisk_convert(info): + # In case disk performance counters are not enabled, the agent sends + # an almost empty section, where the second line is missing completely + if len(info) == 1: + return [] disks = [ d.split('_')[-1] for d in info[1][2:-1] ] for line in info[2:]: if line[0] == '-14':

10 years, 11 months

Check_MK Git: check_mk: FIX: netapp_volumes: better output when volume is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 2438c7987adffd3dd461b612ad528310af7305aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2438c7987adffd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 20:25:33 2013 +0200 FIX: netapp_volumes: better output when volume is missing --- ChangeLog | 7 ++++--- checks/netapp_volumes | 38 ++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 381be12..404710a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,12 +13,13 @@ Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB * check_icmp: New WATO rule for custom PING checks + * agent_vsphere: now able to handle < > & ' " in login credentials + * if/if64 and friends: add 95% percentiles to graphs * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent - * FIX: host notification email in html format: fixed formating error + * FIX: host notification email in html format: fixed formating error (typo in tag) - * agent_vsphere: now able to handle < > & ' " in login credentials - * if/if64 and friends: add 95% percentiles to graphs + * FIX: netapp_volumes: better output when volume is missing Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 0f67920..1e7b6d3 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -91,30 +91,28 @@ def inventory_netapp_volumes(info): return [ (line[0], None) for line in info if netapp_volumes_owner.get(line[2], '') == 'local' ] def check_netapp_volumes(item, _not_used, info): - info = [ line for line in info if line[0] == item ][0] + for line in info: + if line[0] == item: + name, fsid, owner, state, status = line - if len(info) != 5: - return (3, "Invalid SNMP response") + output = 'FSID: %s, Owner: %s, ' % (fsid, netapp_volumes_owner.get(owner, 'UNKNOWN')) - name, fsid, owner, state, status = info + ret_state = 0 + output += 'State: %s' % state + if state == 'offline': + ret_state = 1 + output += '(!)' - output = 'FSID: %s, Owner: %s, ' % (fsid, netapp_volumes_owner.get(owner, 'UNKNOWN')) + output += ', Status: %s' % status + if status == 'reconstructing': + ret_state = 1 + output += '(!)' + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored', 'raid4' ]: + ret_state = 2 + output += '(!!)' - ret_state = 0 - output += 'State: %s' % state - if state == 'offline': - ret_state = 1 - output += '(!)' - - output += ', Status: %s' % status - if status == 'reconstructing': - ret_state = 1 - output += '(!)' - elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored', 'raid4' ]: - ret_state = 2 - output += '(!!)' - - return (ret_state, output) + return (ret_state, output) + return 3, "Volume not found" check_info["netapp_volumes"] = { 'check_function': check_netapp_volumes,

10 years, 11 months

Check_MK Git: check_mk: if/if64 and friends: add 95% percentiles to graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 301c899d6e42d34ef84e43cbc16a23c1580b1fb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=301c899d6e42d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 19:13:05 2013 +0200 if/if64 and friends: add 95% percentiles to graphs --- ChangeLog | 1 + pnp-templates/check_mk-if.php | 73 ++++++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7b650..381be12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * FIX: host notification email in html format: fixed formating error (typo in tag) * agent_vsphere: now able to handle < > & ' " in login credentials + * if/if64 and friends: add 95% percentiles to graphs Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3a224cb..17a359e 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -103,21 +103,36 @@ $def[1] = $def[1] .= "HRULE:$mCritH#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". "HRULE:-$mCritH#ff0000: "; - $def[1] .= "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". - "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". + $def[1] .= "". + # incoming + "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "CDEF:intraffic=inbytes,$unit_multiplier,* ". - "CDEF:outtraffic=outbytes,$unit_multiplier,* ". "CDEF:inmb=intraffic,1048576,/ ". + "AREA:inmb#00e060:\"in \" ". + "GPRINT:intraffic:LAST:\"%7.1lf %s$unit/s last\" ". + "GPRINT:intraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". + "GPRINT:intraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". + "VDEF:inperc=intraffic,95,PERCENTNAN ". + "VDEF:inpercmb=inmb,95,PERCENTNAN ". + "LINE:inpercmb#008f00:\"95% percentile\" ". + "GPRINT:inperc:\"%7.1lf %s$unit/s\\n\" ". + + # outgoing + "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". + "CDEF:outtraffic=outbytes,$unit_multiplier,* ". + "CDEF:minusouttraffic=outtraffic,-1,* ". "CDEF:outmb=outtraffic,1048576,/ ". "CDEF:minusoutmb=0,outmb,- ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:intraffic:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:intraffic:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:intraffic:MAX:\"%6.1lf %s$unit/s max\\n\" ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outtraffic:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:outtraffic:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:outtraffic:MAX:\"%6.1lf %s$unit/s max\\n\" "; + "AREA:minusoutmb#0080e0:\"out \" ". + "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ". + "GPRINT:outtraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". + "GPRINT:outtraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". + "VDEF:outperc=minusouttraffic,5,PERCENTNAN ". + "VDEF:outpercmb=minusoutmb,5,PERCENTNAN ". + "LINE:outpercmb#00008f:\"95% percentile\" ". + "GPRINT:outperc:\"%7.1lf %s$unit/s\\n\" ". + + ""; if (isset($DS[12])) { $def[1] .= @@ -142,29 +157,41 @@ if (isset($DS[12])) { $ds_name[2] = 'Packets'; $opt[2] = "--vertical-label \"packets/sec\" --title \"Packets $hostname / $servicedesc\" "; $def[2] = + # ingoing "HRULE:0#c0c0c0 ". "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". + "CDEF:in=inu,innu,+ ". "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%7.2lf/s last \" ". - "GPRINT:inu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:inu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:inu:LAST:\"%8.2lf/s last \" ". + "GPRINT:inu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:inu:MAX:\"%8.2lf/s max\\n\" ". "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%7.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:innu:LAST:\"%8.2lf/s last \" ". + "GPRINT:innu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:innu:MAX:\"%8.2lf/s max\\n\" ". + "VDEF:inperc=in,95,PERCENTNAN ". + "LINE:inperc#00cf00:\"95% percentile incoming \" ". + "GPRINT:inperc:\"%8.2lf/s\\n\" ". + + # outgoing "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". + "CDEF:minusout=minusoutu,minusoutnu,+ ". "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%7.2lf/s last \" ". - "GPRINT:outu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:outu:LAST:\"%8.2lf/s last \" ". + "GPRINT:outu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:outu:MAX:\"%8.2lf/s max\\n\" ". "AREA:minusoutnu#0080c0:\"out broadcast/multicast \":STACK ". - "GPRINT:outnu:LAST:\"%7.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%7.2lf/s max\\n\" "; + "GPRINT:outnu:LAST:\"%8.2lf/s last \" ". + "GPRINT:outnu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:outnu:MAX:\"%8.2lf/s max\\n\" ". + "VDEF:outperc=minusout,5,PERCENTNAN ". + "LINE:outperc#0000cf:\"95% percentile outgoing\" ". + "GPRINT:outperc:\"%8.2lf/s\\n\" ". + ""; # Graph 3: errors and discards $ds_name[3] = 'Errors and discards';

10 years, 11 months

Check_MK Git: check_mk: First (not working) try with Fritz.Box Agent.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 09efcd7e48b1860a2749ce708e906a9100118f1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09efcd7e48b186… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 7 16:53:48 2013 +0200 First (not working) try with Fritz.Box Agent. --- agents/special/agent_fritz | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/agents/special/agent_fritz b/agents/special/agent_fritz new file mode 100755 index 0000000..140524b --- /dev/null +++ b/agents/special/agent_fritz @@ -0,0 +1,24 @@ +#!/usr/bin/python +from lxml import etree +import hashlib +import inspect, pprint + +address = "http://fritz.box" +username = '' +password = "test123" + +url = '%s/login_sid.lua' % address +login_page = etree.parse(url).getroot() +sid = login_page.findtext('SID') +block = login_page.findtext('BlockTime') +if sid == "0000000000000000": + challenge = login_page.findtext('Challenge') + response = challenge + '-' + hashlib.md5(challenge + '-' + password ).hexdigest() + + login_page = etree.parse(url+"?username=%s&response=%s" % (username, response)).getroot() + print url+"?username=%s&response=%s" % (username, response) + sid = login_page.findtext('SID') + block = login_page.findtext('BlockTime') + +print "SID: %s, Block: %s" % ( sid, block ) +

10 years, 11 months

Check_MK Git: check_mk: Fixed sort order of logfile search view

by Mathias Kettner

Module: check_mk Branch: master Commit: a4023531fa0950ccf8327b9e44facc7ea84a521a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4023531fa0950… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 01:50:54 2013 +0200 Fixed sort order of logfile search view --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 88ec523..b8192f2 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1832,7 +1832,7 @@ multisite_builtin_views.update({ 'opthostgroup', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Search Global Logfile'), 'topic': _('Other')},

10 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013