Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Added uncommitted and overprovisioned perfvalue

by Lars Michelsen

Module: check_mk Branch: master Commit: 77cfbf7dd4e20dca147992864d1c78fa58de2c1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77cfbf7dd4e20d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 13:13:58 2013 +0200 Added uncommitted and overprovisioned perfvalue --- checks/esx_vsphere_datastores | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 831e428..4d2c885 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -74,8 +74,12 @@ def check_esx_vsphere_datastores(item, params, info): overprov_percent = (overprov_mb / size_mb) * 100 overprov_txt = '' + overprov_warn_mb = None + overprov_crit_mb = None if 'provisioning_levels' in params: warn, crit = params['provisioning_levels'] + overprov_warn_mb = avail_mb / 100 * warn + overprov_crit_mb = avail_mb / 100 * crit if overprov_percent >= crit: state = max(state, 2) overprov_txt = ' (!!)' @@ -85,6 +89,10 @@ def check_esx_vsphere_datastores(item, params, info): infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % ( uncommitted_mb / 1024, overprov_percent, overprov_txt) + perfdata += [ + ('uncommitted', str(uncommitted_mb) + 'MB'), + ('overprovisioned', str(overprov_mb) + 'MB', overprov_warn_mb, overprov_crit_mb), + ] if not store["accessible"]: state = 2

11 years, 5 months

Check_MK Git: check_mk: AIX agent: call lparstat with argument 1 1, this give more accurate data

by Mathias Kettner

Module: check_mk Branch: master Commit: e4f9129c584720185e0dd6f496fd0a0f04109fd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4f9129c584720… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 12:20:36 2013 +0200 AIX agent: call lparstat with argument 1 1, this give more accurate data --- ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e771335..f4ea9cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * lnx_if in Linux agent: force deterministical order of network devices * Linux agent: remove obsolete old <<<netif>>> and <<<netctr>>> sections * Linux agent: cups_queues: do not monitor non-local queues (thanks to Olaf Morgenstern) + * AIX agent: call lparstat with argument 1 1, this give more accurate data Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 769328e..06c579b 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -60,7 +60,7 @@ ps -ef -F user,vszsize,rssize,pcpu,args | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ if type lparstat >/dev/null 2>&1 then echo '<<<lparstat_aix>>>' - lparstat | tail -n1 + lparstat 1 1 | tail -n1 fi echo '<<<vmstat_aix>>>'

