Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: FIX mk_inventory.linux: Changed field separator from pipe to tab

by Bastian Kuhn

Module: check_mk Branch: master Commit: bd349fad34b2eb9ef5cda3c350d005cfbd0d9574 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd349fad34b2eb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jun 26 11:17:58 2014 +0200 FIX mk_inventory.linux: Changed field separator from pipe to tab Some rpm packages using the pipe symbol as part of her description. Cause of this reason we need another internal separator. --- .werks/167 | 9 +++++++++ ChangeLog | 3 +++ agents/plugins/mk_inventory.linux | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/167 b/.werks/167 new file mode 100644 index 0000000..a1f5226 --- /dev/null +++ b/.werks/167 @@ -0,0 +1,9 @@ +Title: mk_inventory.linux: Changed field separator from pipe to tab +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1403774134 +Class: fix + +Some rpm packages using the pipe symbol as part of her description. Cause of this reason we need another internal separator. + diff --git a/ChangeLog b/ChangeLog index d610c5c..993f67e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 0994 FIX: agent plugin smart: fixed syntax error + HW/SW-Inventory: + * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... + 1.2.5i4: Core & Setup: diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 0ae6af6..2f2ece1 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -20,8 +20,8 @@ then # List of RPM packages in same format if type rpm >/dev/null; then - echo "<<<lnx_packages:sep(124):persist($UNTIL)>>>" - rpm -qa --qf '%{NAME}|%{VERSION}|%{ARCH}|rpm|%{SUMMARY}|\n' + echo "<<<lnx_packages:sep(9):persist($UNTIL)>>>" + rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{SUMMARY}\t-\n' fi # Information about distribution

10 years

