Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: windows agent: no longer SEGFAULTs when started as service or run from command line without arguments

by Andreas Boesl

Module: check_mk Branch: master Commit: f75dcdd1af39beb9c5237d1dc538afccef0e1e73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f75dcdd1af39be… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 13 12:00:26 2015 +0200 windows agent: no longer SEGFAULTs when started as service or run from command line without arguments --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 182784 -> 182784 bytes agents/windows/check_mk_agent.msi | Bin 732160 -> 732160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182784 -> 182784 bytes agents/windows/install_agent-64.exe | Bin 178405 -> 178440 bytes agents/windows/install_agent.exe | Bin 159355 -> 159356 bytes 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a2ecc45..91b629b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -154 +156 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index ceea0fd..250c6b7 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 37e124e..88273ab 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 694ea22..ff245e9 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5078,7 +5078,7 @@ int main(int argc, char **argv) osv.dwOSVersionInfoSize = sizeof(osv); GetVersionEx(&osv); - if (!strcmp(argv[1], "adhoc") || !strcmp(argv[1], "test")) + if (argc > 1 && (!strcmp(argv[1], "adhoc") || !strcmp(argv[1], "test"))) determine_directories(true /* use working dir */); else determine_directories(false /* use registered dir */); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7d7387a..24cd874 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.msi b/agents/windows/check_mk_agent.msi index fd48c86..3ad8ba1 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f9f47f8..74d61a7 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 14cc188..c1d35b6 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 02aa8a6..607f59d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 1 month

Check_MK Git: check_mk: Again, and now hopefully final fix for availability on host/service group views

by Lars Michelsen

