Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

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: 969f3f9d7b79a6fa45904ed054ab45fd4d6d6830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969f3f9d7b79a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 23 16:00:22 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a90f68b68b7ce522f94ae27a0d2b88420fa05bd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a90f68b68b7ce5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 23 15:36:17 2012 +0200 Merge conflict ---

11 years, 11 months

Check_MK Git: check_mk: Added new Check for Eaton UPS Devices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 411e8ed4f6d0fb24160e928ff95a6f301df0f275 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=411e8ed4f6d0fb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 23 15:34:48 2012 +0200 Added new Check for Eaton UPS Devices --- ChangeLog | 1 + checkman/ups_eaton_enviroment | 29 +++++++++++++++ checks/ups_eaton_enviroment | 67 ++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 12 ++++++ web/plugins/wato/check_parameters.py | 37 +++++++++++++------ 5 files changed, 135 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2499f45..7b48fc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ counters if a base value is set * win_dhcp_pools: do not inventorize empty pools any more. You can switch back to old behaviour with win_dhcp_pools_inventorize_empty = True + * Added new Check for Eaton UPS Devices 1.2.0p3: Mulitisite diff --git a/checkman/ups_eaton_enviroment b/checkman/ups_eaton_enviroment new file mode 100644 index 0000000..704f983 --- /dev/null +++ b/checkman/ups_eaton_enviroment @@ -0,0 +1,29 @@ +title: Tempreature and Humidity Sensors for Eaton UPS devices +agents: snmp +author: Bastian Kuhn <bk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + Shows Sensor information for Tempreature, External Tempreature an Humidity for + Eaton UPS desvices + +item: + None + +perfdata: + Tempreature + External Tempreature + Humidty + +inventory: + One service will be created + +[parameters] +parameters (dict): One Tuple for each sensor + + warning (int): The lower limit which triggers an WARNING state + + critical (int): The lower limit which triggers an CRITICAL state + +[configuration] +ups_eaton_enviroment_default (dict): Default warning and critical level for each sensor diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment new file mode 100644 index 0000000..f07e329 --- /dev/null +++ b/checks/ups_eaton_enviroment @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +ups_eaton_enviroment_default = { + "temp" : (40, 50), + "remote_temp" : (40, 50), + "humidity" : (65, 80), +} +def inventory_ups_eaton_enviroment(info): + if len(info) > 0: + return [ (None, "ups_eaton_enviroment_default") ] + +def check_ups_eaton_enviroment(item, params, info): + wert = map(saveint, info[0]) + i = 0 + state = 0 + messages = [] + perfdata = [] + for sensor, sensor_name, unit in [("temp", "Temperature", "°C"), ("remote_temp", "Remote-Temperature", "°C"), ("humidity", "Humidity", "%")]: + warn, crit = params.get(sensor) + perfdata.append((sensor, wert[i], warn, crit)) + text = "%s: %d%s (warn/crit at %d%s/%d%s)" % \ + (sensor_name, wert[i],unit, warn, unit, crit, unit) + if wert[i] >= crit: + state = 2 + text += "(!!)" + elif wert[i] >= warn: + state = max(state, 1) + text += "(!)" + i += 1 + messages.append(text) + return (state, nagios_state_names[state] + " - " + ", ".join(messages), perfdata) + +check_info['ups_eaton_enviroment'] = { + "inventory_function" : inventory_ups_eaton_enviroment, + "check_function" : check_ups_eaton_enviroment, + "service_description" : "Enviroment", + "has_perfdata" : True, + "group" : "eaton_enviroment", + "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.534.1"] + +} diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 32992ce..199774a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -590,3 +590,15 @@ def perfometer_carel_uniflair_cooling(row, check_command, perf_data): perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling +def perfometer_eaton(row, command, perf): + h = "<table><tr>" + vname, wert, einheit, warn, crit, minw, maxw = perf[0] + + h += perfometer_td(int(wert), "silver") + diff = 100 - int(wert) + h += perfometer_td(diff, "white") + h += "</tr></table>" + return u"%s°C" % wert, h + +perfometers['check_mk-ups_eaton_enviroment'] = perfometer_eaton + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 28716e2..1255630 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1828,18 +1828,33 @@ checkgroups.append(( checkgroups.append(( subgroup_environment, - "hw_temperature", - _("Hardware temperature (CPU, Memory, etc.)"), - Tuple( - help = _("Temperature levels for internal sensors found in many appliances, " - "switches, routers, mainboards and other devices. "), + "eaton_enviroment", + _("Temperature and Humidity for Eaton UPS"), + Dictionary( elements = [ - Integer(title = "warning at", unit = u"°C"), - Integer(title = "critical at", unit = u"°C"), - ]), - TextAscii( - title = _("Sensor ID"), - help = _("The identificator of the themal sensor.")), + ( "temp", + Tuple( + title = _("Temerature"), + elements = [ + Integer(title = "warning at", unit = u"°C", default_value = 26), + Integer(title = "critical at", unit = u"°C", default_value = 30), + ])), + ( "remote_temp", + Tuple( + title = _("Remote Temerature"), + elements = [ + Integer(title = "warning at", unit = u"°C", default_value = 26), + Integer(title = "critical at", unit = u"°C", default_value = 30), + ])), + ( "humidity", + Tuple( + title = _("Humidity"), + elements = [ + Integer(title = "warning at", unit = u"%", default_value = 60), + Integer(title = "critical at", unit = u"%", default_value = 75), + ])), + ]), + None, "first")) checkgroups.append((

11 years, 11 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: 87bf2cd2668cb864ea2a920e9f6ce8e7db6da175 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87bf2cd2668cb8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 23 14:16:18 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: zfslist: new check for monitoring ZFS disk usage for Linux, Solaris, FreeBSD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d925e9070fd82c4c77ff179d11cb1d424c82827e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d925e9070fd82c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 23 14:16:16 2012 +0200 zfslist: new check for monitoring ZFS disk usage for Linux, Solaris, FreeBSD --- ChangeLog | 2 + agents/check_mk_agent.freebsd | 16 ++++--- agents/check_mk_agent.linux | 8 +++- agents/check_mk_agent.solaris | 8 +++- checkman/zfslist | 13 ++++++ checks/zfslist | 83 ++++++++++++++++++++++++++++++++++++ pnp-templates/check_mk-zfslist.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 8 files changed, 124 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2499f45..350990f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,8 @@ counters if a base value is set * win_dhcp_pools: do not inventorize empty pools any more. You can switch back to old behaviour with win_dhcp_pools_inventorize_empty = True + * zfslist: new check for monitoring ZFS disk usage for Linux, Solaris, FreeBSD + (you need to update your agent as well) 1.2.0p3: Mulitisite diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 6172422..20027fd 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -82,12 +82,16 @@ osver="$(uname -r)" echo '<<<df>>>' # no special zfs handling so far, the ZFS.pools plugin has been tested to # work on FreeBSD -df -T >/dev/null -if [ $? -eq 0 ] - then - df -kTP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' - else - df -kP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' | awk '{ print $1,"ufs",$2,$3,$4,$5,$6 }' +if df -T > /dev/null ; then + df -kTP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' +else + df -kP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' | awk '{ print $1,"ufs",$2,$3,$4,$5,$6 }' +fi + +# Filesystem usage for ZFS +if type zfs > /dev/null 2>&1 ; then + echo '<<<zfslist>>>' + zfs list -H -o name,used,avail,mountpoint fi # Check NFS mounts by accessing them with stat -f (System diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index fe192e9..6c60d8e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -76,7 +76,7 @@ fi echo '<<<df>>>' # The exclusion list is getting a bit of a problem. -l should hide any remote FS but seems # to be all but working. -excludefs="-x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs" +excludefs="-x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" df -PTlk $excludefs | sed 1d # VMWare shows its own filesystems with 'vdf'. Just one @@ -86,6 +86,12 @@ then vdf -P | grep ^/vmfs/volumes | sed 's/ / vmfs /' fi +# Filesystem usage for ZFS +if type zfs > /dev/null 2>&1 ; then + echo '<<<zfslist>>>' + zfs list -H -o name,used,avail,mountpoint +fi + # Check NFS mounts by accessing them with stat -f (System # call statfs()). If this lasts more then 2 seconds we # consider it as hanging. We need waitmax. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 36f0d3d..f005b4d 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -60,7 +60,7 @@ else fi echo '<<<df>>>' -for fs in ufs zfs vxfs +for fs in ufs vxfs do df -lk -F $fs 2>/dev/null | sed 1d | \ while read Filesystem kbytes used avail capacity Mountedon @@ -70,6 +70,12 @@ do done done +# Filesystem usage for ZFS +if type zfs > /dev/null 2>&1 ; then + echo '<<<zfslist>>>' + zfs list -H -o name,used,avail,mountpoint +fi + # Processes echo '<<<ps>>>' ps -A -o user,vsz,rss,pcpu,args | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' diff --git a/checkman/zfslist b/checkman/zfslist new file mode 100644 index 0000000..0fffdd1 --- /dev/null +++ b/checkman/zfslist @@ -0,0 +1,13 @@ +title: Check used space in ZFS +agents: linux, solaris, freebsd +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the usage of ZFS filesystems using the output + of the command {zfslist}. This is done in a separate check since + the output of {df} does not show the required metrics when ZFS + is used with quotas. + + The check is fully compatible with {df} with respect to its configuration, + output and logic. Please refer to the manual of {df} for details. diff --git a/checks/zfslist b/checks/zfslist new file mode 100644 index 0000000..9130850 --- /dev/null +++ b/checks/zfslist @@ -0,0 +1,83 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# Example output from agent: +# <<<zfslist>>> +# bpool 12.0T 19.1T /bpool +# bpool/diskcache_fs 12.0T 19.1T /backup/diskcache +# rpool 20.2G 893G /rpool +# rpool/ROOT 3.33G 4.67G legacy +# rpool/ROOT/zfsroot 3.33G 4.67G / +# rpool/ROOT/zfsroot/var 1.84G 4.67G /var +# rpool/dump 8.00G 893G - +# rpool/export 845M 887G /export +# rpool/export/home 3.67M 887G /home +# rpool/export/opt 842M 887G /opt +# rpool/swap 8.00G 893G - +# +# The columns are: name, used, avail, mountpoint + + +def inventory_zfslist(info): + mplist = [] + for name, used, avail, mountpoint in info: + if mountpoint not in inventory_df_exclude_mountpoints \ + and mountpoint != '-': + mplist.append(mountpoint) + return df_inventory(mplist) + +def convert_zfssize(txt): + units_to_mb = { + 'K' : 1/1024.0, + 'M' : 1.0, + 'G' : 1024.0, + 'T' : 1024 * 1024.0, + 'P' : 1024 * 1024 * 1024.0, + } + return float(txt[:-1]) * units_to_mb[txt[-1]] + + +def check_zfslist(item, params, info): + fslist = [] + for name, used_txt, avail_txt, mountpoint in info: + if "patterns" in params or item == mountpoint: + used_mb = convert_zfssize(used_txt) + avail_mb = convert_zfssize(avail_txt) + size_mb = used_mb + avail_mb + fslist.append((mountpoint, size_mb, avail_mb)) + + return df_check_filesystem_list(item, params, fslist) + + +check_info['zfslist'] = { + "check_function" : check_zfslist, + "inventory_function" : inventory_zfslist, + "service_description" : "fs_%s", + "has_perfdata" : True, + "group" : "filesystem", + "default_levels_variable" : "filesystem_default_levels", + "includes" : [ "df.include" ], +} diff --git a/pnp-templates/check_mk-zfslist.php b/pnp-templates/check_mk-zfslist.php new file mode 120000 index 0000000..28b85a4 --- /dev/null +++ b/pnp-templates/check_mk-zfslist.php @@ -0,0 +1 @@ +check_mk-df.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 32992ce..fd3f1fd 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -67,6 +67,7 @@ perfometers["check_mk-vms_diskstat.df"] = perfometer_check_mk_df perfometers["check_disk"] = perfometer_check_mk_df perfometers["check_mk-df_netapp"] = perfometer_check_mk_df perfometers["check_mk-df_netapp32"] = perfometer_check_mk_df +perfometers["check_mk-zfslist"] = 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

11 years, 11 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: 278bb250bdab75ef7f4e64047b4622b2ada523bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=278bb250bdab75… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 22 16:46:01 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Added missing host parameter to active check_smtp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc66da11d0cb6e5b285de601cc5a06b4796b6fec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc66da11d0cb6e… Author: Andreas Doehler <andreas.doehler(a)gmail.com> Date: Wed Oct 17 00:14:25 2012 +0200 Added missing host parameter to active check_smtp --- checks/check_smtp | 6 ++++-- web/plugins/wato/active_checks.py | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checks/check_smtp b/checks/check_smtp index 50cc3be..7ace91b 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -70,8 +70,10 @@ def check_smtp_arguments(params): if 'cert_days' in settings: args += ' -D %d' % settings['cert_days'] - print args - + if 'hostname' in settings: + args += ' -H %s' % settings['hostname'] + else: + args += ' -H $HOSTADDRESS$' return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index f3259f8..b770b13 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -593,6 +593,12 @@ register_rule(group, Dictionary( title = _("Optional parameters"), elements = [ + ( "hostname", + TextAscii( + title = _("DNS Hostname or IP address"), + allow_empty = False, + help = _("You can specify a hostname or IP address different from IP address " + "of the host as configured in your host properties."))), ( "port", TextAscii( title = _("TCP Port to connect to"),

11 years, 11 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: 1dfb007edc2fa4dc7f7ce35f217437bddae1d2f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dfb007edc2fa4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 22 15:45:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: FIX: fix sorting of users, fix lost user alias in some situations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea2b642a3f323b6a3c5541617e4180c5065660bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea2b642a3f323b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 22 15:44:44 2012 +0200 FIX: fix sorting of users, fix lost user alias in some situations --- ChangeLog | 1 + web/htdocs/wato.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37cf8e7..8dd3986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * FIX: fix layout bug in ValueSpec ListOfStrings (e.g. used in list of explicit host/services in rules) * FIX: fix inheritation of contactgroups from folder to hosts + * FIX: fix sorting of users, fix lost user alias in some situations BI: * FIX: Correct representation of (!), (!!) and (?) markers in check output diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5e079ae..ee4f436 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7625,7 +7625,7 @@ def mode_users(phase): odd = "even" entries = users.items() - entries.sort(cmp = lambda a, b: cmp(a[1].get("alias").lower(), b[1].get("alias").lower())) + entries.sort(cmp = lambda a, b: cmp(a[1].get("alias", a[0]).lower(), b[1].get("alias", b[0]).lower())) for id, user in entries: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) @@ -8135,14 +8135,12 @@ def load_users(): if id in result: result[id]["password"] = password result[id]["locked"] = locked - result[id]["alias"] = "" else: # Create entry if this is an admin user new_user = { "roles" : config.roles_of_user(id), "password" : password, "locked" : False, - "alias" : "" } result[id] = new_user # Other unknown entries will silently be dropped. Sorry...

11 years, 11 months

Check_MK Git: check_mk: Solved merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e425c18d7635e4df65b28cd77c616c0ef26868f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e425c18d7635e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 22 15:13:20 2012 +0200 Solved merge conflict --- ChangeLog | 1 + checks/win_dhcp_pools | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37cf8e7..d42b028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ update information for 30 minutes * FIX: netapp_vfiler: fix inventory function (thanks to Falk Krentzlin) * FIX: ps: avoid exception, when CPU% is missing (Zombies on Solaris) + * FIX: win_dhcp_pools: fixed calculation of perc_free 1.2.1i1: Core: diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 6334765..58dfff8 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -124,7 +124,7 @@ def check_win_dhcp_pools(item, params, info): return (3, "UNKNOWN - DHCP Pool contains no IP addresses / is deactivated") if free > 0: - perc_free = 100 - size / free + percFree = 100 * size / free else: perc_free = 0

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits