Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: Multisite: avoid warning in apache log

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad81f67e81ea922aad6eb5e5ed85e10a36adfbd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad81f67e81ea92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 16:03:57 2011 +0200 Multisite: avoid warning in apache log --- web/htdocs/sidebar.py | 3 +-- web/htdocs/views.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 45e1f16..24efa14 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -36,10 +36,9 @@ loaded_with_language = False sidebar_snapins = {} def load_plugins(): + global loaded_with_language if loaded_with_language == current_language: return - - global loaded_with_language loaded_with_language = current_language # Load all snapins diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d1685fe..ffa2a19 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -51,10 +51,9 @@ multisite_painter_options = {} # Load all view plugins def load_plugins(): + global loaded_with_language if loaded_with_language == current_language: return - - global loaded_with_language loaded_with_language = current_language config.declare_permission_section("action", "Commands on Objects")

13 years, 1 month

Check_MK Git: check_mk: Multisite: improve layout of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2925a1f533cc178f90780d0002fcaebd33c462a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2925a1f533cc17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 16:03:02 2011 +0200 Multisite: improve layout of filters --- web/plugins/views/filters.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 6bb8060..ab0c318 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -380,7 +380,8 @@ class FilterTime(Filter): html.write("<nobr>") html.number_input(htmlvar, 0, 2) html.write(" %s</nobr> " % n) - html.write("<br>\n") + if config.filter_columns > 1: + html.write("<br>\n") current = html.var(self.name, "since") for t in [ "before", "since" ]: html.radiobutton(self.name, t, current == t, t + "   ") @@ -457,6 +458,10 @@ class FilterLogClass(Filter): else: defval = "on" html.write("<table cellspacing=0 cellpadding=0>") + if config.filter_columns == 1: + num_cols = 4 + else: + num_cols = 2 col = 1 for l, c in self.log_classes: if col == 1: @@ -465,12 +470,12 @@ class FilterLogClass(Filter): html.checkbox("logclass%d" % l, defval) html.write(c) html.write("</td>") - if col == 2: + if col == num_cols: html.write("</tr>\n") col = 1 else: col += 1 - if col == 1: + if col < num_cols: html.write("<td></td></tr>") html.write("</table>\n")

13 years, 1 month

Check_MK Git: check_mk: Multisite painters for perfdata: keep unit intact

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad0692e6652ac6bc75289a90a7dc4f743404da7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad0692e6652ac6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 13:51:43 2011 +0200 Multisite painters for perfdata: keep unit intact --- web/plugins/views/painters.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 57c13ef..91b4a0f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -453,8 +453,9 @@ def paint_perfdata_nth_value(row, n): return "", "" # too few values in perfdata varname, rest = parts[n].split("=") number = rest.split(';')[0] - while len(number) > 0 and not number[-1].isdigit(): - number = number[:-1] + # Remove unit. Why should we? + # while len(number) > 0 and not number[-1].isdigit(): + # number = number[:-1] return "", number except Exception, e: return "", str(e)

13 years, 1 month

Check_MK Git: check_mk: painter for n'th perf-data: check number of columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd85a122aaad8d106f21effd39242a5602900538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd85a122aaad8d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 13:22:50 2011 +0200 painter for n'th perf-data: check number of columns --- web/plugins/views/painters.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 492d548..57c13ef 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -449,6 +449,8 @@ def paint_perfdata_nth_value(row, n): perfdata = row["service_perf_data"] try: parts = perfdata.split() + if len(parts) <= n: + return "", "" # too few values in perfdata varname, rest = parts[n].split("=") number = rest.split(';')[0] while len(number) > 0 and not number[-1].isdigit():

13 years, 1 month

Check_MK Git: check_mk: AIX agent now simulates <<<netctr>>> output ( by Jörg Linge)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f8790053ef39a7b2d0c167ec87230c109736e816 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8790053ef39a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 12:04:24 2011 +0200 AIX agent now simulates <<<netctr>>> output (by Jörg Linge) --- ChangeLog | 1 + agents/check_mk_agent.aix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 516e448..47ef037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Checks & Agents: * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. + * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) Multisite: * Introduced basic infrastructure for multilanguage support in Multisite diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 2da06e9..7a5576e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -68,6 +68,24 @@ procs=`vmstat|grep lcpu|sed -e 's;.* lcpu=$[[:digit:]]\{1,2\}$ .*;\1;'` echo $load 1/$ps $$ $procs +# The following section has been contributed by Joerg Linge +echo "<<<netctr>>>" +date +%s +for ent in $(ifconfig -a | grep '^en' | cut -d ":" -f 1) +do + bytes=$(entstat $ent | grep ^Bytes: | awk '{printf "%s %s", $2, $4}') + bytes_rx=$(echo $bytes | awk '{print $2'}) + bytes_tx=$(echo $bytes | awk '{print $1'}) + packets=$(entstat $ent | grep ^Packets: | awk '{printf "%s %s", $2, $4}') + packets_rx=$(echo $packets | awk '{print $2'}) + packets_tx=$(echo $packets | awk '{print $1'}) + errors_tx=$(entstat $ent | grep 'Transmit Errors:' | awk '{print $3'}) + errors_rx=$(entstat $ent | grep 'Receive Errors:' | awk '{print $6'}) + echo "$ent $bytes_rx $packets_rx $errors_rx 0 0 0 0 0 $bytes_tx $packets_tx $errors_tx 0 0 0 0 0" +done + + + if cd $PLUGINSDIR 2>/dev/null then for skript in $(ls)

13 years, 1 month

Check_MK Git: check_mk: FIX: sort output of cmk --list-hosts alphabetically

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e242b9ff9834f514e690a14d287486136cc0ac57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e242b9ff9834f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 11:02:26 2011 +0200 FIX: sort output of cmk --list-hosts alphabetically --- ChangeLog | 3 +++ modules/check_mk.py | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 419ceef..d36fb1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.1.11i2: + Core, Setup, etc.: + * FIX: sort output of cmk --list-hosts alphabetically + Multisite: * Introduced basic infrastructure for multilanguage support in Multisite diff --git a/modules/check_mk.py b/modules/check_mk.py index 11671b9..589b69d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2752,6 +2752,7 @@ def list_all_hosts(hostgroups): if hg in hostgroups: hostlist.append(hn) break + hostlist.sort() return hostlist # Same for host tags, needed for --list-tag

13 years, 1 month

Check_MK Git: check_mk: brocade_port: ISL and port name in svcdescription

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d370ad75e7d63b5a3c1cbe4ada9e261f796ea66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d370ad75e7d63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 11:17:11 2011 +0200 brocade_port: ISL and port name in svcdescription --- ChangeLog | 4 +++ checks/brocade_fcport | 42 ++++++++++++++++++++++++++------------ checks/fc_brocade_port_detailed | 3 +- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d36fb1a..516e448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically + + Checks & Agents: + * brocade_port: check for Brocade FC ports has been rewritten with + lots of new features. Multisite: * Introduced basic infrastructure for multilanguage support in Multisite diff --git a/checks/brocade_fcport b/checks/brocade_fcport index d40c925..52f6cf8 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -26,7 +26,8 @@ # lookup tables for check implementation -brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] +brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', + 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] brocade_fcport_opstates = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] brocade_fcport_admstates = [ '', 'online', 'offline', 'testing', 'faulty' ] brocade_fcport_speed = [ '', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', ] @@ -36,6 +37,8 @@ brocade_fcport_speed = [ '', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', brocade_fcport_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, ] brocade_fcport_inventory_opstates = [ 1, 2, 3, 4, ] brocade_fcport_inventory_admstates = [ 1, 3, 4, ] +brocade_fcport_inventory_use_portname = True # use swFCPortName as part of service description +brocade_fcport_inventory_show_isl = True # add "ISL" to service description for interswitch links check_default_levels["brocade_fcport"] = "brocade_fcport_default_levels" @@ -45,13 +48,19 @@ factory_settings["brocade_fcport_default_levels"] = { "rxencoutframes": (3.0, 20.0), "notxcredits": (3.0, 20.0), "c3discards": (3.0, 20.0), - "assumed_speed": 2.0, } # used, if speed not available in SNMP data + "assumed_speed": 2.0, # used, if speed not available in SNMP data +} # Helper function for computing item from port number -def brocade_fcport_getitem(ports, index): +def brocade_fcport_getitem(ports, index, portname, is_isl): int_len = str(len(str(len(ports)))) - return ("%0" + int_len + "d") % (index - 1) + itemname = ("%0" + int_len + "d") % (index - 1) + if is_isl and brocade_fcport_inventory_show_isl: + itemname += " ISL" + if portname.strip() and brocade_fcport_inventory_use_portname: + itemname += " " + portname.strip() + return itemname def inventory_brocade_fcport(checkname, info): @@ -64,17 +73,19 @@ def inventory_brocade_fcport(checkname, info): isl_ports = dict(info[1]) for item in info[0]: - if len(item) == 13: + if len(item) == 14: index = int(item[0]) phystate = int(item[1]) opstate = int(item[2]) admstate = int(item[3]) + portname = item[13] + is_isl = item[0] in isl_ports if admstate in brocade_fcport_inventory_admstates and \ opstate in brocade_fcport_inventory_opstates and \ phystate in brocade_fcport_inventory_phystates: - inventory.append(( brocade_fcport_getitem(info[0], index), + inventory.append(( brocade_fcport_getitem(info[0], index, portname, is_isl), '{ "phystate": %d, "opstate": %d, "admstate": %d }' % (phystate, opstate, admstate) )) @@ -82,16 +93,19 @@ def inventory_brocade_fcport(checkname, info): def check_brocade_fcport(item, params, info): - - portinfo = [ line for line in info[0] if brocade_fcport_getitem(info[0], int(line[0])) == item ] + # Accept item, even if port name or ISL state has changed + item_index = int(item.split()[0]) + portinfo = [ line for line in info[0] if int(line[0]) == item_index ] if len(portinfo) < 1: return (3, "UNKOWN - Port not found in SNMP data") - + + isl_ports = dict(info[1]) + # Prepare data, convert to int index, phystate, opstate, admstate, txwords, rxwords, txframes, rxframes, \ - notxcredits, rxcrcs, rxencoutframes, c3discards, speed = map(int, portinfo[0]) - isl_ports = dict(info[1]) + notxcredits, rxcrcs, rxencoutframes, c3discards, speed = map(int, portinfo[0][:-1]) + summarystate = 0 output = [] perfdata = [] @@ -114,7 +128,6 @@ def check_brocade_fcport(item, params, info): # convert gbit netto link-rate to Byte/s (8/10 enc) wirespeed = gbit * 0.8 * 1000000.0 / 8 - # Now check rates of various error counters this_time = time.time() try: @@ -281,6 +294,7 @@ snmp_info['brocade_fcport'] = [ 26, # swFCPortRxEncOutFrs 28, # swFCPortC3Discards 35, # swFCPortSpeed + 36, # swFCPortName (not supported by all devices) ]), # Information about Inter-Switch-Links (contains baud rate of port) @@ -291,4 +305,6 @@ snmp_info['brocade_fcport'] = [ ] snmp_scan_functions['brocade_fcport'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") + lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") + diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed index 8eaa7b7..a56fc7c 100644 --- a/checks/fc_brocade_port_detailed +++ b/checks/fc_brocade_port_detailed @@ -223,5 +223,6 @@ snmp_info['fc_brocade_port_detailed'] = [ ] snmp_scan_functions['fc_brocade_port_detailed'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1.") + lambda oid: False # prefer new brocade_fcport + # lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1.")

