Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Fixed broken check manpages

by Lars Michelsen

Module: check_mk Branch: master Commit: f6f54072b87a009df3ea08b5ea1fdb945d28075e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f54072b87a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 09:36:48 2014 +0200 Fixed broken check manpages --- checkman/jolokia_metrics.gc | 1 + checkman/jolokia_metrics.tp | 1 + modules/check_mk.py | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/checkman/jolokia_metrics.gc b/checkman/jolokia_metrics.gc index c829c7f..ef33f2d 100644 --- a/checkman/jolokia_metrics.gc +++ b/checkman/jolokia_metrics.gc @@ -1,5 +1,6 @@ title: Java virtual machine garbage collection agents: linux +catalog: app/java license: GPL distribution: check_mk description: diff --git a/checkman/jolokia_metrics.tp b/checkman/jolokia_metrics.tp index 24a0c7e..55bc528 100644 --- a/checkman/jolokia_metrics.tp +++ b/checkman/jolokia_metrics.tp @@ -1,6 +1,7 @@ title: Tomcat number of threads in thread pool agents: linux license: GPL +catalog: app/java distribution: check_mk description: This check monitors the number of threads in a tomcat thread pool. diff --git a/modules/check_mk.py b/modules/check_mk.py index 015e284..8c03880 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3622,7 +3622,12 @@ def read_manpage_catalog(): if filename.startswith("."): continue parsed = parse_man_header(checkname, path) - cat = parsed["catalog"] + try: + cat = parsed["catalog"] + except KeyError: + sys.stderr.write('ERROR: Invalid manpage: %s (Catalog info missing)\n' % checkname) + continue + if not cat: cat = [ "unsorted" ]

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2159

by Mathias Kettner

Module: check_mk Branch: master Commit: 866ae84c2ee6de9c19f17127cebd718a6e07bf88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866ae84c2ee6de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 09:29:06 2014 +0200 Updated bug entries #2159 --- .bugs/2159 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2159 b/.bugs/2159 new file mode 100644 index 0000000..3d25e2f --- /dev/null +++ b/.bugs/2159 @@ -0,0 +1,10 @@ +Title: Make NTP check more tolerant +Component: checks +State: open +Date: 2014-07-28 09:28:06 +Targetversion: future +Class: nastiness + +The message "CRIT - found 1 peers, but none is suitable" should be tolerated for +at least some time. Maybe the check could itself measure how long that state +is active and raise a MKCounterWrapped for an intermediate time...

10 years, 1 month

Check_MK Git: check_mk: Formated werk ids in commit messages

by Lars Michelsen

Module: check_mk Branch: master Commit: 76cb97413fc47bcd06c7d3c4d85c09a617ef8358 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76cb97413fc47b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 25 08:21:02 2014 +0200 Formated werk ids in commit messages --- werk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/werk b/werk index 9f18bc5..bd43a01 100755 --- a/werk +++ b/werk @@ -249,7 +249,7 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) - title = "%d %s" % (werk['id'], title) + title = "#%04d %s" % (werk['id'], title) if custom_files: files_to_commit = custom_files

10 years, 1 month

Check_MK Git: check_mk: Deleted entry for werk 642

by Mathias Kettner

Module: check_mk Branch: master Commit: e3007f163dada038c2493182a6ac8b6b9ae9a90c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3007f163dada0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 17:56:15 2014 +0200 Deleted entry for werk 642 --- .werks/642 | 8 -------- ChangeLog | 1 - 2 files changed, 9 deletions(-) diff --git a/.werks/642 b/.werks/642 deleted file mode 100644 index ebbf24c..0000000 --- a/.werks/642 +++ /dev/null @@ -1,8 +0,0 @@ -Title: fc_port: scan function of check modified ... again -Level: 1 -Component: checks -Version: 1.2.5i5 -Date: 1406216089 -Class: fix - - diff --git a/ChangeLog b/ChangeLog index ab347b3..b6180f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,7 +75,6 @@ * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case - * 0642 FIX: fc_port: scan function of check modified ... again Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...

10 years, 1 month

Check_MK Git: check_mk: modified draft for storage inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 836881ec7dfe01123ce850ab78d1bac4f4d6e53d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=836881ec7dfe01… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:48:42 2014 +0200 modified draft for storage inventory --- doc/drafts/LIESMICH.hardwareinventur | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/drafts/LIESMICH.hardwareinventur b/doc/drafts/LIESMICH.hardwareinventur index cc20275..62b0652 100644 --- a/doc/drafts/LIESMICH.hardwareinventur +++ b/doc/drafts/LIESMICH.hardwareinventur @@ -240,26 +240,26 @@ hardware.storage .fsnode "/dev/vg-01/lv-backup" .size 9823749827349823 .used 2943847238947 - .type "ext3" + .fstype "ext3" .mountpoint /srv/backup - .local True + .drive_type localdisk .disk inv_reference(... zu Platte) .partition inv_reference(... zu Partition) :1 .fsnode "/dev/vg-01/lv-unused" .size 9823749827349823 .used 2943847238947 - .type "swap" + .fstype "swap" .mountpoint None - .local True + .drive_type local disk :2 .server "rablfals.local" .volume "/wefoijweofijw" .size 9823749827349823 .used 2943847238947 - .type "nfs" + .fstype "nfs" .mountpoint "/sapdata" - .local False + .drive_type network drive .swapareas :0