Check_MK Git: check_mk: raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c3e0aa2d34c0c1dfb700b420d5965884b5d3f6d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3e0aa2d34c0c1… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jun 26 18:47:03 2014 +0200 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs --- .werks/995 | 8 ++ ChangeLog | 1 + checkman/raritan_pdu_outletcount | 17 ++++ checks/raritan_pdu_outletcount | 46 ++++++++++ pnp-templates/check_mk-raritan_pdu_outletcount.php | 90 ++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 5 ++ 6 files changed, 167 insertions(+) diff --git a/.werks/995 b/.werks/995 new file mode 100644 index 0000000..f3fe415 --- /dev/null +++ b/.werks/995 @@ -0,0 +1,8 @@ +Title: raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1403801183 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 90cd230..89f4c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ NOTE: Please refer to the migration notes! Checks & Agents: + * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/raritan_pdu_outletcount b/checkman/raritan_pdu_outletcount new file mode 100644 index 0000000..6725d86 --- /dev/null +++ b/checkman/raritan_pdu_outletcount @@ -0,0 +1,17 @@ +title: Raritan PX-2000 family PDU outlet count +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check displays the current outlet count of the Raritan PX-2000 + family of intelligent rack power distribution units (iPDUs). + + It is for reporting only and returns always {OK}. + +perfdata: + Exactly one number: The outlet count. + +inventory: + Creates exactly one check per host called Outlet Count. + diff --git a/checks/raritan_pdu_outletcount b/checks/raritan_pdu_outletcount new file mode 100644 index 0000000..f55fa3a --- /dev/null +++ b/checks/raritan_pdu_outletcount @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +def inventory_raritan_pdu_outletcount(info): + if len(info) > 0 and len(info[0]) > 0: + return [ (None, None) ] + else: + return [] + +def check_raritan_pdu_outletcount(item, params, info): + message = "Outlet Count is %s" % info[0][0] + perfdata = [ ("outletcount", int(info[0][0])) ] + return 0, message, perfdata + +check_info['raritan_pdu_outletcount'] = { + "inventory_function" : inventory_raritan_pdu_outletcount, + "check_function" : check_raritan_pdu_outletcount, + "service_description" : "Outlet Count", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.13742.6.3.2.2.1.4", ["1"]), # outletCount + "snmp_scan_function" : lambda oid: \ + oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") +} diff --git a/pnp-templates/check_mk-raritan_pdu_outletcount.php b/pnp-templates/check_mk-raritan_pdu_outletcount.php new file mode 100644 index 0000000..de644a1 --- /dev/null +++ b/pnp-templates/check_mk-raritan_pdu_outletcount.php @@ -0,0 +1,90 @@ +<?php +# +# Copyright (c) 2006-2010 Joerg Linge (http://www.pnp4nagios.org) +# Default Template used if no other template is found. +# Don`t delete this file ! +# +# Define some colors .. +# +$_WARNRULE = '#FFFF00'; +$_CRITRULE = '#FF0000'; +$_AREA = '#256aef'; +$_LINE = '#000000'; +# +# Initial Logic ... +# + +foreach ($this->DS as $KEY=>$VAL) { + + $maximum = ""; + $minimum = ""; + $critical = ""; + $crit_min = ""; + $crit_max = ""; + $warning = ""; + $warn_max = ""; + $warn_min = ""; + $vlabel = " "; + $lower = ""; + $upper = ""; + + if ($VAL['WARN'] != "" && is_numeric($VAL['WARN']) ){ + $warning = $VAL['WARN']; + } + if ($VAL['WARN_MAX'] != "" && is_numeric($VAL['WARN_MAX']) ) { + $warn_max = $VAL['WARN_MAX']; + } + if ( $VAL['WARN_MIN'] != "" && is_numeric($VAL['WARN_MIN']) ) { + $warn_min = $VAL['WARN_MIN']; + } + if ( $VAL['CRIT'] != "" && is_numeric($VAL['CRIT']) ) { + $critical = $VAL['CRIT']; + } + if ( $VAL['CRIT_MAX'] != "" && is_numeric($VAL['CRIT_MAX']) ) { + $crit_max = $VAL['CRIT_MAX']; + } + if ( $VAL['CRIT_MIN'] != "" && is_numeric($VAL['CRIT_MIN']) ) { + $crit_min = $VAL['CRIT_MIN']; + } + if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) { + $lower = " --lower=" . $VAL['MIN']; + $minimum = $VAL['MIN']; + } + if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) { + $maximum = $VAL['MAX']; + } + if ($VAL['UNIT'] == "%%") { + $vlabel = "%"; + $upper = " --upper=101 "; + $lower = " --lower=0 "; + } + else { + $vlabel = $VAL['UNIT']; + } + + $opt[$KEY] = '--vertical-label "' . $vlabel . '" --title "' . $this->MACRO['DISP_HOSTNAME'] . ' / ' . $this->MACRO['DISP_SERVICEDESC'] . '"' . $upper . $lower; + $ds_name[$KEY] = $VAL['LABEL']; + $def[$KEY] = rrd::def ("var1", $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); + $def[$KEY] .= rrd::gradient("var1", "3152A5", "BDC6DE", rrd::cut($VAL['NAME'],16), 20); + $def[$KEY] .= rrd::line1 ("var1", $_LINE ); + $def[$KEY] .= rrd::gprint ("var1", array("LAST","MAX","AVERAGE"), "%3.0lf %S".$VAL['UNIT']); + if ($warning != "") { + $def[$KEY] .= rrd::hrule($warning, $_WARNRULE, "Warning $warning \\n"); + } + if ($warn_min != "") { + $def[$KEY] .= rrd::hrule($warn_min, $_WARNRULE, "Warning (min) $warn_min \\n"); + } + if ($warn_max != "") { + $def[$KEY] .= rrd::hrule($warn_max, $_WARNRULE, "Warning (max) $warn_max \\n"); + } + if ($critical != "") { + $def[$KEY] .= rrd::hrule($critical, $_CRITRULE, "Critical $critical \\n"); + } + if ($crit_min != "") { + $def[$KEY] .= rrd::hrule($crit_min, $_CRITRULE, "Critical (min) $crit_min \\n"); + } + if ($crit_max != "") { + $def[$KEY] .= rrd::hrule($crit_max, $_CRITRULE, "Critical (max) $crit_max \\n"); + } +} +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 76681b6..eef0eb6 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1065,3 +1065,8 @@ def perfometer_raritan_pdu_inlet(row, check_command, perf_data): perfometers["check_mk-raritan_pdu_inlet"] = perfometer_raritan_pdu_inlet +def perfometer_raritan_pdu_outletcount(row, check_command, perf_data): + outletcount = float(perf_data[0][1]) + return "%d" % outletcount, perfometer_logarithmic(outletcount, 20, 2, "#da6") + +perfometers["check_mk-raritan_pdu_outletcount"] = perfometer_raritan_pdu_outletcount

10 years

Check_MK Git: check_mk: removed superfluous parameter definition

by Andreas Boesl

Module: check_mk Branch: master Commit: 5734606f6a81dbe6a67b97fcf048f82a2999ef92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5734606f6a81db… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 26 16:37:29 2014 +0200 removed superfluous parameter definition --- web/plugins/sidebar/shipped.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index ccee448..09d96a9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -192,7 +192,6 @@ def render_hosts(mode): else: query += "Filter: custom_variable_names < _REALNAME\n" - problem_hosts = [] if mode == "problems": view = "problemsofhost" # Exclude hosts and services in downtime

10 years

Check_MK Git: check_mk: Sidebar snapin 'Problem hosts': Now excludes hosts and services in downtime

by Andreas Boesl

Module: check_mk Branch: master Commit: 66bedd26b84abd5383d5dd4441afe4026c7b11d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bedd26b84abd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 26 16:31:46 2014 +0200 Sidebar snapin 'Problem hosts': Now excludes hosts and services in downtime --- .werks/945 | 8 ++++++++ ChangeLog | 3 +++ web/plugins/sidebar/shipped.py | 12 +++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/945 b/.werks/945 new file mode 100644 index 0000000..b231127 --- /dev/null +++ b/.werks/945 @@ -0,0 +1,8 @@ +Title: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime +Level: 2 +Component: multisite +Version: 1.2.5i5 +Date: 1403792470 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f73ccc2..90cd230 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... + Multisite: + * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime + WATO: * 0990 FIX: Fix HTTP error handling in bulk inventory... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f756815..ccee448 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -192,9 +192,19 @@ def render_hosts(mode): else: query += "Filter: custom_variable_names < _REALNAME\n" + problem_hosts = [] if mode == "problems": - query += "Filter: state > 0\nFilter: worst_service_state > 0\nOr: 2\n" view = "problemsofhost" + # Exclude hosts and services in downtime + svc_query = "GET services\nColumns: host_name\n"\ + "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\n"\ + "Filter: host_scheduled_downtime_depth = 0\nAnd: 3" + problem_hosts = set(map(lambda x: x[1], html.live.query(svc_query))) + + query += "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\nAnd: 2\n" + for host in problem_hosts: + query += "Filter: name = %s\n" % host + query += "Or: %d\n" % (len(problem_hosts) + 1) hosts = html.live.query(query) html.live.set_prepend_site(False)

10 years

Check_MK Git: check_mk: Fix some coding style issues

by Mathias Kettner

Module: check_mk Branch: master Commit: db85ba04e632f72bce51d9c923aeebf646b32267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db85ba04e632f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 16:05:48 2014 +0200 Fix some coding style issues --- mkeventd/lib/check_mkevents.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index ca4b769..f9401c5 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -64,7 +64,8 @@ int main(int argc, char** argv) remote_host = argv[i+1]; i++; argc_count -= 2; - } else if (!strcmp("-a", argv[i])) { + } + else if (!strcmp("-a", argv[i])) { ignore_acknowledged = true; argc_count--; } @@ -72,7 +73,8 @@ int main(int argc, char** argv) host = argv[i]; application = argv[i+1]; break; - } else if (argc_count > 1) { + } + else if (argc_count > 1) { host = argv[i]; break; } @@ -104,9 +106,9 @@ int main(int argc, char** argv) int sock; struct timeval tv; if (remote_host) { - sock = socket(AF_INET ,SOCK_STREAM ,0); + sock = socket(AF_INET, SOCK_STREAM, 0); tv.tv_sec = 10; - setsockopt(sock, SOL_SOCKET,SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); + setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); @@ -114,12 +116,14 @@ int main(int argc, char** argv) inet_aton(remote_hostaddress, &addr.sin_addr); addr.sin_port = htons(remote_port); - if(0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))){ + if (0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))) + { printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d (%s)\n", remote_hostaddress, remote_port, strerror(errno)); exit(3); } - } else { + } + else { sock = socket(PF_LOCAL, SOCK_STREAM , 0); if (sock < 0) { printf("UNKNOWN - Cannot create client socket: %s\n", strerror(errno));

10 years

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 3554332a136390f5fc35e3d6fbd617aabbfd1de1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3554332a136390… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:40:28 2014 +0200 Updated werk description --- .werks/1012 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1012 b/.werks/1012 index 98744fe..8c268cb 100644 --- a/.werks/1012 +++ b/.werks/1012 @@ -1,4 +1,4 @@ -Title: Fix quoting of \ in custom checks with nagios core +Title: Fix quoting of backslashes in custom checks with nagios core Level: 2 Component: core Version: 1.2.5i5 diff --git a/ChangeLog b/ChangeLog index c4938ff..f73ccc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 1.2.5i5: Core & Setup: - * 1012 Fix quoting of \ in custom checks with nagios core... + * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! Checks & Agents:

10 years

Check_MK Git: check_mk: Fix quoting of \ in custom checks with nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b64aa2fedc8448c7ea4b48ff0f30a1b04d0b266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b64aa2fedc844… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:39:03 2014 +0200 Fix quoting of \ in custom checks with nagios core When you are using Nagios as montitoring core then backslashes contained in <tt>custom_checks</tt> (Classical active and passive Nagios checks) would be interpreted by Nagios. That way single backslashes would usually vanish und you would have to duplicate them. The Check_MK Micro Core never interpreted these backslashes so it was transparent for the user. This fix changes the behaviour of Check_MK in a way that also with the Nagios core you need only one backslash. Backslashes are transparent now. NOTE: If you have custom checks that contain backslashes (for example as part of names or passwords) then you need to remove duplicate backslashes after this update! --- .werks/1012 | 22 ++++++++++++++++++++++ ChangeLog | 4 ++++ modules/check_mk.py | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/1012 b/.werks/1012 new file mode 100644 index 0000000..98744fe --- /dev/null +++ b/.werks/1012 @@ -0,0 +1,22 @@ +Title: Fix quoting of \ in custom checks with nagios core +Level: 2 +Component: core +Version: 1.2.5i5 +Date: 1403786142 +Class: incomp + +When you are using Nagios as montitoring core then backslashes contained +in <tt>custom_checks</tt> (Classical active and passive Nagios checks) would +be interpreted by Nagios. That way single backslashes would usually vanish +und you would have to duplicate them. + +The Check_MK Micro Core never interpreted these backslashes so it was +transparent for the user. + +This fix changes the behaviour of Check_MK in a way that also with the +Nagios core you need only one backslash. Backslashes are transparent +now. + +NOTE: If you have custom checks that contain backslashes (for +example as part of names or passwords) then you need to remove +duplicate backslashes after this update! diff --git a/ChangeLog b/ChangeLog index 488d804..c4938ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.5i5: + Core & Setup: + * 1012 Fix quoting of \ in custom checks with nagios core... + NOTE: Please refer to the migration notes! + Checks & Agents: * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... diff --git a/modules/check_mk.py b/modules/check_mk.py index 86dfb29..78c4403 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2411,7 +2411,7 @@ define service { continue if command_line: - command_line = autodetect_plugin(command_line) + command_line = autodetect_plugin(command_line).replace("\\", "\\\\") if "freshness" in entry: freshness = " check_freshness\t\t1\n" + \

10 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: eae44a1a16de0999eb5198158f57145a3673da57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae44a1a16de09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:35:28 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c778141..4ac943d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1022 +1032

10 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f817579589910c5467df03747341d57086bc661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f817579589910… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:35:22 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2d1420d..c778141 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1012 +1022

10 years

Check_MK Git: check_mk: FIX oracle_tablespaces: fixed calculation of space left and number of remaining increments

by Andreas Boesl

Module: check_mk Branch: master Commit: 8fc47589b3ccb0eee4d450222b580f2125ae2004 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc47589b3ccb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 26 14:21:20 2014 +0200 FIX oracle_tablespaces: fixed calculation of space left and number of remaining increments The remaining increments and space left was not correctly calculated when the remaining memory space was not a multiple of the increment size. For example: C+: Tablespace 900 MB used 100 MB free space for autoincrement 200 MB increment size C-: The previous version calculated 900 MB as maximum size, because the increment size was greater than the remaining autoincrement space. This was wrong. The last increment also uses the remaining space, even if the remaining size is smaller than the increment size. As a result, this fix actually increases the amount of available free space, so it should not have any negative side effects for already configured limits. --- .werks/944 | 26 ++++++++++++++++++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 11 ++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.werks/944 b/.werks/944 new file mode 100644 index 0000000..981ada8 --- /dev/null +++ b/.werks/944 @@ -0,0 +1,26 @@ +Title: oracle_tablespaces: fixed calculation of space left and number of remaining increments +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1403784236 +Class: fix + +The remaining increments and space left was not correctly calculated when the +remaining memory space was not a multiple of the increment size. +For example: + +C+: +Tablespace +900 MB used +100 MB free space for autoincrement + +200 MB increment size +C-: + +The previous version calculated 900 MB as maximum size, because the increment size was greater +than the remaining autoincrement space. This was wrong. The last increment also uses the remaining +space, even if the remaining size is smaller than the increment size. + +As a result, this fix actually increases the amount of available free space, +so it should not have any negative side effects for already configured limits. + diff --git a/ChangeLog b/ChangeLog index 52ba5bc..488d804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... + * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... WATO: * 0990 FIX: Fix HTTP error handling in bulk inventory... diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 05cb437..f4971b0 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -202,10 +202,15 @@ def check_oracle_tablespaces(item, params, info): incsize = int(line[8]) # size of next increment in blocks if incsize == 1: uses_default_increment = True - incs = free_bl / incsize + + incs, rest = divmod(free_bl, incsize) + if rest: + incs += 1 + num_increments += incs - increment_size += blocksize * incsize * incs - free_space += blocksize * (incsize * incs + (int(line[12]))) + increment_size += blocksize * incsize * incs - rest * blocksize + free_space += blocksize * (incsize * incs + (int(line[12]))) - rest * blocksize + # not autoextensible: take current size as maximum else: my_max_size = blocksize * int(line[5])

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014