Module: check_mk Branch: master Commit: bb868d2739579764042abfa50349af1ced4e9483 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb868d27395797… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 13 12:59:00 2015 +0200 Again, and now hopefully final fix for availability on host/service group views --- web/htdocs/views.py | 8 ++++++++ web/htdocs/visuals.py | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 300ff4d..6971260 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -948,6 +948,14 @@ def show_view(view, show_heading = False, show_buttons = True, # have a hardcoded value are not changeable by the user show_filters = visuals.visible_filters_of_visual(view, use_filters) + # FIXME TODO HACK to make grouping single contextes possible on host/service infos + # Is hopefully cleaned up soon. + if view['datasource'] in ['hosts', 'services']: + if 'hostgroup' in view['single_infos']: + html.set_var('opthost_group', html.var('hostgroup')) + if 'servicegroup' in view['single_infos']: + html.set_var('optservice_group', html.var('servicegroup')) + # Now populate the HTML vars with context vars from the view definition. Hard # coded default values are treated differently: # diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index fc64769..3b4cda3 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -967,10 +967,6 @@ def visible_filters_of_visual(visual, use_filters): return show_filters -def apply_link_filter_vars_to_uri_vars(visual, info_keys, link_filters): - for src_key, dst_key in get_link_filter_names(visual, info_keys, link_filters): - html.set_var(dst_key, html.var(src_key)) - def add_context_to_uri_vars(visual, only_infos=None, only_count=False): if only_infos == None: only_infos = infos.keys() # all datasources! @@ -1322,14 +1318,6 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, break vars_values.append((var, val)) - # See get_link_filter_names() comment for details. TODO Hack for host/service - # views with single hostgroup context. Will be cleaned up soon. hopefully - if visual.get('datasource') in ['hosts', 'services']: - if 'hostgroup' in visual['single_infos']: - vars_values.append(('opthost_group', html.var('hostgroup'))) - if 'servicegroup' in visual['single_infos']: - vars_values.append(('optservice_group', html.var('servicegroup'))) - if not skip: # add context link to this visual. For reports we put in # the *complete* context, even the non-single one.

9 years, 1 month

Check_MK Git: check_mk: New checks for Cisco SRST - manpage still missing

by Mathias Kettner

Module: check_mk Branch: master Commit: b7adeb93a5d4ddffb23a3cb25481c84f3f9d4da7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7adeb93a5d4dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 13 11:26:33 2015 +0200 New checks for Cisco SRST - manpage still missing --- checks/cisco_srst.include | 87 +++++++++++++++++++++++++++++++++++++++ checks/cisco_srst_phones | 44 ++++++++++++++++++++ checks/cisco_srst_state | 53 ++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 21 ++++++++++ 4 files changed, 205 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b7adeb93a5…

9 years, 1 month

Check_MK Git: check_mk: #2270 windows agent: now able to add cached information into section headers

by Andreas Boesl

Module: check_mk Branch: master Commit: 867b26682e87549fd19bca0b17e3738699bc4480 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=867b26682e8754… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 13 10:33:02 2015 +0200 #2270 windows agent: now able to add cached information into section headers The windows agent now expands the section headers of plugin scripts with cached information, if applicable. For example, if you configure the windows_udpates plugin to be cached for one day the section header will now look like <tt><<<windows_updates:cached(143115035535:86400)>>></tt> instead of <tt><<<windows_updates>>></tt> For more information please have a look at werk #8243. --- .werks/2270 | 15 ++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 300032 -> 301056 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 300032 -> 301056 bytes agents/windows/check_mk_agent.cc | 61 ++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 182272 -> 182784 bytes agents/windows/check_mk_agent.msi | Bin 730624 -> 732160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182272 -> 182784 bytes agents/windows/install_agent-64.exe | Bin 177884 -> 178405 bytes agents/windows/install_agent.exe | Bin 158985 -> 159355 bytes 11 files changed, 73 insertions(+), 6 deletions(-) diff --git a/.werks/2270 b/.werks/2270 new file mode 100644 index 0000000..64a6494 --- /dev/null +++ b/.werks/2270 @@ -0,0 +1,15 @@ +Title: windows agent: now able to add cached information into section headers +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431505595 +Class: feature + +The windows agent now expands the section headers of plugin scripts +with cached information, if applicable. For example, if you configure +the windows_udpates plugin to be cached for one day the section header +will now look like <tt><<<windows_updates:cached(143115035535:86400)>>></tt> +instead of <tt><<<windows_updates>>></tt> + +For more information please have a look at werk #8243. diff --git a/ChangeLog b/ChangeLog index 15bf44d..dc087c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -174,6 +174,7 @@ * 2076 fortigate_cpu_base, fortigate_sessions_base: supports wider range of models... * 2227 isc_dhcpd: New agent plugin and check for checking IP address pools of ISC DHCP-Daemon * 2252 SEC: mk_logwatch: Fixed mostly uncritical command injection from config... + * 2270 windows agent: now able to add cached information into section headers... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/build_version b/agents/windows/build_version index aaacbe6..a2ecc45 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -142 +154 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a90a787..ceea0fd 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 72328cc..37e124e 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 103945f..694ea22 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3041,25 +3041,76 @@ void output_external_programs(SOCKET &out, script_type type) // Collect and output data script_containers_t::iterator it_cont = script_containers.begin(); script_container* cont = NULL; - while (it_cont != script_containers.end()) { + while (it_cont != script_containers.end()) + { cont = it_cont->second; if (!script_exists(cont)) { it_cont++; continue; } - if (cont->type == type) { - if (cont->status == SCRIPT_FINISHED) { + if (cont->type == type) + { + if (cont->status == SCRIPT_FINISHED) + { // Free buffer if (cont->buffer != NULL) { HeapFree(GetProcessHeap(), 0, cont->buffer); cont->buffer = NULL; } - cont->buffer = cont->buffer_work; + + if (cont->max_age == 0) + cont->buffer = cont->buffer_work; + else + { + // Determine chache_info text + char cache_info[32]; + snprintf(cache_info, sizeof(cache_info), ":cached(%d:%d)", (int)cont->buffer_time, cont->max_age); + int cache_len = strlen(cache_info) + 1; + + // We need to parse each line and replace any <<<section>>> with <<<section:cached(123455678,3600)>>> + // Allocate new buffer, process/modify each line of the original buffer and write it into the new buffer + int buffer_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); + char *cache_buffer = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_heap_size + 1024); + int cache_buffer_offset = 0; + + char *line = strtok(cont->buffer_work, "\n"); + int write_bytes = 0; + while (line) + { + int length = strlen(line); + int cr_offset = line[length-1] == '\r' ? 1 : 0; + if (length >=8 && (!strncmp(line, "<<<", 3) && !strncmp(line+length-cr_offset-3, ">>>", 3))) + { + // The return value of snprintf seems broken (off by 3?). Great... + write_bytes = length - cr_offset - 3 + 1; // length - \r - <<< + \0 + snprintf(cache_buffer + cache_buffer_offset, write_bytes, "%s", line); + cache_buffer_offset += write_bytes - 1; + + snprintf(cache_buffer + cache_buffer_offset, cache_len, cache_info); + cache_buffer_offset += cache_len - 1; + + write_bytes = 3 + cr_offset + 1 + 1; // >>> + \r + \n + \0 + snprintf(cache_buffer + cache_buffer_offset, write_bytes, "%s\n", line + length - cr_offset - 3); + cache_buffer_offset += write_bytes - 1; + } + else + { + write_bytes = length + 1 + 1; // length + \n + \0 + snprintf(cache_buffer + cache_buffer_offset, write_bytes, "%s\n", line); + cache_buffer_offset += write_bytes - 1; + } + line = strtok(NULL, "\n"); + } + HeapFree(GetProcessHeap(), 0, cont->buffer_work); + cont->buffer = cache_buffer; + } + cont->buffer_work = NULL; cont->status = SCRIPT_IDLE; } - else if (cont->retry_count < 0 && cont->buffer != NULL) { + else if (cont->retry_count < 0 && cont->buffer != NULL) + { // Remove outdated cache entries HeapFree(GetProcessHeap(), 0, cont->buffer); cont->buffer = NULL; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index dd7be26..7d7387a 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.msi b/agents/windows/check_mk_agent.msi index c516b52..fd48c86 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 91d5c9d..f9f47f8 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 8ea1c38..14cc188 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 ea42ae2..02aa8a6 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 1 month

Check_MK Git: check_mk: raritan_pdu_outletcount, raritan_pdu_plugs: improve scan functions

by Mathias Kettner

Module: check_mk Branch: master Commit: de33cc974319fe180992fe33e83291a1ed2e2081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de33cc974319fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 13 10:07:19 2015 +0200 raritan_pdu_outletcount, raritan_pdu_plugs: improve scan functions make them more specific, avoid fetching special OIDs --- checks/etherbox | 4 ++++ checks/raritan_pdu_outletcount | 4 ++-- checks/raritan_pdu_plugs | 5 ++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/checks/etherbox b/checks/etherbox index 802f81f..fef4c54 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -67,6 +67,10 @@ def etherbox_get_sensor(item, item_type, info): raise Exception("Sensor not found") def etherbox_scan(oid): + # Older firmware version of Etherbox do not answer on + # .1.3.6.1.2.1. (sysDescr). Yurks. We need to fetch + # a vendor specific OID here and wait until all old devices + # have vanished. return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version") etherbox_info = [ diff --git a/checks/raritan_pdu_outletcount b/checks/raritan_pdu_outletcount index 86655f8..383e07c 100644 --- a/checks/raritan_pdu_outletcount +++ b/checks/raritan_pdu_outletcount @@ -53,6 +53,6 @@ check_info['raritan_pdu_outletcount'] = { "group" : "plug_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") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.") and \ + oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") } diff --git a/checks/raritan_pdu_plugs b/checks/raritan_pdu_plugs index eb19866..6b37d29 100644 --- a/checks/raritan_pdu_plugs +++ b/checks/raritan_pdu_plugs @@ -80,7 +80,6 @@ check_info['raritan_pdu_plugs'] = { "3.5.3.1.3", # OutletName (eigene vergebene Bezeichnung für den Ausgang) "4.1.2.1.3", # Outlet state at present (sh.o. outlet_state_info im check) ]), - "snmp_scan_function" : lambda oid: \ - oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") - + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.") and \ + oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") }

9 years, 1 month

Check_MK Git: check_mk: moxa_iologik_register: make scan function more specific

by Mathias Kettner

Module: check_mk Branch: master Commit: fcc3e12f092f68bc67efd1bd29ceaa08a5a30680 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcc3e12f092f68… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 13 09:53:55 2015 +0200 moxa_iologik_register: make scan function more specific This avoid fetching a vendor specify OID on all other devices --- checks/moxa_iologik_register | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register index f6bec9a..161fc1d 100644 --- a/checks/moxa_iologik_register +++ b/checks/moxa_iologik_register @@ -51,7 +51,8 @@ check_info['moxa_iologik_register'] = { "service_description" : "Moxa Register", "has_perfdata" : False, "group" : "iologik_register", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8691.") and \ + oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", [ "1", # index "2", # Name

9 years, 1 month

Check_MK Git: check_mk: esx_vsphere_hostsystem: Minor cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: d255ee0bcdffc17283d02854dcc011004b16b9b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d255ee0bcdffc1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 13 09:56:59 2015 +0200 esx_vsphere_hostsystem: Minor cleanup --- checks/esx_vsphere_hostsystem | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 691ec914..9cb7ac3 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -292,30 +292,20 @@ def inventory_esx_vsphere_hostsystem_state(info): def check_esx_vsphere_hostsystem_state(_no_item, _no_params, info): data = esx_vsphere_hostsystem_convert(info) state = 0 - label = {} - messages = [] - label['Status'] = "" overallStatus = str(data['overallStatus'][0]) if overallStatus == "yellow": state = 1 - label['Status'] = "(!)" elif overallStatus in [ "red", "gray"]: state = 2 - label['Status'] = "(!!)" - messages.append("Entity state: %s%s" % (overallStatus, label['Status'])) + yield state, "Entity state: %s" + overallStatus - label['powerState'] = '' + state = 0 powerState = str(data['runtime.powerState'][0]) if powerState in ['poweredOff', 'unknown']: state = 2 - label['powerState'] = "(!!)" elif powerState == 'standBy': - state = max(state, 1) - label['powerState'] = "(!)" - messages.append("Power state: %s%s" % (powerState, label['powerState'])) - - - return(state, ", ".join(messages)) + state = 1 + yield state, "Power state: " + powerState check_info['esx_vsphere_hostsystem.state'] = { "inventory_function" : inventory_esx_vsphere_hostsystem_state,

9 years, 1 month

Check_MK Git: check_mk: Fix calling wrong scan function for checks without scan function

by Mathias Kettner

Module: check_mk Branch: master Commit: fc14870177f6cd1ee98f5a18f150677150900fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc14870177f6cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 13 09:47:07 2015 +0200 Fix calling wrong scan function for checks without scan function --- modules/discovery.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/discovery.py b/modules/discovery.py index 26399e4..81682ff 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -357,6 +357,8 @@ def snmp_scan(hostname, ipaddress, for_inv=False): scan_function = snmp_scan_functions[basename] elif basename in inv_info: scan_function = inv_info[basename].get("snmp_scan_function") + else: + scan_function = None if scan_function: try:

9 years, 1 month

Check_MK Git: check_mk: More verbose output on cmk -vv during SNMP scan

by Mathias Kettner

Module: check_mk Branch: master Commit: 071746664ec40ff327790a3aaaeb7c303f04ba01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=071746664ec40f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 13 09:46:28 2015 +0200 More verbose output on cmk -vv during SNMP scan --- modules/check_mk.py | 29 ++++++++++++++++++----------- modules/discovery.py | 15 +++++++++++---- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index efbc70b..698398b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -801,22 +801,29 @@ def get_single_oid(hostname, ipaddress, oid): if oid in g_single_oid_cache: return g_single_oid_cache[oid] + vverbose(" Getting OID %s: " % oid) if opt_use_snmp_walk or is_usewalk_host(hostname): walk = get_stored_snmpwalk(hostname, oid) if len(walk) == 1: - return walk[0][1] + value = walk[0][1] else: - return None + value = None - try: - if has_inline_snmp and use_inline_snmp: - value = inline_snmp_get_oid(hostname, oid) - else: - value = snmp_get_oid(hostname, ipaddress, oid) - except: - if opt_debug: - raise - value = None + else: + try: + if has_inline_snmp and use_inline_snmp: + value = inline_snmp_get_oid(hostname, oid) + else: + value = snmp_get_oid(hostname, ipaddress, oid) + except: + if opt_debug: + raise + value = None + + if value != None: + vverbose("%s%s%s%s\n" % (tty_bold, tty_green, value, tty_normal)) + else: + vverbose("failed.\n") g_single_oid_cache[oid] = value return value diff --git a/modules/discovery.py b/modules/discovery.py index 1b60441..26399e4 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -325,7 +325,7 @@ def snmp_scan(hostname, ipaddress, for_inv=False): global g_hostname g_hostname = hostname - vverbose(" SNMP scan:") + vverbose(" SNMP scan:\n") if not in_binary_hostlist(hostname, snmp_without_sys_descr): sys_descr_oid = ".1.3.6.1.2.1.1.1.0" sys_descr = get_single_oid(hostname, ipaddress, sys_descr_oid) @@ -338,6 +338,9 @@ def snmp_scan(hostname, ipaddress, for_inv=False): else: items = check_info.items() + positive_found = [] + default_found = [] + for check_type, check in items: if check_type in ignored_checktypes: continue @@ -363,7 +366,7 @@ def snmp_scan(hostname, ipaddress, for_inv=False): (check_type, type(result))) elif result: found.append(check_type) - vverbose(" " + check_type) + positive_found.append(check_type) except MKGeneralException: # some error messages which we explicitly want to show to the user # should be raised through this @@ -372,9 +375,13 @@ def snmp_scan(hostname, ipaddress, for_inv=False): pass else: found.append(check_type) - vverbose(" " + tty_blue + tty_bold + check_type + tty_normal) + default_found.append(check_type) + + vverbose(" SNMP scan found: %s%s%s%s\n" % (tty_bold, tty_yellow, " ".join(positive_found), tty_normal)) + if default_found: + vverbose(" without scan function: %s%s%s%s\n" % (tty_bold, tty_blue, " ".join(default_found), tty_normal)) + - vverbose("\n") found.sort() return found

9 years, 1 month

Check_MK Git: check_mk: cisco_qos: Beware: First try to calculate the correct qos bandwidth

by Bastian Kuhn

Module: check_mk Branch: master Commit: c05660cd0d30ef8d16468af68d2f15c01f4d762b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c05660cd0d30ef… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 13 08:56:08 2015 +0200 cisco_qos: Beware: First try to calculate the correct qos bandwidth --- checks/cisco_qos | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index dbbd7a5..bb56387 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -126,7 +126,7 @@ def cisco_qos_get_config_entries_by_class_id(config, class_id): return [ if_index.split('.') for if_index, value in config.iteritems() if value == class_id ] def inventory_cisco_qos(info): - if len(info) == 11: + if len(info) == 12: ifs = dict(info[0]) config = dict([ ('.'.join(oid.split('.')[-2:]), value) for oid, value in info[3] ]) if_names = dict(info[6]) @@ -170,7 +170,8 @@ def check_cisco_qos(item, params, info): if_speeds = dict(info[7]) parents = dict(info[8]) if_qos_bandwidth = dict(info[9]) - object_types = dict(info[10]) + if_qos_bandwidth_units = dict(info[10]) + object_types = dict(info[11]) if_name, class_name = item.split(': ') @@ -228,7 +229,19 @@ def check_cisco_qos(item, params, info): if parent_value_cache[class_id] == b_value: if object_types[b_key] == "4": try: - speed = saveint(if_qos_bandwidth[config[b_key]]) * 1000 + # 1 kbps + # 2 percentage + # 3 percentageRemaining + # 4 ratioRemaining + # 5 perThousand + # 6 perMillion + unit = int(if_qos_bandwidth_units[config[b_key]]) + qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]]) + if unit == 1: + speed = qos_bandwidth * 1000 + elif unit == 3: + remaining = (speed / 100) * qos_bandwidth + speed = speed - remaining break except KeyError: pass @@ -332,6 +345,7 @@ snmp_info['cisco_qos'] = [ ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '1.1.1.4' ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '5' ]), # ifSpeeds ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '5.1.1.4' ]), # cbQosParentObjectsIndex ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '9.1.1.1' ]), # qosQueueingConfigBandwidth + ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '9.1.1.2' ]), # cbQosQueueingCfgBandwidthUnits ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '5.1.1.3' ]), # cbQosObjectsType ] snmp_scan_functions['cisco_qos'] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \

9 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015