Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 35ecb38ff96d4c2fec772eca8547aa3db661c96c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ecb38ff96d4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 14:08:23 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 1efbb9337e161040abe7c5a36090f69bce5907be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1efbb9337e1610… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 15:15:52 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: FIX: fix deadlock due to lock on contacts.mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 176d9cdfc22b69adf69540d79b7cc8488d061f53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=176d9cdfc22b69… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 14:45:40 2013 +0100 FIX: fix deadlock due to lock on contacts.mk --- ChangeLog | 1 + web/htdocs/index.py | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b70289..c7a6884 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * FIX: sidebar snapins which refresh do not register for restart detection anymore * FIX: fix user database corruption in case of a race condition * FIX: added checks wether or not a contactgroup can be deleted + * FIX: Avoid deadlock due to lock on contacts.mk in some situations * Changed sidebar snapin reload to a global interval (option: sidebar_update_interval), defaults to 30 seconds * Sidebar snapins are now bulk updated with one HTTP request each interval diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ffd836c..81fd8a8 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -236,6 +236,7 @@ def handler(req, profiling = True): retcode = cProfile.run("import index; from mod_python import apache; index.handler(apache._profiling_req, False)", profilefile) file(profilefile + ".py", "w").write("#!/usr/bin/python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) os.chmod(profilefile + ".py", 0755) + release_all_locks() return apache.OK # Make sure all plugins are avaiable as early as possible. At least @@ -271,6 +272,7 @@ def handler(req, profiling = True): handler() except Exception, e: html.write(str(e)) + release_all_locks() return apache.OK # Prepare output format @@ -300,6 +302,7 @@ def handler(req, profiling = True): req.myfile = req.uri.split("/")[-1][:-3] handler = pagehandlers.get(req.myfile, page_not_found) else: + release_all_locks() return result # Call userdb page hooks which are executed on a regular base to e.g. syncronize

11 years, 3 months

Check_MK Git: check_mk: cisco_qos: drop supports percentage values

by Andreas Boesl

Module: check_mk Branch: master Commit: 7021e302b8e2720dda3ab9129a8deaa3f2df1a9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7021e302b8e272… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 5 13:41:30 2013 +0100 cisco_qos: drop supports percentage values fixed bug with worst state --- ChangeLog | 4 ++-- checks/cisco_qos | 33 ++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 20 +++++++++++++++----- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 208dd4d..8b70289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,8 @@ * if.include: new configurable parameters for assumed input and output speed * cisco_qos: new param unit: switches between bit/byte display new param average: average the values over the given minute - new param post can now be configured via int and float, now - supports percentage values + new params post/drop can be configured via int and float + fixed incorrect worst state if different parameters exceed limit * logwatch.ec: Added optional spooling to the check to prevent dataloss when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device diff --git a/checks/cisco_qos b/checks/cisco_qos index 5a20bea..a87963f 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -157,14 +157,6 @@ def check_cisco_qos(item, params, info): post_warn, post_crit = params.get("post",(None, None)) drop_warn, drop_crit = params.get("drop",(None, None)) - # Convert the drop levels to byte - if unit == "bit": - # But only if our params where already provided in the new format - if not had_legacy_params: - if type(drop_warn) == int: - drop_warn = drop_warn / 8.0 - if type(drop_crit) == int: - drop_crit = drop_crit / 8.0 # Load values and format them ifs = dict(info[0]) @@ -230,6 +222,20 @@ def check_cisco_qos(item, params, info): post_warn = post_warn / 8 post_crit = post_crit / 8 + # Determine drop warn/crit levels + if type(drop_warn) == float and not had_legacy_params: + drop_warn = bw / 100.0 * drop_warn + drop_crit = bw / 100.0 * drop_crit + # Convert the drop levels to byte + elif unit == "bit": + # But only if our params where already provided in the new format + if not had_legacy_params: + if type(drop_warn) == int: + drop_warn = drop_warn / 8.0 + if type(drop_crit) == int: + drop_crit = drop_crit / 8.0 + + # Handle counter values state = 0 infotext = '' @@ -240,17 +246,17 @@ def check_cisco_qos(item, params, info): perfdata_avg = [] min_value = ("0", "0.0")[unit == 'bit'] - for name, counter, warn, crit, min, max in [ ( "post", post_b, post_warn, post_crit, min_value, bw), + for name, counter, warn, crit, min_val, max_val in [ ( "post", post_b, post_warn, post_crit, min_value, bw), ( "drop", drop_b, drop_warn, drop_crit, min_value, bw) ]: try: timedif, rate = get_counter("cisco_qos.%s.%s" % (name, item), this_time, saveint(counter)) rates.append(rate) - perfdata.append( (name, rate, warn, crit, min, max) ) + perfdata.append( (name, rate, warn, crit, min_val, max_val) ) if average: timedif, avg_value = get_average("cisco_qos.%s.%s.avg" % (name, item), this_time, rate, average) rates.append(avg_value) - perfdata_avg.append( ("%s_avg_%d" % (name, average), avg_value, warn, crit, min, max) ) + perfdata_avg.append( ("%s_avg_%d" % (name, average), avg_value, warn, crit, min_val, max_val) ) except MKCounterWrapped, e: wrapped = True @@ -273,14 +279,15 @@ def check_cisco_qos(item, params, info): else: post_rate = rates[0] drop_rate = rates[1] + for what, rate, warn, crit in [ ("post", post_rate, post_warn, post_crit), ("drop", drop_rate, drop_warn, drop_crit) ]: infotext += ', %s: %s' % (what, format_value(rate)) if crit is not None and rate >= crit: - state = 2 + state = max(2, state) infotext += '(!!)' elif warn is not None and rate >= warn: - state = 1 + state = max(1, state) infotext += '(!)' infotext += ', Policy-Name: %s, Int-Bandwidth: %s' % (policy_name, format_value(bw)) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 569c6a6..30db9ea 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1392,15 +1392,25 @@ checkgroups.append(( ) ), ( "drop", - Tuple( + Alternative( title = _("Number of dropped bits or bytes per second"), help = _("Depending on the measurement unit (defaults to bit) you can set the warn and crit " "levels for the number of dropped bits or bytes"), elements = [ - Float(title = _("Warning at"), size = 8, label = _("bits / bytes per second")), - Float(title = _("Critical at"), size = 8, label = _("bits / bytes per second")), - ] - ) + Tuple( + title = _("Percentual levels (in relation to policy speed)"), + elements = [ + Percentage(title = _("Warning at"), max_value=1000, label = _("% of port speed")), + Percentage(title = _("Critical at"), max_value=1000, label = _("% of port speed")), + ] + ), + Tuple( + elements = [ + Integer(title = _("Warning at"), size = 8, label = _("bits / bytes per second")), + Integer(title = _("Critical at"), size = 8, label = _("bits / bytes per second")), + ] + ) + ]) ), ]), TextAscii(

11 years, 3 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 3dd9c0576280899b8292f232911559a63fa9bf1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dd9c057628089… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 5 13:42:04 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Fix problem in WATO inventory with g_service_description

by Mathias Kettner

Module: check_mk Branch: master Commit: aa0b2f65ed33777a0fe53afa7133e5293568dc2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0b2f65ed3377… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 12:38:31 2013 +0100 Fix problem in WATO inventory with g_service_description --- modules/automation.py | 2 ++ pnp-templates/.f12 | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 8eb3c4d..a0ed7e9 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -254,6 +254,8 @@ def automation_try_inventory_node(hostname): params = None if state_type not in [ 'legacy', 'active' ]: descr = service_description(ct, item) + global g_service_description + g_service_description = descr infotype = ct.split('.')[0] opt_use_cachefile = True opt_no_tcp = True diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index 909a51f..832634b 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -1,4 +1,5 @@ -sudo cp * /omd/versions/default/share/check_mk/pnp-templates +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo cp * /omd/sites/$SITE/share/check_mk/pnp-templates echo 'location.reload();' | nc -w 0 localhost 32000

11 years, 3 months

Check_MK Git: check_mk: Prediction: remove weight parameter for the while

by Mathias Kettner

Module: check_mk Branch: master Commit: 523f14c16460822b3b2b5628589d872cc46f2679 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=523f14c1646082… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 08:36:19 2013 +0100 Prediction: remove weight parameter for the while --- web/htdocs/wato.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6b11fdf..58f71f2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10891,12 +10891,12 @@ def PredictiveLevels(**args): minvalue = 1, default_value = 90, )), - ( "weight", - Percentage( - title = _("Raise weight of recent time"), - label = _("by"), - default_value = 0, - )), + # ( "weight", + # Percentage( + # title = _("Raise weight of recent time"), + # label = _("by"), + # default_value = 0, + # )), ( "levels_upper", CascadingDropdown( title = _("Dynamic levels (upper bound)"),

11 years, 3 months

Check_MK Git: check_mk: Fixed typo

by Mathias Kettner

Module: check_mk Branch: master Commit: 494fc39c32de77f435195abb05c6c6fea0577668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=494fc39c32de77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:43:19 2013 +0100 Fixed typo --- checkman/apache_status | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/apache_status b/checkman/apache_status index b5648f9..5f35356 100644 --- a/checkman/apache_status +++ b/checkman/apache_status @@ -12,7 +12,7 @@ description: but it fetches interesting performance data. As a preparation you need to install the agent plugin {apache_status} - into you agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). + into your agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). The plugin tries to autodetect all running apache servers. If that fails for some reason you need to create the configuration file {/etc/check_mk/apache_status.cfg} and list your servers here. Write

11 years, 4 months

Check_MK Git: check_mk: Added README for cached agent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: d43cda4f4e4f11fe02652c9ffa18bce6719b3522 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d43cda4f4e4f11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:47:21 2013 +0100 Added README for cached agent plugins --- agents/plugins/README | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/agents/plugins/README b/agents/plugins/README new file mode 100644 index 0000000..8072aff --- /dev/null +++ b/agents/plugins/README @@ -0,0 +1,17 @@ +These plugins can be installed in the plugins directory of the +Linux agent in /usr/lib/check_mk_agent/plugins/. Please only install +the plugins that you really need. + +If you want a plugin to be run asynchronously and also in +a larger interval then the normal check interval, then you can +copy it to a subdirectory named after a number of seconds, +e.g.: + +/usr/lib/check_mk_agent/plugins/3600/mk_zypper + +In that case the agent will: + + - Run this plugin in the background and wait not for it to finish. + - Store the result of the plugin in a cache file below /etc/check_mk/cache. + - Use that file for 300 seconds before running the script again. +

11 years, 4 months

Check_MK Git: check_mk: Linux agent: allow cached local/plugins checks ( see docu)

by Mathias Kettner

Module: check_mk Branch: master Commit: 96f52f9bd3d097ee3b65756708687e09d90c607e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96f52f9bd3d097… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:28:23 2013 +0100 Linux agent: allow cached local/plugins checks (see docu) --- ChangeLog | 1 + agents/check_mk_agent.linux | 128 ++++++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3824518..e9324bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ new param post can now be configured via int and float, now supports percentage values * mounts: ignore multiple occurrances of the same device + * Linux agent: allow cached local/plugins checks (see docu) Livestatus: * Table statehist: Improved detection of vanished hosts and services. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c5ebbfe..5eb5e6f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -52,6 +52,33 @@ else exec <&- 2>/dev/null fi +# Runs a command asynchronous by use of a cache file +function run_cached () { + if [ "$1" = -s ] ; then local section="echo '<<<$2>>>' ; " ; shift ; fi + local NAME=$1 + local MAXAGE=$2 + shift 2 + local CMDLINE="$section$@" + + if [ ! -d $MK_CONFDIR/cache ]; then mkdir -p $MK_CONFDIR/cache ; fi + CACHEFILE="$MK_CONFDIR/cache/$NAME.cache" + + # Check if cache file exists and is recent enough + if [ -s "$CACHEFILE" ] ; then + local NOW=$(date +%s) + local MTIME=$(stat -c %Y "$CACHEFILE") + if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi + # Output the file in any case, even if it is + # outdated. The new file will not yet be available + cat "$CACHEFILE" + fi + + # Cache file outdated and new job not yet running? Start it + if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + echo "$CMDLINE" | setsid bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + fi +} + echo '<<<check_mk>>>' echo Version: 1.2.3i1 echo AgentOS: linux @@ -224,39 +251,10 @@ date +%s sed -e 1,2d -e 's/:/ /g' < /proc/net/dev -if type ipmitool >/dev/null +# Hardware sensors via IPMI (need ipmitool) +if type ipmitool > /dev/null then - echo '<<<ipmi>>>' - IPMI_FILE=$MK_CONFDIR/ipmitool_sensors.cache - if [ ! -d $MK_CONFDIR ]; then - mkdir -p $MK_CONFDIR - fi - - # Do not use cache file after 20 minutes - IPMI_MAXAGE=1200 - - # Check if file exists and is recent enough - if [ -s $IPMI_FILE ] - then - NOW=$(date +%s) - MTIME=$(stat -c %Y $IPMI_FILE) - if [ $((NOW - MTIME)) -le $IPMI_MAXAGE ] ; then - USE_IPMI_FILE=1 - fi - fi - - if [ -s "$IPMI_FILE" ] - then - grep -v 'command failed' "$IPMI_FILE" \ - | sed -e 's/ *| */|/g' -e "s/ /_/g" -e 's/_*$//' -e 's/|/ /g' \ - | egrep -v '^[^ ]+ na ' \ - | grep -v ' discrete ' - fi - - if [ -z "$USE_IPMI_FILE" -a ! -e "$IPMI_FILE.new" ] - then - setsid bash -c "set -o noclobber ; ipmitool sensor list > $IPMI_FILE.new && mv $IPMI_FILE.new $IPMI_FILE || rm -f $IPMI_FILE*" & - fi + run_cached -s ipmi 300 "ipmitool sensor list | grep -v 'command failed' | sed -e 's/ *| */|/g' -e 's/ /_/g' -e 's/_*"'$'"//' -e 's/|/ /g' | egrep -v '^[^ ]+ na ' | grep -v ' discrete '" fi @@ -358,9 +356,8 @@ if [ -e /etc/openvpn/openvpn-status.log ] ; then fi if type ntpq > /dev/null 2>&1 ; then - echo '<<<ntp>>>' - # remote heading, make first column space separated - waitmax 2 ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + # remove heading, make first column space separated + run_cached -s ntp 30 "waitmax 5 ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/'" fi if type nvidia-settings >/dev/null && [ -S /tmp/.X11-unix/X0 ] @@ -431,8 +428,7 @@ fi # Check status of OMD sites if type omd >/dev/null then - echo '<<<omd_status>>>' - omd status --bare --auto + run_cached omd_status 60 "echo '<<<omd_status>>>' ; omd status --bare --auto" fi @@ -467,30 +463,6 @@ then done fi - -# Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben -if cd $PLUGINSDIR -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - -# Lokale Einzelchecks -echo '<<<local>>>' -if cd $LOCALDIR -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 @@ -504,3 +476,37 @@ then echo done fi + + +# Local checks +echo '<<<local>>>' +if cd $LOCALDIR ; then + for skript in $(ls) ; do + if [ -f "$skript" -a -x "$skript" ] ; then + ./$skript + fi + done + # Call some plugins only every X'th minute + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached local_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + +# Plugins +if cd $PLUGINSDIR ; then + for skript in $(ls) ; do + if [ -f "$skript" -a -x "$skript" ] ; then + ./$skript + fi + done + # Call some plugins only every X'th minute + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached plugins_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + +

11 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013