Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: windows agent, winperf counter: try to find counter name in english registry

by Andreas Boesl

Module: check_mk Branch: master Commit: 8fb7d9583cf9d8ea7a589772307e3654996386c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fb7d9583cf9d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Aug 22 16:05:55 2014 +0200 windows agent, winperf counter: try to find counter name in english registry if it does not exist in the CurrentLanguage key --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 48 ++++++++++------------ agents/windows/check_mk_agent.exe | Bin 178176 -> 177664 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 177664 bytes agents/windows/install_agent-64.exe | Bin 159961 -> 159952 bytes agents/windows/install_agent.exe | Bin 156821 -> 156803 bytes 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index e1617e8..dd47563 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -57 +76 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b1933ac..5b050b7 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 349cabb..5e9778e 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e69808e..b49d335 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4651,17 +4651,15 @@ void determine_directories() snprintf(g_logwatch_statefile, sizeof(g_logwatch_statefile), "%s\\logstate.txt", g_agent_directory); } -int get_perf_counter_id(const char *counter_name) { - +int get_counter_id_from_lang(const char *language, const char *counter_name) +{ HKEY hKey; LONG result; TCHAR szValueName[300000]; DWORD dwcbData = sizeof(szValueName); - - // Determine the correct perflib key.. - // CurrentLanguage first - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\CurrentLanguage", REG_MULTI_SZ, KEY_READ, &hKey); + char regkey[512]; + snprintf(regkey, sizeof(regkey), "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\%s", language); + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, regkey, REG_MULTI_SZ, KEY_READ, &hKey); RegQueryValueEx( hKey, "Counter", @@ -4672,27 +4670,10 @@ int get_perf_counter_id(const char *counter_name) { ); RegCloseKey (hKey); - if (result != ERROR_SUCCESS) // nothing found, try english (009) as fallback - { - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009", REG_MULTI_SZ, KEY_READ, &hKey); - RegQueryValueEx( - hKey, - "Counter", - NULL, - NULL, - (LPBYTE) szValueName, - &dwcbData - ); - RegCloseKey (hKey); - if (result != ERROR_SUCCESS) - { - // Unable to open any perflib registry - return -1; - } + if (result != ERROR_SUCCESS) { + return -1; } - int length = 0; int last_ctr_id = 0; bool is_name = false; @@ -4716,6 +4697,21 @@ int get_perf_counter_id(const char *counter_name) { ptr_perf = szValueName + offset; is_name = !is_name; } + + return -1; +} + +int get_perf_counter_id(const char *counter_name) +{ + int counter_id; + // Try to find it in current language + if ((counter_id = get_counter_id_from_lang("CurrentLanguage", counter_name)) != -1) + return counter_id; + + // Try to find it in english + if ((counter_id = get_counter_id_from_lang("009", counter_name)) != -1) + return counter_id; + return -1; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e529788..4ac96e9 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e622182..f2dd030 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b002fa9..1e95b33 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 24c616e..778fd5a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 1 month

Check_MK Git: check_mk: mk_inventory: make interval configurable via mk_inventory.cfg

by Mathias Kettner

Module: check_mk Branch: master Commit: 195d283faaa47b5a3f4a402eb7404f70bd91f17a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=195d283faaa47b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 22 14:54:36 2014 +0200 mk_inventory: make interval configurable via mk_inventory.cfg --- agents/plugins/mk_inventory.linux | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index acbe5ed..8b7403f 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -1,7 +1,10 @@ #!/bin/bash -# Run and *send* only once every 4 hours -INTERVAL=14400 +# Run and *send* only once every __ seconds +. $MK_CONFDIR/mk_inventory.cfg 2>/dev/null || true + +# Default to four hours +INTERVAL=${INVENTORY_INTERVAL:-14400} FLAGFILE=$MK_CONFDIR/mk_inventory.last.$REMOTE LAST_RUN=$(stat -c %Y $FLAGFILE)

10 years, 1 month

Check_MK Git: check_mk: cisco_vss: detect non-operational ports

by Mathias Kettner

Module: check_mk Branch: master Commit: 63a7a9c380688c703eefbb7434e6daeeab38cbe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a7a9c380688c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 22 10:41:28 2014 +0200 cisco_vss: detect non-operational ports --- checks/cisco_vss | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/checks/cisco_vss b/checks/cisco_vss index 472aa4e..20ed465 100644 --- a/checks/cisco_vss +++ b/checks/cisco_vss @@ -80,7 +80,6 @@ cisco_vss_operstatus_names = { } def inventory_cisco_vss(info): - import pprint ; pprint.pprint(info) for switch_id, chassis_role in info[0]: if chassis_role in [ '2', '3' ]: # active, standby return [ (None, None) ] @@ -92,16 +91,22 @@ def check_cisco_vss(item, params, info): state = 2 else: state = 0 - yield state, "switch %s: %s" % (switch_id, cisco_vss_role_names[chassis_role]) - + yield state, "chassis %s: %s" % (switch_id, cisco_vss_role_names[chassis_role]) + yield 0, "%d VLS connections configured" % len(ports) - for core_switch_id, operstatus in ports: + for core_switch_id, operstatus, conf_portcount, op_portcount in ports: if operstatus == '1': state = 0 else: state = 2 - yield state, "port %s: %s" % (core_switch_id, cisco_vss_operstatus_names[operstatus]) + yield state, "core switch %s: VSL %s" % (core_switch_id, cisco_vss_operstatus_names[operstatus]) + + if conf_portcount == op_portcount: + state = 0 + else: + state = 2 + yield state, "%s/%s ports operational" % (op_portcount, conf_portcount) check_info["cisco_vss"] = { @@ -123,6 +128,8 @@ check_info["cisco_vss"] = { [ 2, # cvsVSLCoreSwitchID 3, # cvsVSLConnectOperStatus: up(1), down(2) + 5, # cvsVSLConfiguredPortCount + 6, # cvsVSLOperationalPortCount ] ), ],

10 years, 1 month

Check_MK Git: check_mk: Fixed dynamic parts of view titles for single context type views

by Lars Michelsen

Module: check_mk Branch: master Commit: 43695b4fd499a96f78e0fc74117660fc25dad1ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43695b4fd499a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 22 08:46:27 2014 +0200 Fixed dynamic parts of view titles for single context type views --- web/htdocs/views.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 26ca660..d8f2f1c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1396,12 +1396,16 @@ def view_title(view): extra_titles = [ ] datasource = multisite_datasources[view["datasource"]] tablename = datasource["table"] - # FIXME: What about single object context_types contextes? - used_filters = [ multisite_filters[fn] for fn in view["context"].keys() ] - for filt in used_filters: - heading = filt.heading_info(tablename) - if heading: - extra_titles.append(heading) + + context_type = visuals.context_types[view['context_type']] + if context_type['single']: + extra_titles = [ v for k, v in visuals.get_context_html_vars(view) ] + else: + used_filters = [ multisite_filters[fn] for fn in view["context"].keys() ] + for filt in used_filters: + heading = filt.heading_info(tablename) + if heading: + extra_titles.append(heading) title = _u(view["title"]) + " " + ", ".join(extra_titles)

10 years, 1 month

Check_MK Git: check_mk: mk_sap: another fix for continuing after an error

by Mathias Kettner

Module: check_mk Branch: master Commit: f92fa98b2ef2c553936ac55cf006f84652788fe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f92fa98b2ef2c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 17:44:46 2014 +0200 mk_sap: another fix for continuing after an error --- agents/plugins/.f12 | 7 +++++-- agents/plugins/mk_sap | 14 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/agents/plugins/.f12 b/agents/plugins/.f12 index 9c4a18e..2cdd4e4 100755 --- a/agents/plugins/.f12 +++ b/agents/plugins/.f12 @@ -1,3 +1,6 @@ #!/bin/bash -sudo mkdir -p /usr/lib/check_mk_agent/plugins -sudo install -m 755 * /usr/lib/check_mk_agent/plugins +SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} +# sudo mkdir -p /usr/lib/check_mk_agent/plugins +sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true +sudo install -m 755 * /omd/sites/$SITE/share/check_mk/agents/plugins diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index f2f32d6..dbade0a 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -56,6 +56,9 @@ except ImportError, e: '"/usr/sap/nwrfcsdk/lib" and run "ldconfig" afterwards.\n' ) sys.exit(1) + elif 'No module named sapnwrfc' in str(e): + sys.stderr.write("Missing the Python module sapnwfrc.\n") + sys.exit(1) else: raise @@ -355,11 +358,10 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): def connect(cfg): global conn try: - conn = None # make sure that conn is defined, even on an exception conn = sapnwrfc.base.rfc_connect(cfg) except sapnwrfc.RFCCommunicationError, e: sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) - + return login() @@ -452,7 +454,11 @@ def connect(cfg): logout() conn.close() -for entrie in cfg: - connect( entrie ) + +for entry in cfg: + try: + connect(entry) + except: + pass # Make sure that other entries are executed anyway sys.exit(0)

10 years, 1 month

Check_MK Git: check_mk: mk_sap: try to fix exception if first connection fails

by Mathias Kettner

Module: check_mk Branch: master Commit: 55c916526323c9a5adce2f4a908b03349feae2c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55c916526323c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 17:34:56 2014 +0200 mk_sap: try to fix exception if first connection fails --- agents/plugins/mk_sap | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index b0d9280..f2f32d6 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -355,6 +355,7 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): def connect(cfg): global conn try: + conn = None # make sure that conn is defined, even on an exception conn = sapnwrfc.base.rfc_connect(cfg) except sapnwrfc.RFCCommunicationError, e: sys.stderr.write('ERROR: Unable to connect (%s)\n' % e)

10 years, 1 month

Check_MK Git: check_mk: #0649 f5_bigip_pool: check now also prints the node names of down nodes

by Goetz Golla

Module: check_mk Branch: master Commit: 38f5a65129e32cad57e7b74157320e41be77adec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38f5a65129e32c… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 21 17:25:36 2014 +0200 #0649 f5_bigip_pool: check now also prints the node names of down nodes --- .werks/649 | 9 +++++++++ ChangeLog | 3 ++- checkman/f5_bigip_pool | 16 ++++++++++------ checks/f5_bigip_pool | 44 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/.werks/649 b/.werks/649 new file mode 100644 index 0000000..f52d520 --- /dev/null +++ b/.werks/649 @@ -0,0 +1,9 @@ +Title: f5_bigip_pool: check now also prints the node names of down nodes +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408634689 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a14fdb2..2c62e78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,9 +27,10 @@ * 1006 printer_pages: add Perf-O-Meter and PNP template * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... - * 0648 brocade_fcport: new speed calculation of isl_ports... * 1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting... * 1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches + * 0648 brocade_fcport: new speed calculation of isl_ports... + * 0649 f5_bigip_pool: check now also prints the node names of down nodes * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/f5_bigip_pool b/checkman/f5_bigip_pool index abae8dc..d39aef7 100644 --- a/checkman/f5_bigip_pool +++ b/checkman/f5_bigip_pool @@ -4,13 +4,17 @@ catalog: hw/network/f5 license: GPL distribution: check_mk description: - The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the - status of any load balancing pools. It gathers the number of loadbalancers backing the pool - and how many of those are working. It doesn't currently honor the 'MinUpMembers' parameter - that can be set to trigger actions for the pool if too many members fail. + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic + managers) for the status of any load balancing pools. It gathers the number + of loadbalancers backing the pool and how many of those are working. It + doesn't currently honor the 'MinUpMembers' parameter that can be set to + trigger actions for the pool if too many members fail. - It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 - devices. + It supports devices running the 9.0 and above releases of the F5 OS. It's + tested against 9.3 devices. + + If the number of down nodes is warn or crit, the names of the nodes are + also printed in the service output. examples: # Let the Pool named ABC on your first F5 be in WARNING state when it reaches 5 active members or in CRITICAL for anything between 3 and 0. diff --git a/checks/f5_bigip_pool b/checks/f5_bigip_pool index c81fc62..eafc323 100644 --- a/checks/f5_bigip_pool +++ b/checks/f5_bigip_pool @@ -39,14 +39,26 @@ f5_bigip_pool_default_levels = (2, 1) def inventory_f5_bigip_pool(checkname,info): # inventorize all pools and their member count inventory = [] - for line in info: + for line in info[0]: if line[0] != "": inventory.append((line[0],"f5_bigip_pool_default_levels")) return inventory +def f5_bigip_pool_get_down_members(info, item): + downs = [] + if len(info) < 2: + return + for line in info[1]: + if line[0] == item and line[2] != '4': + if re.match("\/\S*\/\S*", line[3]): + host = line[3].split("/")[2] + else: + host = line[3] + downs.append(host+":"+line[1]) + return downs def check_f5_bigip_pool(item, params, info): - for line in info: + for line in info[0]: if line[0] == item: warn, crit = params pool_act_members = int(line[1]) @@ -57,10 +69,14 @@ def check_f5_bigip_pool(item, params, info): state = 0 elif pool_act_members <= crit: state = 2 - message += " (Levels warn/crit below: %s/%s)" % ( warn, crit ) + message += " (warn/crit: %s/%s)" % ( warn, crit ) elif pool_act_members <= warn: state = 1 - message += " (Levels warn/crit below: %s/%s)" % ( warn, crit ) + message += " (warn/crit: %s/%s)" % ( warn, crit ) + + if pool_act_members < pool_def_members: + downs = f5_bigip_pool_get_down_members(info, item) + message += ", down nodes: %s" % ", ".join(downs) return state, message return 3, "unexpected Output from SNMP Agent" @@ -69,12 +85,20 @@ check_info["f5_bigip_pool"] = { 'check_function' : check_f5_bigip_pool, 'group' : 'f5_pools', 'inventory_function' : inventory_f5_bigip_pool, - 'service_description': 'Load Balancing Pool %s', - 'snmp_info': ('.1.3.6.1.4.1.3375.2.2.5.1.2.1', [ - 1, # ltmPoolEntry - 8, # ltmPoolActiveMemberCnt - 23, # ltmPoolMemberCnt - ]), + 'service_description' : 'Load Balancing Pool %s', + 'snmp_info' : [ + ('.1.3.6.1.4.1.3375.2.2.5.1.2.1', [ + 1, # ltmPoolEntry + 8, # ltmPoolActiveMemberCnt + 23, # ltmPoolMemberCnt + ]), + ('.1.3.6.1.4.1.3375.2.2.5.3.2.1', [ + 1, # ltmPoolMemberPoolName + 4, # ltmPoolMemberPort + 10, # ltmPoolMemberState + 19, # ltmPoolMemberNodeName + ]), + ], 'snmp_scan_function': \ lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(),

10 years, 1 month

Check_MK Git: check_mk: #1156 FIX Graphs in HTML mails are now sent again where they where missing

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a2f8a5567c882101aeb901d29a81930e7b9867b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a2f8a5567c882… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 21 16:19:16 2014 +0200 #1156 FIX Graphs in HTML mails are now sent again where they where missing A change from Tue Mar 4 prevented inclusion of PNP graphs in HTML mails in installations where the user "omdadmin" is not existant. This change fixes the problem and makes the graphs available again. --- .werks/1156 | 11 +++++++++++ ChangeLog | 5 ++++- notifications/mail | 3 +-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/1156 b/.werks/1156 new file mode 100644 index 0000000..485cc26 --- /dev/null +++ b/.werks/1156 @@ -0,0 +1,11 @@ +Title: Graphs in HTML mails are now sent again where they where missing +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1408630645 +Class: fix + +A change from Tue Mar 4 prevented inclusion of PNP graphs in HTML mails +in installations where the user "omdadmin" is not existant. This change +fixes the problem and makes the graphs available again. diff --git a/ChangeLog b/ChangeLog index a14fdb2..cc33960 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,9 +27,9 @@ * 1006 printer_pages: add Perf-O-Meter and PNP template * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... - * 0648 brocade_fcport: new speed calculation of isl_ports... * 1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting... * 1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches + * 0648 brocade_fcport: new speed calculation of isl_ports... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -68,6 +68,9 @@ * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + Notifications: + * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... + Event Console: * 1007 FIX: check_mkevents: fix case where events contain binary zeroes diff --git a/notifications/mail b/notifications/mail index ee136cf..8921317 100755 --- a/notifications/mail +++ b/notifications/mail @@ -324,8 +324,7 @@ def fetch_pnp_data(context, params): if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) - #return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() - return os.popen('REMOTE_USER="%s" php %s %s "%s"' % ('omdadmin', php_save_path, path, params)).read() + return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC']

10 years, 1 month

Check_MK Git: check_mk: views: Do not try to fetch a column named "site", it is no column

by Lars Michelsen

Module: check_mk Branch: master Commit: 787089df3abff0a423db0a7243ec7b0fe8f02184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787089df3abff0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 21 15:02:14 2014 +0200 views: Do not try to fetch a column named "site", it is no column --- web/htdocs/views.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bfb9c27..26ca660 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -835,6 +835,10 @@ def get_needed_columns(view, painters): linkview = available_views.get(v) if linkview: columns += multisite_datasources[view['datasource']]['idkeys'] + # The site attribute is no column. Filter it out here + if 'site' in columns: + columns.remove('site') + if len(entry) > 2 and entry[2]: tt = entry[2] columns += multisite_painters[tt]["columns"]

10 years, 1 month

Check_MK Git: check_mk: #0648 brocade_fcport: new speed calculation of isl_ports

by Goetz Golla

Module: check_mk Branch: master Commit: 4a3d81aca762df7cc4296ee7e569125b28d77490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a3d81aca762df… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 21 14:49:18 2014 +0200 #0648 brocade_fcport: new speed calculation of isl_ports Since Brocade firmware 7, the possible baud rate parameters of isl ports given in swNbBaudRate have been extended. To account for this the calculation of the real baud rates from swNbBaudRate has been updated. --- .werks/648 | 11 +++++++++++ ChangeLog | 2 +- checks/brocade_fcport | 15 ++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/648 b/.werks/648 new file mode 100644 index 0000000..7219e21 --- /dev/null +++ b/.werks/648 @@ -0,0 +1,11 @@ +Title: brocade_fcport: new speed calculation of isl_ports +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408625154 +Class: feature + +Since Brocade firmware 7, the possible baud rate parameters of isl ports given in swNbBaudRate have been +extended. To account for this the calculation of the real baud rates from swNbBaudRate has been updated. + diff --git a/ChangeLog b/ChangeLog index 5ed2703..61ca0d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 1006 printer_pages: add Perf-O-Meter and PNP template * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... + * 0648 brocade_fcport: new speed calculation of isl_ports... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -50,7 +51,6 @@ * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... WATO: - * 1095 New WATO Web-API: Now able to manage hosts via web automation calls * 1096 New WATO webservices: manage hosts via webinterface... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 6cecd89..32590e7 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -35,6 +35,19 @@ brocade_fcport_admstates = [ '', 'online', 'offline', 'testing', 'faulty' ] # Taken from swFCPortSpeed brocade_fcport_speed = [ 'unknown', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', 'unknown', '16Gbit' ] +# Taken from swNbBaudRate +isl_speed = { + "1": 0, # other (1) - None of the following. + "2": 0.155, # oneEighth (2) - 155 Mbaud. + "4": 0.266, #•quarter (4) - 266 Mbaud. + "8": 0.532, # half (8) - 532 Mbaud. + "16": 1, #•full (16) - 1 Gbaud. + "32": 2, # double (32) - 2 Gbaud. + "64": 4, # quadruple (64) - 4 Gbaud. + "128": 8, # octuple (128) - 8 Gbaud. + "256": 10, # decuple (256) - 10 Gbaud. + "512": 16, # sexdecuple (512) - 16 Gbaud +} # settings for inventory: which ports should be inventorized brocade_fcport_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, ] @@ -120,7 +133,7 @@ def check_brocade_fcport(item, params, info): # information in the normal table) isl_ports = dict(info[1]) if str(index) in isl_ports: - gbit = float(int(isl_ports.get(str(index))) / 16) + gbit = isl_speed.get( isl_ports.get( str(index) ) ) speedmsg = ("ISL at %.0fGbit/s" % gbit) else: # no ISL port if brocade_fcport_speed[speed] in [ "auto-Neg", "unknown" ]:

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits