Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: check-mk-ping.php: avoid silly Y-achsis for values below 1ms

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a0bc66a617bcca0c8572d30320a156a8dae5c11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0bc66a617bcc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 19 14:16:47 2014 +0200 check-mk-ping.php: avoid silly Y-achsis for values below 1ms --- pnp-templates/check-mk-ping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnp-templates/check-mk-ping.php b/pnp-templates/check-mk-ping.php index 659e0ad..4180da1 100644 --- a/pnp-templates/check-mk-ping.php +++ b/pnp-templates/check-mk-ping.php @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. $ds_name[1] = "Round Trip Averages"; -$opt[1] = "--vertical-label \"RTA (ms)\" --title \"Ping times for $hostname\" "; +$opt[1] = "--vertical-label \"RTA (ms)\" -X0 --title \"Ping times for $hostname\" "; $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; $def[1] .= "DEF:var2=$RRDFILE[2]:$DS[2]:MAX " ; $def[1] .= "VDEF:maxrta=var1,MAXIMUM " ;

9 years, 10 months

Check_MK Git: check_mk: Minor code cleanup in Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 879248ced8850ea2da6ab131e77b9dd7dedbe22f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=879248ced8850e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 19 13:32:38 2014 +0200 Minor code cleanup in Windows agent --- agents/windows/check_mk_agent.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 92ca664..bd26684 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3822,19 +3822,23 @@ bool handle_logfiles_config_variable(char *var, char *value) if (value != 0) add_globline(value); return true; - }else if (!strcmp(var, "warn")) { + } + else if (!strcmp(var, "warn")) { if (value != 0) add_condition_pattern('W', value); return true; - }else if (!strcmp(var, "crit")) { + } + else if (!strcmp(var, "crit")) { if (value != 0) add_condition_pattern('C', value); return true; - }else if (!strcmp(var, "ignore")) { + } + else if (!strcmp(var, "ignore")) { if (value != 0) add_condition_pattern('I', value); return true; - }else if (!strcmp(var, "ok")) { + } + else if (!strcmp(var, "ok")) { if (value != 0) add_condition_pattern('O', value); return true;

9 years, 10 months

Check_MK Git: check_mk: #0647 FIX printer_input, printer_output: multiple fixes to algorithm for state determination and inventory function

by Goetz Golla

Module: check_mk Branch: master Commit: 8df689b9c7122e78ebf5fba75b1d32fe12d3368f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8df689b9c7122e… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Aug 19 13:32:05 2014 +0200 #0647 FIX printer_input, printer_output: multiple fixes to algorithm for state determination and inventory function The inventory function now considers the description of the unit if its name is not configured. This should lead to more and more meaningful items. Still, all units with empty name and description will be merged into one single service with an empty item name. The algorithm to determine the states of a unit was plain wrong, so that a nonsense collection of states were given. This has been corrected. Still several states may be derived, but they should now correctly describe the operational state of the unit. The inventory function also used the same algorithm to inventorize only units with meaningful states. Therefore some changes may be expected in the inventory of a printer as well. --- .werks/647 | 18 ++++++++++++++++++ ChangeLog | 1 + checks/printer_io.include | 27 ++++++++++++++++++++------- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.werks/647 b/.werks/647 new file mode 100644 index 0000000..248eeed --- /dev/null +++ b/.werks/647 @@ -0,0 +1,18 @@ +Title: printer_input, printer_output: multiple fixes to algorithm for state determination and inventory function +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408447192 +Class: fix + +The inventory function now considers the description of the unit if its name is not configured. This should lead to +more and more meaningful items. Still, all units with empty name and description will be merged into one single +service with an empty item name. + +The algorithm to determine the states of a unit was plain wrong, so that a nonsense collection of states were given. +This has been corrected. Still several states may be derived, but they should now correctly describe the operational +state of the unit. + +The inventory function also used the same algorithm to inventorize only units with meaningful states. Therefore some +changes may be expected in the inventory of a printer as well. diff --git a/ChangeLog b/ChangeLog index 1a75065..40d3a00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1152 FIX: mk-job: The check now captures currently running jobs and their start time... * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value.... * 0645 FIX: brocade_fcport: since in newer firmware (7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB::ifHighSpeed + * 0647 FIX: printer_input, printer_output: multiple fixes to algorithm for state determination and inventory function... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/printer_io.include b/checks/printer_io.include index 6d076e1..a95232c 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -56,7 +56,7 @@ printer_io_states = { 64: (0, 'Transitioning to intended state'), } -factory_settings['printer_default_levels'] = { +factory_settings['printer_input_default_levels'] = { 'capacity_levels': (0.0, 0.0), } @@ -66,11 +66,21 @@ factory_settings['printer_output_default_levels'] = { def inventory_printer_io(info): for line in info: + ignore = False snmp_status = saveint(line[2]) - # Skip sub units where it does not seem to make sense to monitor them - if snmp_status & 5 and snmp_status & 3 and snmp_status & 1: + for state_val in sorted(printer_io_states,reverse=True): + if state_val > 0 and snmp_status - state_val >= 0: + snmp_status -= state_val + # Skip sub units where it does not seem to make sense to monitor them + if state_val in ( 1,3,5 ): + ignore = True + if ignore == True: continue - yield (line[0], {}) + if line[0]: + name = line[0] + else: + name = line[1] + yield (name, {}) def check_printer_io(item, params, info, what): for line in info: @@ -78,16 +88,19 @@ def check_printer_io(item, params, info, what): snmp_status, level, capacity_max = saveint(snmp_status), saveint(level), saveint(capacity_max) capacity_unit = printer_io_units[capacity_unit] - if name == item: + if descr == item or name == item: state_txt = [] state_state = 0 if snmp_status == 0: state_txt.append(printer_io_states[0][1]) else: - for state_val, (mon_state, text) in printer_io_states.items(): - if snmp_status & state_val: + for state_val in sorted(printer_io_states,reverse=True): + if state_val > 0 and snmp_status - state_val >= 0: + mon_state, text = printer_io_states[state_val] state_state = max(mon_state, state_state) state_txt.append(text) + snmp_status -= state_val + yield state_state, 'Status: %s' % ', '.join(state_txt) if level in [-1, -2]:

9 years, 10 months

Check_MK Git: check_mk: Windows agent: remove debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d2128786bd57536ff4b6a6b7e185bf7cfcb5be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d2128786bd575… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 19 13:11:41 2014 +0200 Windows agent: remove debug output --- agents/windows/check_mk_agent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index bf03297..5f5b2ea 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3909,7 +3909,6 @@ bool handle_mrpe_config_variable(char *var, char *value) if (!strcmp(var, "check")) { // First word: service description // Rest: command line - fprintf(stderr, "VALUE: [%s]\r\n", value); char *service_description = next_word(&value); char *command_line = value; if (!command_line || !command_line[0]) { @@ -3938,7 +3937,8 @@ bool handle_mrpe_config_variable(char *var, char *value) sizeof(tmp_entry->plugin_name)); g_mrpe_entries.push_back(tmp_entry); return true; - } else if (!strncmp(var, "include", 7)) { + } + else if (!strncmp(var, "include", 7)) { char *user = NULL; if (strlen(var) > 7) user = lstrip(var + 7);

9 years, 10 months

Check_MK Git: check_mk: webapi: fixed bug, now able to add a host into the main directory

by Andreas Boesl

Module: check_mk Branch: master Commit: 1ebf0719cf3f181ae982b05c8ac7703d46f33f0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ebf0719cf3f18… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 19 12:00:28 2014 +0200 webapi: fixed bug, now able to add a host into the main directory --- web/htdocs/wato.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1042f73..4050657 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16913,9 +16913,11 @@ class API: if "foldername" in validate: if not os.path.exists(host_foldername) and not create_folders: raise MKUserError(None, _("Folder does not exist and no permission to create folders")) - host_folder_tokens = host_foldername.split("/") - for dir_token in host_folder_tokens: - check_wato_foldername(None, dir_token, just_name = True) + + if host_foldername != "": + host_folder_tokens = host_foldername.split("/") + for dir_token in host_folder_tokens: + check_wato_foldername(None, dir_token, just_name = True) if "host_exists" in validate: if hostname in all_hosts:

9 years, 10 months

Check_MK Git: check_mk: winperf_counters: now able to handle counter names containing an :

by Andreas Boesl

Module: check_mk Branch: master Commit: bf9f4c00b1cd8a4ec81baa8e04bbcf659619d831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf9f4c00b1cd8a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 19 11:19:38 2014 +0200 winperf_counters: now able to handle counter names containing an : --- 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 | 2 +- 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 159871 -> 159871 bytes agents/windows/install_agent.exe | Bin 156784 -> 156806 bytes 8 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 60d3b2f..98d9bcb 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -15 +17 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 7e7f6ed..38e5220 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 66519d7..00cc87f 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 bf03297..908a28f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3785,7 +3785,7 @@ bool handle_global_config_variable(char *var, char *value) bool handle_winperf_config_variable(char *var, char *value) { if (!strcmp(var, "counters")) { - char *colon = strchr(value, ':'); + char *colon = strrchr(value, ':'); if (!colon) { fprintf(stderr, "Invalid counter '%s' in section [winperf]: need number(or text) and colon, e.g. 238:processor.\n", value); exit(1); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 66fb39b..a87a33b 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 d22914e..9dc34b5 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 e21840f..86342aa 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 fc24dba..53d1127 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 10 months

Check_MK Git: check_mk: #0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO

by Goetz Golla

Module: check_mk Branch: master Commit: 10cecc5504f15259a77fd10ddc3c709922ca964d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10cecc5504f152… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 18 14:27:21 2014 +0200 #0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO --- .werks/646 | 7 +++++ ChangeLog | 1 + checks/brocade_fcport | 17 ++++++++----- web/plugins/wato/check_mk_configuration.py | 8 +++++- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 9 deletions(-) diff --git a/.werks/646 b/.werks/646 new file mode 100644 index 0000000..16c8fbc --- /dev/null +++ b/.werks/646 @@ -0,0 +1,7 @@ +Title: brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408364635 +Class: feature diff --git a/ChangeLog b/ChangeLog index 82c8865..1a75065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 0644 adva_fsp_if: instead of lower warning and critical levels check now supports lower and upper levels NOTE: Please refer to the migration notes! * 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 * 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/checks/brocade_fcport b/checks/brocade_fcport index f4bc421..150d9d6 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -42,7 +42,7 @@ 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 - +brocade_fcport_inventory = [] factory_settings["brocade_fcport_default_levels"] = { @@ -55,12 +55,12 @@ factory_settings["brocade_fcport_default_levels"] = { # Helper function for computing item from port number -def brocade_fcport_getitem(ports, index, portname, is_isl): +def brocade_fcport_getitem(ports, index, portname, is_isl, uses_portname, shows_isl): int_len = str(len(str(len(ports)))) itemname = ("%0" + int_len + "d") % (index - 1) - if is_isl and brocade_fcport_inventory_show_isl: + if is_isl and shows_isl: itemname += " ISL" - if portname.strip() and brocade_fcport_inventory_use_portname: + if portname.strip() and uses_portname: itemname += " " + portname.strip() return itemname @@ -70,6 +70,11 @@ def inventory_brocade_fcport(info): if len(info) < 2: return + settings = host_extra_conf_merged(g_hostname, brocade_fcport_inventory) + uses_portname = settings.get('use_portname', brocade_fcport_inventory_use_portname) + shows_isl = settings.get('show_isl', brocade_fcport_inventory_show_isl) + admstates = settings.get('admstates', brocade_fcport_inventory_admstates) + inventory = [] isl_ports = {} if len(info) > 1: @@ -87,11 +92,11 @@ def inventory_brocade_fcport(info): portname = line[13] is_isl = line[0] in isl_ports - if admstate in brocade_fcport_inventory_admstates and \ + if admstate in admstates and \ opstate in brocade_fcport_inventory_opstates and \ phystate in brocade_fcport_inventory_phystates: - inventory.append(( brocade_fcport_getitem(info[0], index, portname, is_isl), + inventory.append(( brocade_fcport_getitem(info[0], index, portname, is_isl, uses_portname, shows_isl), '{ "phystate": [%d], "opstate": [%d], "admstate": [%d] }' % (phystate, opstate, admstate) )) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 370efdb..5aaa2a7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1247,7 +1247,6 @@ register_configvar(group, - _if_portstate_choices = [ ( '1', 'up(1)'), ( '2', 'down(2)'), @@ -1258,6 +1257,13 @@ _if_portstate_choices = [ ( '7', 'lowerLayerDown(7)'), ] +_brocade_fcport_adm_choices = [ + ( 1, 'online(1)'), + ( 2, 'offline(2)'), + ( 3, 'testing(3)'), + ( 4, 'faulty(4)'), + ] + _if_porttype_choices = [ ("1", "other(1)" ), ("2", "regular1822(2)" ), ("3", "hdh1822(3)" ), ("4", "ddnX25(4)" ), ("5", "rfc877x25(5)" ), ("6", "ethernetCsmacd(6)" ), ("7", "iso88023Csmacd(7)" ), ("8", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4a69f77..c186757 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -141,7 +141,7 @@ register_rule(group + '/' + subgroup_inventory, match = 'all', ) -#dublicate: check_mk_configuration.py +#duplicate: check_mk_configuration.py _if_portstate_choices = [ ( '1', 'up(1)'), ( '2', 'down(2)'), @@ -152,7 +152,7 @@ _if_portstate_choices = [ ( '7', 'lowerLayerDown(7)'), ] -#dublicate: check_mk_configuration.py +#duplicate: check_mk_configuration.py _if_porttype_choices = [ ("1", "other(1)" ), ("2", "regular1822(2)" ), ("3", "hdh1822(3)" ), ("4", "ddnX25(4)" ), ("5", "rfc877x25(5)" ), ("6", "ethernetCsmacd(6)" ), ("7", "iso88023Csmacd(7)" ), ("8", @@ -273,6 +273,40 @@ register_rule(group + '/' + subgroup_inventory, ) register_rule(group + '/' + subgroup_inventory, + varname = "brocade_fcport_inventory", + title = _("Brocade Port Inventory"), + valuespec = Dictionary( + elements = [ + ("use_portname", Checkbox( + title = _("Use port name as service name"), + label = _("use port name"), + default_value = True, + help = _("This option lets Check_MK use the port name as item instead of the " + "port number. If no description is available then the port number is " + "used anyway."))), + ("show_isl", Checkbox( + title = _("add \"ISL\" to service description for interswitch links"), + label = _("add ISL"), + default_value = True, + help = _("This option lets Check_MK add the string \"ISL\" to the service " + "description for interswitch links."))), + ("admstates", ListChoice(title = _("Administrative port states to inventorize"), + help = _("When doing inventory on brocade switches only ports with the given administrative " + "states will be added to the monitoring system."), + choices = _brocade_fcport_adm_choices, + columns = 1, + toggle_all = True, + default_value = ['1', '3', '4' ], + )), + ], + help = _('This mule can be used to control the inventory for brocade ports. ' + 'You can configure the port states for inventory ' + 'and the use of the description as service name.'), + ), + match = 'dict', +) + +register_rule(group + '/' + subgroup_inventory, varname = "inventory_processes_rules", title = _('Process Inventory'), help = _("Keep in mind that all configuration parameters in this rule are only applied during the hosts inventory. "

9 years, 10 months

Check_MK Git: check_mk: webapi: streamlined returned object of get_host

by Andreas Boesl

Module: check_mk Branch: master Commit: 971ed879e11f6f7a8f280b56630a58664084aa47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=971ed879e11f6f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 18 13:48:51 2014 +0200 webapi: streamlined returned object of get_host --- web/htdocs/wato.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8bc7673..1042f73 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17039,9 +17039,8 @@ class API: the_host = effective_attributes(the_host, the_host[".folder"]) cleaned_host = dict([(k, v) for (k, v) in the_host.iteritems() if not k.startswith('.') ]) - cleaned_host["folder"] = the_host[".folder"][".path"] - return cleaned_host + return { "attributes": cleaned_host, "path": the_host[".folder"][".path"], "hostname": hostname } def delete_host(self, hostname): self.__prepare_folder_info()

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1005

by Goetz Golla

Module: check_mk Branch: master Commit: eea12859818d6799c9f316f6f216adb54153f12c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eea12859818d67… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 18 12:07:01 2014 +0200 Updated bug entries #1005 --- .bugs/1005 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1005 b/.bugs/1005 new file mode 100644 index 0000000..fbf464f --- /dev/null +++ b/.bugs/1005 @@ -0,0 +1,9 @@ +Title: problems with run_cached when agent is not running for a while and $CACHEFILE.new is left over +Component: core +State: open +Date: 2014-08-18 11:56:44 +Targetversion: future +Class: bug + +If it happens for some reason, that a $CACHEFILE.new is left over and the agent does not run for a while, +the leftover $CACHEFILE.new blocks the execution of the agent section

9 years, 10 months

Check_MK Git: check_mk: #0645 FIX brocade_fcport: since in newer firmware ( 7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB: :ifHighSpeed

by Goetz Golla

Module: check_mk Branch: master Commit: af80e529c3f223a050978971def48cf627b81040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af80e529c3f223… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 18 10:59:35 2014 +0200 #0645 FIX brocade_fcport: since in newer firmware (7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB::ifHighSpeed --- .werks/645 | 9 +++++++++ ChangeLog | 1 + checkman/brocade_fcport | 18 +++++++++--------- checks/brocade_fcport | 26 ++++++++++++++++++++------ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/.werks/645 b/.werks/645 new file mode 100644 index 0000000..e83e27b --- /dev/null +++ b/.werks/645 @@ -0,0 +1,9 @@ +Title: brocade_fcport: since in newer firmware (7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB::ifHighSpeed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408352237 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2cf9c9e..17cce96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ NOTE: Please refer to the migration notes! * 1152 FIX: mk-job: The check now captures currently running jobs and their start time... * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value.... + * 0645 FIX: brocade_fcport: since in newer firmware (7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB::ifHighSpeed Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport index 8e5b950..a17ef09 100644 --- a/checkman/brocade_fcport +++ b/checkman/brocade_fcport @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This checks monitors a FibreChannel port of a Brocade FC switch - to very great detail. It obsoletes the older checks {fc_brocade_port} and + in great detail. It obsoletes the older checks {fc_brocade_port} and {fc_brocade_port_detailed}. The check goes critical under the following conditions: {[1]} The physical state, operational state or adminstrative state of the port is not @@ -31,9 +31,9 @@ item: The item is the port-number as two-digit or three-digit string (on switches with 100 or more ports) as printed on the switch (note: the SNMP-index of port {00} is {1}!). For ISL ports (inter-switch-links), an {ISL} is appended - to the item, e.g. {00 ISL}. That allows you to create rules that select + to the item, e.g. {00 ISL}. This allows you to create rules which select different check parameters for ISL and normal ports without specifying each - individual port. Also if you have configured port names, they will appear + individual port. Also, if you have configured port names, they will appear in the check item (and thus the service description). This can be turned off. @@ -65,15 +65,15 @@ examples: perfdata: For each port there are sent {in}, {out}, {rxframes}, {txframes}, {rxcrcs}, - {rxencoutframes}, {c3discards} and {notxcredits}. If averaging is turned on, then - each value comes twices: once normal and once with {_avg} appended as averaged - value. All rates are in Bytes/s or Frames/s. If you are using PNP4Nagios, then + {rxencoutframes}, {c3discards} and {notxcredits}. If averaging is turned on, + each value comes twice: once normal and once with {_avg} appended as averaged + value. All rates are in Bytes/s or Frames/s. If you are using PNP4Nagios, you are strongly encouraged to set {RRD_STORAGE_TYPE = MULTIPLE} in - {process_perfdata.cfg}. Please note, that you need to re-create or convert existing - RRD database if you change this setting. + {process_perfdata.cfg}. Please note that you need to re-create or convert existing + RRD databases if you change this setting. inventory: - The inventory creates checks for all operational ports. What this exactly means, + The inventory creates checks for all operational ports. What this exactly means can be configured (see CONFIGURATION VARIABLES). [parameters] diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 79fc0dd..f4bc421 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -50,7 +50,7 @@ factory_settings["brocade_fcport_default_levels"] = { "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames "notxcredits": (3.0, 20.0), # allowed percentage of No Tx Credits "c3discards": (3.0, 20.0), # allowed percentage of C3 discards - "assumed_speed": 2.0, # used, if speed not available in SNMP data + "assumed_speed": 2.0, # used if speed not available in SNMP data } @@ -67,7 +67,7 @@ def brocade_fcport_getitem(ports, index, portname, is_isl): def inventory_brocade_fcport(info): # info[0] is port table, info[1] is ISL table - if len(info) != 2: + if len(info) < 2: return inventory = [] @@ -119,9 +119,18 @@ def check_brocade_fcport(item, params, info): speedmsg = ("ISL at %.0fGbit/s" % gbit) else: # no ISL port if brocade_fcport_speed[speed] in [ "auto-Neg", "unknown" ]: - # let user specify assumed speed via check parameter, default is 2.0 - gbit = params.get("assumed_speed") - speedmsg = "assuming %gGbit/s" % gbit + try: + actual_speed = saveint(info[2][item_index][0]) + except: + actual_speed = 0 + if actual_speed > 0: + # use actual speed of port if available + gbit = actual_speed / 1000 + speedmsg = "actual speed %gGbit/s" % gbit + else: + # let user specify assumed speed via check parameter, default is 2.0 + gbit = params.get("assumed_speed") + speedmsg = "assumed speed %gGbit/s" % gbit else: gbit = float(brocade_fcport_speed[speed].replace("Gbit", "")) speedmsg = "%.0fGbit/s" % gbit @@ -311,7 +320,7 @@ check_info["brocade_fcport"] = { 22, # swFCPortRxCrcs 26, # swFCPortRxEncOutFrs 28, # swFCPortC3Discards - 35, # swFCPortSpeed + 35, # swFCPortSpeed, deprecated from at least firmware version 7.2.1 36, # swFCPortName (not supported by all devices) ]), @@ -320,6 +329,11 @@ check_info["brocade_fcport"] = { 2, # swNbMyPort 5, # swNbBaudRate ]), + + # new way to get port speed supported by Brocade + ( ".1.3.6.1.2.1.31.1.1.1", [ + 15, # IF-MIB::ifHighSpeed + ]), ], '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"), 'group' : 'brocade_fcport',

9 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014