11 years, 5 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 82ed46406292ef087e1dffd47f9afee80df45e7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82ed46406292ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 12:20:37 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: esx_vsphere_datastores: Added uncommitted perfvalue , also added perfometer (thanks to Sebastian Talmon)

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b063dba6d887431d2c271f6a285a69d40145462 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b063dba6d8874… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 12:17:51 2013 +0200 esx_vsphere_datastores: Added uncommitted perfvalue, also added perfometer (thanks to Sebastian Talmon) --- checks/esx_vsphere_datastores | 8 +++++++ web/plugins/perfometer/check_mk.py | 45 +++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 831e428..5000fb1 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -74,8 +74,12 @@ def check_esx_vsphere_datastores(item, params, info): overprov_percent = (overprov_mb / size_mb) * 100 overprov_txt = '' + overprov_warn_mb = None + overprov_crit_mb = None if 'provisioning_levels' in params: warn, crit = params['provisioning_levels'] + overprov_warn_mb = avail_mb / 100 * warn + overprov_crit_mb = avail_mb / 100 * crit if overprov_percent >= crit: state = max(state, 2) overprov_txt = ' (!!)' @@ -85,6 +89,10 @@ def check_esx_vsphere_datastores(item, params, info): infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % ( uncommitted_mb / 1024, overprov_percent, overprov_txt) + perfdata += [ + ('uncommited', str(uncommitted_mb) + 'MB'), + ('overprovisioned', str(overprov_mb) + 'MB', overprov_warn_mb, overprov_crit_mb), + ] if not store["accessible"]: state = 2 diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0f44fc0..a589c60 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -71,7 +71,50 @@ perfometers["check_mk-zfsget"] = perfometer_check_mk_df perfometers["check_mk-hr_fs"] = perfometer_check_mk_df perfometers["check_mk-oracle_asm_diskgroup"] = perfometer_check_mk_df perfometers["check_mk-mysql_capacity"] = perfometer_check_mk_df -perfometers["check_mk-esx_vsphere_datastores"] = perfometer_check_mk_df +perfometers["check_mk-mysql_capacity"] = perfometer_check_mk_df +perfometers["check_mk-esx_vsphere_counters.ramdisk"] = perfometer_check_mk_df + +def perfometer_check_mk_df_esx(row, check_command, perf_data): + h = '<table><tr>' + varname, value, unit, warn, crit, minn, maxx = perf_data[0] + uncommitted_mb= 0 + if len(perf_data) > 3: + uncommitted_mb = perf_data[3][1] + + perc_used = 100 * (float(value) / float(maxx)) + perc_uncommitted = 100 * (float(uncommitted_mb) / float(maxx)) + perc_free = 100 - float(perc_used) - float(perc_uncommitted) + + state = row["service_state"] + + # paint used and uncommitted + used_color, uncommitted_color = { + 0:("#0c6", "#5fa"), + 1:("#ff2", "#dd0"), + 2:("#f22", "#f99"), + 3:("#fa2", "#d80") }[state] + + # used < size => show free space and uncommitted + + if perc_free > 0: + h += perfometer_td(perc_used, used_color) + if perc_uncommitted > 0: + h += perfometer_td(perc_uncommitted, uncommitted_color) + h += perfometer_td(perc_free, "#fff") + + # overcommitted => rescale values to show overcommitted percent + else: + perc_used2 = perc_used * 100 / (100 - perc_free) + perc_uncommitted2 = perc_uncommitted * 100 / (100 - perc_free) + perc_free2 = perc_free * 100 / (100 - perc_free) + h += perfometer_td(perc_used2, used_color) + h += perfometer_td(perc_uncommitted2+perc_free2, uncommitted_color) + h += perfometer_td(0 - perc_free2, "#fd6") + + h += "</tr></table>" + return "%0.2f%% (+%0.2f%%)" % (perc_used, perc_uncommitted), h + +perfometers["check_mk-esx_vsphere_datastores"] = perfometer_check_mk_df_esx def perfometer_check_mk_kernel_util(row, check_command, perf_data):

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: cf6c30b62886c32bdaa2e379baa528497ebba1cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf6c30b62886c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 11:43:53 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Added pnp-template for job monitoring check

by Lars Michelsen