10 years, 1 month

Check_MK Git: check_mk: knuerr_sensors: New Check to monitor

by Bastian Kuhn

Sensors on a =?iso-8859-1?Q?Kn=FCrr?= RMS Device Message-ID: <53d129bf.9uw/3wFJ1amG4fON%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: bbdb021b6c50a5f6dc769202c1f4bc61c7be7885 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbdb021b6c50a5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 17:43:24 2014 +0200 knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device --- .werks/184 | 8 ++++++++ ChangeLog | 3 ++- checkman/knuerr_sensors | 15 +++++++++++++++ checks/knuerr_sensors | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) diff --git a/.werks/184 b/.werks/184 new file mode 100644 index 0000000..50bff22 --- /dev/null +++ b/.werks/184 @@ -0,0 +1,8 @@ +Title: knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406216559 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d255d2e..9231198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,9 +40,10 @@ * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers * 1048 mem.win: support predictive levels... * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers - * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0640 jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates * 1088 included check_mk_agent windows msi installer... + * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs + * 0184 knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device * 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/knuerr_sensors b/checkman/knuerr_sensors new file mode 100644 index 0000000..fdd99a7 --- /dev/null +++ b/checkman/knuerr_sensors @@ -0,0 +1,15 @@ +title: Knürr RMS Sensors +agents: snmp +catalog: hw/environment/knuerr +license: GPL +distribution: +description: + This check monitors the sensor contacts on a Knürr RMS Monitoring System. For each Sensor who is not in a ok state, a {CRITICAL} will be + triggered. + +item: + The Sesorname as configured in the device + +inventory: + All available sensors are automatically inventorized. + diff --git a/checks/knuerr_sensors b/checks/knuerr_sensors new file mode 100644 index 0000000..6b43b7c --- /dev/null +++ b/checks/knuerr_sensors @@ -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_knuerr_sensors(info): + for sensor, state in info: + yield sensor, None + +def check_knuerr_sensors(item, _no_params, info): + for sensor, state in info: + if sensor == item: + if state != '0': + return 2, "Sensor triggered" + return 0, "Sensor not triggered" + return 3, "Sensor not longer found" + +check_info["knuerr_sensors"] = { + "check_function" : check_knuerr_sensors, + "inventory_function" : inventory_knuerr_sensors, + "service_description" : "Sensor %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", + "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.2", [ 1, 5 ]) +} +

10 years, 1 month

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: b967f5b5d75cb51b0ded13e6468b7f52cbf37bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b967f5b5d75cb5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 17:43:53 2014 +0200 merge conflict ---

10 years, 1 month

Check_MK Git: check_mk: 642 FIX fc_port: scan function of check modified .. . again

by Goetz Golla

Module: check_mk Branch: master Commit: 14cf0e3138b866889afe4243bf8fb9dbc4b4e6b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14cf0e3138b866… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:35:14 2014 +0200 642 FIX fc_port: scan function of check modified ... again --- .werks/642 | 8 ++++++++ ChangeLog | 1 + checks/fc_port | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/642 b/.werks/642 new file mode 100644 index 0000000..ebbf24c --- /dev/null +++ b/.werks/642 @@ -0,0 +1,8 @@ +Title: fc_port: scan function of check modified ... again +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406216089 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index aa916c2..98a191e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case + * 0642 FIX: fc_port: scan function of check modified ... again Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index 5986b27..634b250 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -317,8 +317,9 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch." \ - and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), + 'snmp_scan_function' : lambda oid: + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ + and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0 "1.10.1.3", # connUnitPortType # 1

10 years, 1 month