13 years, 1 month

Check_MK Git: check_mk: Make OIDs in two checks begin with .

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: efd458fcdf153fbb6e6767d110e800d3682ae72d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efd458fcdf153f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 10:26:46 2011 +0200 Make OIDs in two checks begin with . --- checks/brocade_fcport | 2 +- checks/strem1_sensors | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/brocade_fcport b/checks/brocade_fcport index ba99726..d40c925 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -267,7 +267,7 @@ check_info['brocade_fcport'] = (check_brocade_fcport, "Port %s", 1, inventory_br snmp_info['brocade_fcport'] = [ - ( "1.3.6.1.4.1.1588.2.1.1.1.6.2.1",[ + ( ".1.3.6.1.4.1.1588.2.1.1.1.6.2.1",[ 1, # swFCPortIndex 3, # swFCPortPhyState 4, # swFCPortOpStatus diff --git a/checks/strem1_sensors b/checks/strem1_sensors index 8bb9871..f54618c 100644 --- a/checks/strem1_sensors +++ b/checks/strem1_sensors @@ -95,8 +95,8 @@ check_info['strem1_sensors'] = ( check_strem1_sensors, "Sensor - %s", 1, invento #9, # group1WetDataStr #10, # group1WetDataInt snmp_info['strem1_sensors'] = [ - ("1.3.6.1.4.1.16174.1.1.3.2.3", [1]), - ("1.3.6.1.4.1.16174.1.1.3.3", [ # SENSATRONICS-EM1::measurementSystem + (".1.3.6.1.4.1.16174.1.1.3.2.3", [1]), + (".1.3.6.1.4.1.16174.1.1.3.3", [ # SENSATRONICS-EM1::measurementSystem 1, # First group 2, # Second group 3, # Third group

13 years, 1 month

Check_MK Git: check_mk: --snmpwalk now always prefixes OIDs with dot

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc8e9a36dba89db07a38968c4eeeaa1bbd4206dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc8e9a36dba89d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 10:31:27 2011 +0200 --snmpwalk now always prefixes OIDs with dot --- modules/check_mk.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 4fc165e..11671b9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2822,8 +2822,8 @@ def do_snmpwalk_on(hostname, filename): while value[-1] != '"': value += f.readline().strip() - if oid.startswith("."): - oid = oid[1:] + if not oid.startswith("."): + oid = "." + oid oids.append(oid) values.append(value) for oid, value in zip(oids, values):

13 years, 1 month

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: e7c18a613c6fdbb7d6c193192e52600978c21d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7c18a613c6fdb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 16 10:31:31 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011