Module: check_mk Branch: master Commit: cd980477ed2e2d7e5cfb1753099d3f86b8483dd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd980477ed2e2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 11:43:46 2013 +0200 Added pnp-template for job monitoring check --- pnp-templates/check_mk-job.php | 121 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/pnp-templates/check_mk-job.php b/pnp-templates/check_mk-job.php new file mode 100644 index 0000000..f9396ea --- /dev/null +++ b/pnp-templates/check_mk-job.php @@ -0,0 +1,121 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +// Make data sources available via names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + +# +# Excecution time +# + +$ds_name[1] = "Job Duration"; +$opt[1] = "--vertical-label 'Duration (min)' -l0 --title \"Duration for $hostname / $servicedesc\" "; + +$def[1] = "DEF:sec=".$RRD['real_time']." "; + +$def[1] .= "CDEF:total_minutes=sec,60,/ "; + +$def[1] .= "CDEF:days=sec,86400,/,FLOOR "; +$def[1] .= "CDEF:day_rest=sec,86400,% "; +$def[1] .= "CDEF:hours=day_rest,3600,/,FLOOR "; +$def[1] .= "CDEF:hour_rest=day_rest,3600,% "; +$def[1] .= "CDEF:minutes=hour_rest,60,/,FLOOR "; +$def[1] .= "CDEF:seconds=hour_rest,60,% "; + +$def[1] .= "AREA:total_minutes#80f000:\"Duration (Last)\" "; +$def[1] .= "LINE:total_minutes#408000 "; +$def[1] .= "GPRINT:days:LAST:\"%2.0lf days\g\" "; +$def[1] .= "GPRINT:hours:LAST:\"%2.0lf hours\g\" "; +$def[1] .= "GPRINT:minutes:LAST:\"%2.0lf min\g\" "; +$def[1] .= "GPRINT:seconds:LAST:\"%2.2lf sec\" "; + +# +# CPU time +# + +$ds_name[2] = "CPU Time"; +$opt[2] = "--vertical-label 'CPU Time' -l0 -u 100 --title \"CPU Time for $hostname / $servicedesc\" "; +$def[2] = "DEF:user=".$RRD['user_time']." " ; +$def[2] .= "DEF:system=".$RRD['system_time']." " ; +$def[2] .= "CDEF:sum=user,system,+ "; +$def[2] .= "CDEF:idle=100,sum,- "; + +$def[2] .= "AREA:system#ff6000:\"System\" " + . "GPRINT:system:LAST:\"%2.1lf%% \" " + . "AREA:user#60f020:\"User\":STACK " + . "GPRINT:user:LAST:\"%2.1lf%% \" " + . "LINE:sum#004080:\"Total\" " + . "GPRINT:sum:LAST:\"%2.1lf%% \\n\" "; + +# +# Disk IO +# + +$ds_name[3] = "Disk IO"; +$opt[3] = "--vertical-label 'Throughput (MB/s)' -X0 --title \"Disk throughput $hostname / $servicedesc\" "; +$def[3] = "HRULE:0#a0a0a0 " + . "DEF:read=".$RRD['reads']." " + . "CDEF:read_mb=read,1048576,/ " + . "AREA:read_mb#40c080:\"Read \" " + . "GPRINT:read_mb:LAST:\"%8.1lf MB/s last\" " + . "GPRINT:read_mb:AVERAGE:\"%6.1lf MB/s avg\" " + . "GPRINT:read_mb:MAX:\"%6.1lf MB/s max\\n\" "; + +$def[3] .= "DEF:write=".$RRD['writes']." " + . "CDEF:write_mb=write,1048576,/ " + . "CDEF:write_mb_neg=write_mb,-1,* " + . "AREA:write_mb_neg#4080c0:\"Write \" " + . "GPRINT:write_mb:LAST:\"%6.1lf MB/s last\" " + . "GPRINT:write_mb:AVERAGE:\"%6.1lf MB/s avg\" " + . "GPRINT:write_mb:MAX:\"%6.1lf MB/s max\\n\" "; + +# +# Context Switches +# + +$ds_name[4] = "Context Switches"; +$opt[4] = " --vertical-label \"Switches / sec\" --title \"Context Switches $hostname / $servicedesc\" "; + +$def[4] = "DEF:sec=".$RRD['real_time']." "; +$def[4] .= "DEF:vol=".$RRD['vol_context_switches']. " "; +$def[4] .= "DEF:invol=".$RRD['invol_context_switches']. " "; +$def[4] .= "CDEF:vol_persec=vol,sec,/ "; +$def[4] .= "CDEF:invol_persec=invol,sec,/ "; + +$def[4] .= "AREA:vol_persec#48C4EC:\"Voluntary\:\" "; +$def[4] .= "LINE1:vol_persec#1598C3:\"\" "; +$def[4] .= "GPRINT:vol_persec:LAST:\" %8.2lf/s last\\n\" "; + +$def[4] .= "AREA:invol_persec#7648EC:\"Involuntary\:\":STACK "; +$def[4] .= "LINE1:0#4D18E4:\"\":STACK "; +$def[4] .= "GPRINT:invol_persec:LAST:\"%8.2lf/s last\\n\" "; +?>

11 years, 5 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: aefb15bb04f5ae56b0261208128de7371923bf33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aefb15bb04f5ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 10:40:01 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 5 months

Check_MK Git: check_mk: logwatch, logwatch.ec: detect error in agent configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: ad579795f0e941004dbff046ea74f033af521d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad579795f0e941… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 10:39:21 2013 +0200 logwatch, logwatch.ec: detect error in agent configuration --- ChangeLog | 1 + checks/logwatch | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 24fa977..2d54ece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ new global config option: timeout_plugins_total * lnx_if in Linux agent: force deterministical order of network devices * Linux agent: remove obsolete old <<<netif>>> and <<<netctr>>> sections + * logwatch, logwatch.ec: detect error in agent configuration Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checks/logwatch b/checks/logwatch index 897cace..1669bf2 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -202,6 +202,11 @@ def logwatch_parse_line(line): # without precompiled checks, the params must be None an will be # ignored. def check_logwatch(item, params, info): + if len(info) == 1: + line = " ".join(info[0]) + if line.startswith("CANNOT READ CONFIG FILE"): + return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) + found = False loglines = [] for l in info: @@ -430,6 +435,11 @@ def syslog_time(): return value % day def check_logwatch_ec(item, params, info): + if len(info) == 1: + line = " ".join(info[0]) + if line.startswith("CANNOT READ CONFIG FILE"): + return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) + # 1. Parse lines in info and separate by logfile logs = {} logfile = None

11 years, 5 months

Check_MK Git: check_mk: agent_ipmi: Added variant with free ipmi

by Mathias Kettner

Module: check_mk Branch: master Commit: 454b81676bd68f5524fb19604781a2600ffc0607 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=454b81676bd68f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 10:31:27 2013 +0200 agent_ipmi: Added variant with free ipmi --- doc/treasures/agent_ipmi | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/doc/treasures/agent_ipmi b/doc/treasures/agent_ipmi old mode 100644 new mode 100755 index 7d814a3..060de9b --- a/doc/treasures/agent_ipmi +++ b/doc/treasures/agent_ipmi @@ -8,12 +8,19 @@ USERNAME=$2 PASSWORD=$3 echo '<<<check_mk>>>' -Version: ipmi 1.0 -AgentOS: iDrac +echo 'Version: ipmi 1.0' +echo 'AgentOS: IPMI' -echo '<<<ipmi>>>' -ipmitool -i lan -H "$HOST" -U "$USERNAME" -f "$PASSWORD" sensor show 2>/dev/null \ - | grep -v 'command failed' \ - | sed -e 's/ *| */|/g' -e 's/ /_/g' -e 's/_*"'$'"//' -e 's/|/ /g' \ - | egrep -v '^[^ ]+ na ' \ - | grep -v ' discrete '" +if which ipmi-sensors >/dev/null 2>&1 +then + echo '<<<ipmi_sensors>>>' + ipmi-sensors -h $1 -u $2 -p $3 -l USER -Q --ignore-not-available-sensors --legacy-output \ + | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' +else + echo '<<<ipmi>>>' + ipmitool -i lan -H "$HOST" -U "$USERNAME" -f "$PASSWORD" sensor show 2>/dev/null \ + | grep -v 'command failed' \ + | sed -e 's/ *| */|/g' -e 's/ /_/g' -e 's/_*"'$'"//' -e 's/|/ /g' \ + | egrep -v '^[^ ]+ na ' \ + | grep -v ' discrete ' +fi

11 years, 5 months

Check_MK Git: check_mk: Added missing section header cups_queues

by Mathias Kettner

Module: check_mk Branch: master Commit: a6a1bdbd24678e6f4c8d10b1c0eb74e3ac35e1a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6a1bdbd24678e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 10:18:14 2013 +0200 Added missing section header cups_queues --- agents/check_mk_agent.linux | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c9f38ef..78902ca 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -350,6 +350,7 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then if pgrep cups > /dev/null 2>&1; then + echo '<<<cups_queues>>>' WAITMAX="waitmax 3" CPRINTCONF=/etc/cups/printers.conf if [ -r "$CPRINTCONF" ] ; then

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013