Check_MK Git: check_mk: 1076 FIX Fix wrong percentual host availability > 100% when excluding downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b71cae033e65979de0cb75ac9f6abf2d60d871c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b71cae033e659… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 17:34:42 2014 +0200 1076 FIX Fix wrong percentual host availability > 100% when excluding downtimes When you chose to exclude scheduled downtimes from the "100%" then hosts with actual downtime periods could get an availability for more then 100%. This has been fixed. The Settings ignore and honor were not affected. Also not the display of absolute time values. --- .werks/1076 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1076 b/.werks/1076 new file mode 100644 index 0000000..51d6046 --- /dev/null +++ b/.werks/1076 @@ -0,0 +1,12 @@ +Title: Fix wrong percentual host availability > 100% when excluding downtimes +Level: 2 +Component: reporting +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1406215992 + +When you chose to exclude scheduled downtimes from the "100%" then hosts with +actual downtime periods could get an availability for more then 100%. This has +been fixed. The Settings ignore and honor were not affected. Also +not the display of absolute time values. diff --git a/ChangeLog b/ChangeLog index aa916c2..c5b4196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... + * 1076 FIX: Fix wrong percentual host availability > 100% when excluding downtimes... Event Console: * 1040 FIX: Avoid sporadic errors when checking event state in Event Console... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 58b48c5..ec12741 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -754,9 +754,9 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): elif s == "host_down": s = avoptions["state_grouping"]["host_down"] - timeline_rows.append((span, s)) total_duration += span["duration"] if consider: + timeline_rows.append((span, s)) considered_duration += span["duration"] # Now merge consecutive rows with identical state

10 years, 1 month

Check_MK Git: check_mk: 641 FIX windows inventory: moved encoding from checks to windows agent plugin

by Goetz Golla

Module: check_mk Branch: master Commit: b9484493bfcca550d63458dddac937bc6c748375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9484493bfcca5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:28:31 2014 +0200 641 FIX windows inventory: moved encoding from checks to windows agent plugin --- .werks/641 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 3 ++- inventory/win_bios | 1 - inventory/win_disks | 1 - inventory/win_os | 2 +- inventory/win_reg_uninstall | 8 ++++---- inventory/win_system | 1 - inventory/win_video | 1 - inventory/win_wmi_software | 6 +++--- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.werks/641 b/.werks/641 new file mode 100644 index 0000000..f33c864 --- /dev/null +++ b/.werks/641 @@ -0,0 +1,8 @@ +Title: windows inventory: moved encoding from checks to windows agent plugin +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1406210953 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 68f6b22..aa916c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0... + * 0641 FIX: windows inventory: moved encoding from checks to windows agent plugin 1.2.5i4: diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 8d33bb7..1bb89b0 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -1,3 +1,4 @@ +[Console]::OutputEncoding = [System.Text.Encoding]::UTF8 $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp @@ -14,7 +15,7 @@ If (Test-Path $timestamp){ # exit if timestamp to young if ( $filedate -gt $earlier ) { exit } } - # create new timestamp file +# create new timestamp file New-Item $timestamp -type file -force | Out-Null # calculate unix timestamp diff --git a/inventory/win_bios b/inventory/win_bios index 2840260..c48f50d 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -44,7 +44,6 @@ def inv_win_bios(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "BIOSVersion": bios_version = value elif varname == "SMBIOSBIOSVersion": diff --git a/inventory/win_disks b/inventory/win_disks index d19e431..e056500 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -63,7 +63,6 @@ def inv_win_disks(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "Manufacturer": array["vendor"] = value elif varname == "InterfaceType": diff --git a/inventory/win_os b/inventory/win_os index 0d0a6ab..37c4439 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -32,7 +32,7 @@ def inv_win_os(info): node = inv_tree("software.os.") line = info[0] if len(line) == 6: - node["name"] = line[1].decode("cp437") + node["name"] = line[1] node["kernel_version"] = line[2] if line[3] == "64-Bit": node["arch"] = "x86_64" diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 78fe197..022d85d 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -37,10 +37,10 @@ def inv_win_reg_uninstall(info): install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) entry = { - "name" : pacname.decode("cp437"), - "version" : version.decode("cp437"), - "vendor" : publisher.decode("cp437"), - "summary" : display_name.decode("cp437"), + "name" : pacname, + "version" : version, + "vendor" : publisher, + "summary" : display_name, "install_date" : install_date, "size" : estimated_size, "package_type" : "reg_uninstall", diff --git a/inventory/win_system b/inventory/win_system index b00f7fb..5c232d1 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -40,7 +40,6 @@ def inv_win_system(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "SerialNumber": node["serial"] = value elif varname == "Manufacturer": diff --git a/inventory/win_video b/inventory/win_video index 5238a33..4eebf19 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -42,7 +42,6 @@ def inv_win_video(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "Name": array["name"] = value elif varname == "DriverVersion": diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index aa7cc76..496321f 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -44,9 +44,9 @@ def inv_win_wmi_software(info): install_date = int(time.mktime(time.strptime(dat, "%Y%m%d"))) entry = { - "name" : pacname.decode("cp437"), - "version" : version.decode("cp437"), - "vendor" : vendor.decode("cp437"), + "name" : pacname, + "version" : version, + "vendor" : vendor, "install_date" : install_date, "package_type" : "wmi", }

10 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014