Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1645 Added basic kernel section to FreeBSD agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 1270a651efef0bc1a69debdf7b2624eb22762045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1270a651efef0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:58:20 2014 +0100 #1645 Added basic kernel section to FreeBSD agent Thanks to Andreas Pflug for providing the patch. --- .werks/1645 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 15 ++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/1645 b/.werks/1645 new file mode 100644 index 0000000..318bc74 --- /dev/null +++ b/.werks/1645 @@ -0,0 +1,9 @@ +Title: Added basic kernel section to FreeBSD agent +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417697860 +Class: feature + +Thanks to Andreas Pflug for providing the patch. diff --git a/ChangeLog b/ChangeLog index 6cafb47..0cc98f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab... * 1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller... * 1631 juniper_bgp_state: check now detects and supports more differen device models... + * 1645 Added basic kernel section to FreeBSD agent... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 2249431..5ce92aa 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -203,13 +203,18 @@ fi # Soft-RAID echo '<<<freebsd_geom_mirrors>>>' - gmirror status | grep -v ^Name - +gmirror status | grep -v ^Name # Performancecounter Kernel -#echo '<<<kernel>>>' -#date +%s -#cat /proc/vmstat /proc/stat +echo "<<<kernel>>>" +date +%s +forks=`sysctl -n vm.stats.vm.v_forks` +vforks=`sysctl -n vm.stats.vm.v_vforks` +rforks=`sysctl -n vm.stats.vm.v_rforks` +kthreads=`sysctl -n vm.stats.vm.v_kthreads` +echo "cpu" `sysctl -n kern.cp_time | awk ' { print $1" "$2" "$3" "$5" "$4 } '` +echo "ctxt" `sysctl -n vm.stats.sys.v_swtch` +echo "processes" `expr $forks + $vforks + $rforks + $kthreads` # Network device statistics (Packets, Collisions, etc) # only the "Link/Num" interface has all counters.

9 years, 9 months

Check_MK Git: check_mk: #1644 FIX Fixed matching dynamic number of regex match groups

by Lars Michelsen

Module: check_mk Branch: master Commit: e5c9b4be36fe0788987092fc594640622abeb786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c9b4be36fe07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:53:57 2014 +0100 #1644 FIX Fixed matching dynamic number of regex match groups Regexes and rewrites like this here lead into an exception when matching: Regex: foo(bar|baz(abc|xyz)) (stuff to match and reference) Rewrite: Service foo\1 said: \3 LogLine: foobar asasdsadxxxxx --- .werks/1644 | 13 +++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/1644 b/.werks/1644 new file mode 100644 index 0000000..949d0e8 --- /dev/null +++ b/.werks/1644 @@ -0,0 +1,13 @@ +Title: Fixed matching dynamic number of regex match groups +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1417697483 +Class: fix + +Regexes and rewrites like this here lead into an exception when matching: + +Regex: foo(bar|baz(abc|xyz)) (stuff to match and reference) +Rewrite: Service foo\1 said: \3 +LogLine: foobar asasdsadxxxxx diff --git a/ChangeLog b/ChangeLog index c97f8b2..cafe1e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -193,6 +193,7 @@ * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps * 1643 FIX: Improved error handling of exceptions when processing log lines + * 1644 FIX: Fixed matching dynamic number of regex match groups... Livestatus: * 1613 FIX: Fixed invalid json format in Stats query with requested heaeders... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 1850ece..2d13f05 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -199,7 +199,12 @@ def match(pattern, text, complete = True): # Assume compiled regex m = pattern.search(text) if m: - return m.groups() + groups = m.groups() + if None in groups: + # Remove None from result tuples and replace it with empty strings + return tuple([g != None and g or '' for g in groups]) + else: + return groups else: return False

9 years, 9 months

Check_MK Git: check_mk: #1643 FIX Improved error handling of exceptions when processing log lines

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e135bb079c808321eadc7920b98a641bb1a5550 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e135bb079c808… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 13:46:43 2014 +0100 #1643 FIX Improved error handling of exceptions when processing log lines --- .werks/1643 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1643 b/.werks/1643 new file mode 100644 index 0000000..42d4d35 --- /dev/null +++ b/.werks/1643 @@ -0,0 +1,9 @@ +Title: Improved error handling of exceptions when processing log lines +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1417697183 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 20b59d6..c97f8b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 1169 Added host state type filter to "recent event history" view * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps + * 1643 FIX: Improved error handling of exceptions when processing log lines Livestatus: * 1613 FIX: Fixed invalid json format in Stats query with requested heaeders... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 8e8a53c..1850ece 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1337,7 +1337,10 @@ class EventServer: line = line.decode("latin-1") if line: - self.process_raw_data(self.process_line, (line, address)) + try: + self.process_raw_data(self.process_line, (line, address)) + except Exception, e: + log('Exception handling a log line (skipping this one): %s' % format_exception()) def do_housekeeping(self): with lock_eventstatus:

9 years, 9 months

Check_MK Git: check_mk: #1632 FIX hr_fs: remove ugly "mounted on:" information appearing on Juniper devices

by Mathias Kettner

Module: check_mk Branch: master Commit: 2aa0c2d97c0c8af704d21a42c1d001d3a973d9f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2aa0c2d97c0c8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 13:49:14 2014 +0100 #1632 FIX hr_fs: remove ugly "mounted on:" information appearing on Juniper devices --- .werks/1632 | 9 +++++++++ ChangeLog | 1 + checks/hr_fs | 17 ++++++++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.werks/1632 b/.werks/1632 new file mode 100644 index 0000000..6a165f2 --- /dev/null +++ b/.werks/1632 @@ -0,0 +1,9 @@ +Title: hr_fs: remove ugly "mounted on:" information appearing on Juniper devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417697323 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1491ad2..d791ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted... * 1623 FIX: hp_proliant_mem: support for some yet unhandled status situations * 1640 FIX: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds + * 1632 FIX: hr_fs: remove ugly "mounted on:" information appearing on Juniper devices Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/hr_fs b/checks/hr_fs index 0e9a0f5..63dc752 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -24,22 +24,31 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -check_includes['hr_fs'] = [ "df.include" ] +# Juniper devices put information about the device into the +# field where we expect the mount point. Ugly. Remove that crap. +def fix_hr_fs_mountpoint(mp): + mp = snmp_decode_string(mp) + if "mounted on:" in mp: + return mp.rsplit(":",1)[-1].strip() + else: + return mp + def inventory_hr_fs(info): mplist = [] for hrtype, hrdescr, hrunits, hrsize, hrused in info: - hrdescr = snmp_decode_string(hrdescr) + hrdescr = fix_hr_fs_mountpoint(hrdescr) if hrtype in [ ".1.3.6.1.2.1.25.2.1.4" ] and \ hrdescr not in inventory_df_exclude_mountpoints and \ saveint(hrsize) != 0: mplist.append(hrdescr) return df_inventory(mplist) + def check_hr_fs(item, params, info): fslist = [] for hrtype, hrdescr, hrunits, hrsize, hrused in info: - hrdescr = snmp_decode_string(hrdescr) + hrdescr = fix_hr_fs_mountpoint(hrdescr) if "patterns" in params or item == hrdescr: unit_size = saveint(hrunits) hrsize = saveint(hrsize) @@ -57,6 +66,7 @@ def check_hr_fs(item, params, info): return df_check_filesystem_list(item, params, fslist) + check_info["hr_fs"] = { 'check_function': check_hr_fs, 'inventory_function': inventory_hr_fs, @@ -74,4 +84,5 @@ check_info["hr_fs"] = { not not oid('.1.3.6.1.2.1.25.1.1.0'), 'group': 'filesystem', 'default_levels_variable': 'filesystem_default_levels', + 'includes': [ "df.include" ], }

9 years, 9 months

Check_MK Git: check_mk: #1631 juniper_bgp_state: check now detects and supports more differen device models

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a17bf4af965b72f2d9760b2cb4c54913e893dc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a17bf4af965b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 13:39:15 2014 +0100 #1631 juniper_bgp_state: check now detects and supports more differen device models It would only detect MX5, but now works also for other devices. Thanks to Konstantin Orlov. --- .werks/1631 | 9 +++++++++ ChangeLog | 1 + checks/juniper_bgp_state | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1631 b/.werks/1631 new file mode 100644 index 0000000..8591a72 --- /dev/null +++ b/.werks/1631 @@ -0,0 +1,9 @@ +Title: juniper_bgp_state: check now detects and supports more differen device models +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417696679 +Class: feature + +It would only detect MX5, but now works also for other devices. Thanks to Konstantin Orlov. diff --git a/ChangeLog b/ChangeLog index 5dee200..1491ad2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 1627 megaraid_ldisks: Warn if current cache or write policy differs from logical drive default policy... * 1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab... * 1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller... + * 1631 juniper_bgp_state: check now detects and supports more differen device models... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index a6f4fce..4c6d030 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -77,6 +77,6 @@ check_info["juniper_bgp_state"] = { 2, # jnxBgpM2PeerState 3 ]), # jnxBgpM2PeerStatus # (like operational status) - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2.90"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), "has_perfdata" : False, }

9 years, 9 months

Check_MK Git: check_mk: Fix exception with stored walks and precompiled checks (Nagios core)

by Mathias Kettner

Module: check_mk Branch: master Commit: 119f19d23ced1626f5129254fa4bae57c07a2daa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=119f19d23ced16… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 13:37:57 2014 +0100 Fix exception with stored walks and precompiled checks (Nagios core) --- modules/snmp.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/snmp.py b/modules/snmp.py index 4e72000..d5c0050 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -369,7 +369,10 @@ def get_stored_snmpwalk(hostname, oid): o = o[1:] if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: - value = agent_simulator_process(parts[1]) + try: + value = agent_simulator_process(parts[1]) + except: + value = parts[1] # agent simulator missing in precompiled mode else: value = "" # Fix for missing starting oids

9 years, 9 months

Check_MK Git: check_mk: Updated Werk title

by Mathias Kettner

Module: check_mk Branch: master Commit: 335aa295695a8cb87f48a14527247e16982a2dfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=335aa295695a8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 13:27:32 2014 +0100 Updated Werk title --- .werks/1452 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1452 b/.werks/1452 index 56bbd2f..70852fa 100644 --- a/.werks/1452 +++ b/.werks/1452 @@ -1,4 +1,4 @@ -Title: solaris hardware/software inventory added +Title: Solaris HW/SW-Inventory added Level: 2 Component: inv Compatible: compat diff --git a/ChangeLog b/ChangeLog index 87f38cd..5dee200 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,7 +199,7 @@ HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! - * 1452 solaris hardware/software inventory added... + * 1452 Solaris HW/SW-Inventory added... * 1547 FIX: win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003)... * 1552 FIX: mk_inventory.ps1: fix garbled or missing entries by removing bogus binary zeroes...

9 years, 9 months

Check_MK Git: check_mk: Remove bug path of postconf in check_mk_agent.linux

by Mathias Kettner

Module: check_mk Branch: master Commit: f81d20bdd188e5048c90d96356877833f7cdb5a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f81d20bdd188e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 13:26:03 2014 +0100 Remove bug path of postconf in check_mk_agent.linux --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 73f103a..d381007 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -501,7 +501,7 @@ fi # Only handle the last 6 lines (includes the summary line at the bottom and # the last message in the queue. The last message is not used at the moment # but it could be used to get the timestamp of the last message. -if type postconf ; then +if type postconf >/dev/null ; then echo '<<<postfix_mailq>>>' postfix_queue_dir=$(postconf -h queue_directory) postfix_count=$(find $postfix_queue_dir/deferred -type f | wc -l)

9 years, 9 months

Check_MK Git: check_mk: #1452 solaris hardware/software inventory added

by Goetz Golla

Module: check_mk Branch: master Commit: e617e18f010bfd893002f3c2ad920518fb9c5dba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e617e18f010bfd… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 4 13:23:15 2014 +0100 #1452 solaris hardware/software inventory added The inventory agent plugin for Solaris and 6 inventory checks have been added. Many thanks to Christian Dewald and Philipp Lemke for the contribution. --- .werks/1452 | 11 ++++ ChangeLog | 1 + agents/plugins/mk_inventory.solaris | 71 +++++++++++++++++++++ inventory/solaris_mem | 50 +++++++++++++++ inventory/solaris_pkginfo | 93 +++++++++++++++++++++++++++ inventory/solaris_prtdiag | 118 +++++++++++++++++++++++++++++++++++ inventory/solaris_prtpicl | 53 ++++++++++++++++ inventory/solaris_psrinfo | 47 ++++++++++++++ inventory/solaris_uname | 41 ++++++++++++ 9 files changed, 485 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e617e18f01…

9 years, 9 months

Check_MK Git: check_mk: #1639 FIX Interfaces with speed more than 10GBit/ s can now be configured correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 26fc40afdced8f1ad8be122422a4251e18edd58b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26fc40afdced8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 11:43:33 2014 +0100 #1639 FIX Interfaces with speed more than 10GBit/s can now be configured correctly --- .werks/1639 | 7 +++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.werks/1639 b/.werks/1639 new file mode 100644 index 0000000..26a842e --- /dev/null +++ b/.werks/1639 @@ -0,0 +1,7 @@ +Title: Interfaces with speed more than 10GBit/s can now be configured correctly +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417689631 +Class: fix diff --git a/ChangeLog b/ChangeLog index 32a6929..8eb9264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 1620 FIX: Fixed exception during host renaming when host has no perfdata * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... * 1637 FIX: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set + * 1639 FIX: Interfaces with speed more than 10GBit/s can now be configured correctly Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 131718e..a8896ff 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -292,7 +292,7 @@ class Integer(ValueSpec): return text def validate_datatype(self, value, varprefix): - if type(value) != int: + if type(value) not in [ int, long ]: raise MKUserError(varprefix, _("The value %r has the wrong type %s, but must be of type int") % (value, type_name(value))) @@ -1085,7 +1085,7 @@ class Float(Integer): def validate_datatype(self, value, varprefix): if type(value) != float and not \ - (type(value) == int and self._allow_int): + (type(value) not in [ int, long ] and self._allow_int): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % (value, type_name(value), self._allow_int and _(" or int") or ""))

9 years, 9 months

← Newer
1
...
34
35
36
37
38
39
40
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014