Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: Fixed title of humidity item in WATO rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 22388245b5621e139d9297f44ecb57e363b41676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22388245b5621e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 17:27:47 2014 +0200 Fixed title of humidity item in WATO rule --- checks/allnet_ip_sensoric | 1 - web/plugins/wato/check_parameters.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/allnet_ip_sensoric b/checks/allnet_ip_sensoric index 4b93b68..35fb878 100644 --- a/checks/allnet_ip_sensoric +++ b/checks/allnet_ip_sensoric @@ -95,7 +95,6 @@ def allnet_ip_sensoric_parse(info): for key, value in info: match = re.search('(\w+)\.(\w+)', key) if match: - #print "g1: %s, g2: %s, value: %s" % (match.group(1), match.group(2), value) if match.group(1) not in parsed.keys(): parsed[match.group(1)] = {} parsed[match.group(1)][match.group(2)] = value diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8379241..1faa651 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2969,9 +2969,9 @@ register_check_parameters( Integer(title = _("Critical if above"), unit="%" ), ]), TextAscii( - title = _("Service descriptions"), + title = _("Sensor names"), allow_empty = False), - None + None ) register_check_parameters( @@ -2989,6 +2989,7 @@ register_check_parameters( None, None ) + register_check_parameters( subgroup_applications, "oracle_tablespaces",

10 years

Check_MK Git: check_mk: Convert several temperature checks to same output format

by Mathias Kettner

Module: check_mk Branch: master Commit: 077c3baab1617796da3e61ade7430d8d869cd5f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077c3baab16177… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 16:22:03 2014 +0200 Convert several temperature checks to same output format Temperature is %d °C Note: space before degree symbol. --- checks/akcp_daisy_temp | 2 +- checks/akcp_sensor_temp | 2 +- checks/apc_symmetra | 10 +++++----- checks/arris_cmts_temp | 2 +- checks/cisco_temp_sensor | 2 +- checks/dell_powerconnect_temp | 2 +- checks/enterasys_temp | 2 +- checks/f5_bigip_temp | 2 +- checks/lnx_thermal | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index 5ae90ef..73c5b76 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -42,7 +42,7 @@ def check_akcp_daisy_temp(item, params, info): if name == item: warn, crit = params temp = savefloat(temp) / 10 - infotext = "Temperature is: %.1f °C " % temp + infotext = "Temperature is %.1f °C " % temp levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] if temp >= crit: diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index bc7c1e6..e3cbff6 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -56,7 +56,7 @@ def check_akcp_sensor_temp(item, params, info): if unit == "F": temp = to_celsius(temp) unit = "C" - infotext = "Temperature is: %.1f °%s" % ( temp, unit) + infotext = "Temperature is %.1f °%s" % (temp, unit) levels = " (warn/crit at %1f/%1f °%s)" % ( warn, crit, unit ) perfdata = [ ( "temperature", temp, warn, crit ) ] if temp >= crit: diff --git a/checks/apc_symmetra b/checks/apc_symmetra index ad66673..525fef2 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -163,7 +163,7 @@ def check_apc(item, params, info): # 5. Check System temperature # The Name AdvBatteryTemperature is a wrong naming in the vendor mib. - infotxt = "sys. temp. %dC" % AdvBatteryTemperature + infotxt = "sys. temp. %d °C" % AdvBatteryTemperature if AdvBatteryTemperature >= crit_sys_temp: state = 2 infotxt += "(!!)" @@ -172,7 +172,7 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, ("systemp", AdvBatteryTemperature, "", crit_sys_temp) ) ) # 6. Check battery current - infotxt = "bat. curr. %dA" % AdvBatteryCurrent + infotxt = "bat. curr. %d A" % AdvBatteryCurrent if AdvBatteryCurrent >= crit_batt_curr: state = 2 infotxt += "(!!)" @@ -181,10 +181,10 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) # 6a. Simply show input voltage (no performance data) - single_states.append( (0, "input voltage %dV" % AdvInputVoltage, None) ) + single_states.append( (0, "input voltage %d V" % AdvInputVoltage, None) ) # 7. Check output voltage - infotxt = "output voltage %dV" % AdvOutputVoltage + infotxt = "output voltage %d V" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: state = 2 infotxt += "(!!)" @@ -193,7 +193,7 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, ("voltage", AdvOutputVoltage, "", crit_voltage, 0) ) ) # 8. Simply add output current as perfdata - single_states.append( (0, "output current %dA" % AdvOutputCurrent, ("current", AdvOutputCurrent)) ) + single_states.append( (0, "output current %d A" % AdvOutputCurrent, ("current", AdvOutputCurrent)) ) # 9. run time remaining # RunTimeRemaining formatiert == "26:00.00" diff --git a/checks/arris_cmts_temp b/checks/arris_cmts_temp index 8627db5..28579f7 100644 --- a/checks/arris_cmts_temp +++ b/checks/arris_cmts_temp @@ -37,7 +37,7 @@ def check_arris_cmts_temp(item, params, info): if name == item: temp = int(temp) warn, crit = params - infotext = "Temperature is: %.1f °C " % temp + infotext = "Temperature is %.1f °C " % temp levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] if temp >= crit: diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 259cd06..db91f8e 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -161,7 +161,7 @@ def check_cisco_temp_sensor(item, params, info): else: warn, crit = levels[0:2] - infotext = "Temperature is: %.1f °C " % temp + infotext = "Temperature is %.1f °C " % temp levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] state = 0 diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 190d622..7a430cb 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -78,7 +78,7 @@ def check_dell_powerconnect_temp(_no_item, params, info): else: status = dell_powerconnect_temp_status2nagios_map[dell_powerconnect_status] - return (status, 'The temperature sensor is currently (%s)%s, and the current temperature is %sC%s' % + return (status, 'The temperature sensor is currently (%s)%s, and the current temperature is %s °C%s' % (dell_powerconnect_temp_status_map[state], sensor_info, temp, temp_info), [ ("temperature", int(temp), warn, crit, 0, 200), ]) diff --git a/checks/enterasys_temp b/checks/enterasys_temp index 10536df..c25d9eb 100644 --- a/checks/enterasys_temp +++ b/checks/enterasys_temp @@ -44,7 +44,7 @@ def check_enterasys_temp(item, params, info): temp_c = float("%0.1f" % temp_c) perfdata = [ ("temp", str(temp_c) + "C", warn, crit) ] - infotext = "Temperature is %0.1f C (warn/crit at %0.1f/%0.1f C)" % (temp_c, warn, crit) + infotext = "Temperature is %0.1f °C (warn/crit at %0.1f/%0.1f °C)" % (temp_c, warn, crit) status = 0 if temp_c >= crit: status = 2 diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 44b23b5..2f3107c 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -68,7 +68,7 @@ def check_f5_bigip_temp(item, params, info): for sensor in f5_bigip_temp_genitem(info): if item == sensor[0]: tmpdiff = sensor[1] - sensor[2] - msgtxt = "Temperature is %dC" % (sensor[1]) + msgtxt = "Temperature is %d °C" % (sensor[1]) perfdata = [ ("temp", sensor[1]) ] if 5 >= tmpdiff: return (0, msgtxt, perfdata) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index be808ec..6ccde87 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -62,7 +62,7 @@ def check_lnx_thermal(item, params, info): if tp_reached: detail_txt = ' (Trip Points reached: %s)' % ', '.join(tp_reached) - return (state, 'Temperature is %dC%s' % (cur, detail_txt), [ ( 'temperature', cur ) ]) + return (state, 'Temperature is %d °C%s' % (cur, detail_txt), [ ( 'temperature', cur ) ]) return (3, 'No data found for sensor "thermal_zone%s"' % item) check_info['lnx_thermal'] = {

10 years

Check_MK Git: check_mk: #1393 FIX casa_cpu_temp, casa_cpu_util: Change service description to standard

by Mathias Kettner

Module: check_mk Branch: master Commit: b8e739661f90c143e8f702951aadbf7e6101eb2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8e739661f90c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 16:23:47 2014 +0200 #1393 FIX casa_cpu_temp, casa_cpu_util: Change service description to standard The service description of these two checks has been changed to be compliant with Check_MK standard. This is an incompatible change because you will loose the connection to your previous performance data and alert history. --- .werks/1393 | 11 +++++++++++ ChangeLog | 2 ++ checks/casa_cpu_temp | 9 ++++++--- checks/casa_cpu_util | 23 +++++++++++++---------- web/plugins/perfometer/check_mk.py | 6 ++++-- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.werks/1393 b/.werks/1393 new file mode 100644 index 0000000..5606f52 --- /dev/null +++ b/.werks/1393 @@ -0,0 +1,11 @@ +Title: casa_cpu_temp, casa_cpu_util: Change service description to standard +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1409667738 +Class: fix + +The service description of these two checks has been changed to be compliant +with Check_MK standard. This is an incompatible change because you will +loose the connection to your previous performance data and alert history. diff --git a/ChangeLog b/ChangeLog index 5220e10..3ac4fee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,8 @@ * 1102 FIX: esx_vsphere_counters: no longer raise false alarms because of invalid data from ESX Host... * 1149 FIX: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter * 0651 FIX: f5_bigip_interfaces: indentation error and oid to determine the interface state fixed... + * 1393 FIX: casa_cpu_temp, casa_cpu_util: Change service description to standard... + NOTE: Please refer to the migration notes! Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/casa_cpu_temp b/checks/casa_cpu_temp index 9c3d689..5aa4f03 100644 --- a/checks/casa_cpu_temp +++ b/checks/casa_cpu_temp @@ -30,10 +30,13 @@ def parse_casa_info_temp(info): temp_status = dict(map(lambda x: [int(x[0]), x[1]], info[2])) temp_unit = dict(map(lambda x: [int(x[0]), x[1]], info[3])) data = {} - for idx, entry in enumerate(info[1]): + for entry in info[1]: entry_nr = int(entry[0]) def beautify_module_text(text): - return text.replace("temperature sensor", "") + text = text.replace("temperature sensor", "") + if text.startswith("Module "): + text = text.rsplit(None, 1)[0] # Drop trailing " CPU" + return text data[beautify_module_text(entity_names[entry_nr])] = { "temp_value" : temp_value.get(entry_nr), "temp_status" : temp_status.get(entry_nr), @@ -69,7 +72,7 @@ def check_casa_cpu_temp(item, params, info): state = 1 error_text = "(!)" perfdata.append( ("temp", value, warn, crit, 0, 100) ) - infotext = "%.1f°C %s%s" % (value, error_text, levels_text) + infotext = "Temperature is %.1f °C %s%s" % (value, error_text, levels_text) else: state = 2 infotext = "Sensor failure!" diff --git a/checks/casa_cpu_util b/checks/casa_cpu_util index a72c8ce..a189f8f 100644 --- a/checks/casa_cpu_util +++ b/checks/casa_cpu_util @@ -27,11 +27,15 @@ def parse_casa_info_util(info): entity_names = dict(map(lambda x: [int(x[0]), x[1]], info[0])) data = {} - for idx, entry in enumerate(info[1]): + for entry in info[1]: entry_nr = int(entry[0]) - data[entity_names[entry_nr]] = { - "cpu_util" : info[1][idx][1], - } + name = entity_names[entry_nr] # e.g. "Module 1 QEM". + # Drop "QEM" in order to be consistent with other DTCS checks... + if name.startswith("Module "): + name = name.rsplit(None, 1)[0] + data[name] = { + "cpu_util" : entry[1], + } return data def inventory_casa_cpu_util(info): @@ -44,7 +48,6 @@ def inventory_casa_cpu_util(info): def check_casa_cpu_util(item, params, info): data = parse_casa_info_util(info) - perfdata = [] if item in data: state = 0 value = int(data[item]["cpu_util"]) @@ -56,21 +59,21 @@ def check_casa_cpu_util(item, params, info): levels_text = "(levels at %s%%/%s%%)" % (warn, crit) if value > crit: state = 2 - error_text = "(!!)" elif value > warn: state = 1 - error_text = "(!)" + else: + levels_text = "" infotext = "%d%% %s%s" % (value, error_text, levels_text) - perfdata.append( ("util", value, warn, crit, 0, 100) ) + perfdata = [ ("util", value, warn, crit, 0, 100) ] return (state, infotext, perfdata) else: - return (3, "%s not found in snmp output" % item, perfdata) + return 3, "%s not found in SNMP output" % item check_info["casa_cpu_util"] = { "check_function" : check_casa_cpu_util, "inventory_function" : inventory_casa_cpu_util, - "service_description" : "Utilization %s", + "service_description" : "CPU utilization %s", "has_perfdata" : True, "group" : "cpu_utilization_multiitem", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 63a1f71..dff9aac 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -312,7 +312,7 @@ def perfometer_temperature(row, check_command, perf_data): color = "#39f" value = float(perf_data[0][1]) crit = savefloat(perf_data[0][4]) - return u"%d°C" % int(value), perfometer_logarithmic(value, 40, 1.2, color) + return u"%d °C" % int(value), perfometer_logarithmic(value, 40, 1.2, color) perfometers["check_mk-nvidia.temp"] = perfometer_temperature perfometers["check_mk-cisco_temp_sensor"] = perfometer_temperature @@ -343,6 +343,7 @@ perfometers["check_mk-qlogic_sanbox.temp"] = perfometer_temperature perfometers["check_mk-bintec_sensors.temp"] = perfometer_temperature perfometers["check_mk-knuerr_rms_temp"] = perfometer_temperature perfometers["check_mk-arris_cmts_temp"] = perfometer_temperature +perfometers["check_mk-casa_cpu_temp"] = perfometer_temperature perfometers["check_mk-rms200_temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): @@ -564,7 +565,7 @@ perfometers["check_mk-oracle_processes"] = perfometer_oracle_sessions def perfometer_cpu_utilization(row, check_command, perf_data): util = float(perf_data[0][1]) # is already percentage - color = "#60f020" + color = "#60c080" return "%.0f %%" % util, perfometer_linear(util, color) #perfometer_linear(perc, color) @@ -583,6 +584,7 @@ perfometers["check_mk-juniper_trpz_cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_nodestats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_systemstats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-sni_octopuse_cpu"] = perfometer_cpu_utilization +perfometers["check_mk-casa_cpu_util"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])

10 years

Check_MK Git: check_mk: html mail: Added Acknowledgement Author and Comment as option for html mails

by Bastian Kuhn

Module: check_mk Branch: master Commit: 38c0170c9b35cf8a76676e9ae94d295bf212b8a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c0170c9b35cf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 16:23:27 2014 +0200 html mail: Added Acknowledgement Author and Comment as option for html mails --- notifications/mail | 21 +++++++++++++++++++++ web/plugins/wato/notifications.py | 2 ++ 2 files changed, 23 insertions(+) diff --git a/notifications/mail b/notifications/mail index 39603ed..a97e3d5 100755 --- a/notifications/mail +++ b/notifications/mail @@ -220,6 +220,14 @@ body_elements = [ "$HOSTOUTPUT$", "$HOSTOUTPUT$",), + ( "ack_author", "host", False, "Acknowledge Author", + "$HOSTACKAUTHORNAME$", + "$HOSTACKAUTHORNAME$",), + + ( "ack_comment", "host", False, "Acknowledge Comment", + "$HOSTACKCOMMENT$", + "$HOSTACKCOMMENT$",), + ( "perfdata", "host", False, "Performance Data", "$HOSTPERFDATA$", "$HOSTPERFDATA$",), @@ -238,6 +246,18 @@ body_elements = [ "$LONGSERVICEOUTPUT$", "$LONGSERVICEOUTPUT$",), + ( "ack_author", "host", False, "Acknowledge Author", + "$SERVICEACKAUTHOR$", + "$SERVICEACKAUTHOR$",), + + ( "ack_comment", "host", False, "Acknowledge Comment", + "$SERVICEACKCOMMENT$", + "$SERVICEACKCOMMENT$",), + + ( "perfdata", "host", False, "Performance Data", + "$HOSTPERFDATA$", + "$HOSTPERFDATA$",), + ( "perfdata", "service", False, "Performance Data", "$SERVICEPERFDATA$", "$SERVICEPERFDATA$",), @@ -431,6 +451,7 @@ def construct_content(context): html_info = "Downtime " + what + " (while " + html_state + ")" elif notification_type == "ACKNOWLEDGEMENT": + txt_info = "Acknowledged ($@SHORTSTATE$)" html_info = "Acknowledged (while " + html_state + ")" diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 318dd53..b120dd1 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -67,6 +67,8 @@ register_notification_parameters("mail", ( "abstime", _("Absolute Time of Alert") ), ( "reltime", _("Relative Time of Alert") ), ( "longoutput", _("Additional Plugin Output") ), + ( "ack_author", _("Acknowledgement Author") ), + ( "ack_comment", _("Acknowledgement Comment") ), ( "perfdata", _("Performance Data") ), ( "graph", _("Performance Graphs") ), ],

10 years

Check_MK Git: check_mk: winperf_msx_queues: another minor fix

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7c58afe54f4cebf03a4c4c2ec8c46fe8c375105e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c58afe54f4ceb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 15:19:36 2014 +0200 winperf_msx_queues: another minor fix --- checks/winperf_msx_queues | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index ed3ab87..371fbf2 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -105,7 +105,6 @@ def check_winperf_msx_queues(item, params, info): for line in info[2:]: if line[0] == offset: length = int(line[-2]) - warn, crit = params perfdata = [("length", length, warn, crit)] infotext = "%d entries" % length if length >= crit:

10 years

Check_MK Git: check_mk: Better title for werk

by Goetz Golla

Module: check_mk Branch: master Commit: 4b227e42b108cb675a5b54eddaacd437389095ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b227e42b108cb… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Sep 2 15:06:51 2014 +0200 Better title for werk --- .werks/651 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.werks/651 b/.werks/651 index 7325efb..066ba9c 100644 --- a/.werks/651 +++ b/.werks/651 @@ -1,4 +1,4 @@ -Title: f5_bigip_interfaces: indentation error and oid to determine the interface state fixed +Title: f5_bigip_interfaces: Fix invalid throughput values, detect newer F5 devices Level: 1 Component: checks Compatible: compat @@ -6,10 +6,9 @@ Version: 1.2.5i6 Date: 1409238534 Class: fix -A major indentation errors has lead to interface throuputs identical for all ifs. -The oid for the determination of the if state was wrong +A major indentation error has lead to interface throuputs identical for all IFs. +The oid for the determination of the if state was wrong. Both errors have been fixed. - Also the scan function was extended to detect more and newer f5 devices

10 years

Check_MK Git: check_mk: Better help text for clustered_services_mapping

by Mathias Kettner

Module: check_mk Branch: master Commit: 98af2b55026c6a7820bf22dc558bd45c16ede86e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98af2b55026c6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 14:57:48 2014 +0200 Better help text for clustered_services_mapping --- web/plugins/wato/check_mk_configuration.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6f19786..716a1cb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2039,10 +2039,14 @@ group = "monconf/" + _("Various") register_rule(group, "clustered_services_mapping", TextAscii( - title = _("Explicit mapping of Clustered Services"), - help = _( "It's possible to have overlaping nodes between multiple clusters." - "With this rule the direct mapping of services from nodes to the " - "favored Cluster can be done."), + title = _("Clustered services for overlapping clusters"), + label = _("Assign services to the following cluster:"), + help = _("It's possible to have clusters that share nodes. You could say that " + "such clusters "overlap". In such a case using the ruleset " + "<i>Clustered services</i> is not sufficient since it would not be clear " + "to which of the several possible clusters a service found on such a shared " + "node should be assigned to. With this ruleset you can assign services and " + "explicitely specify which cluster assign them to."), ), itemtype = "service", )

10 years

Check_MK Git: check_mk: winperf_msx_queues: minor fix

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8f3158ea7f579eec0abebd27d5aebafd7db27649 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f3158ea7f579e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 13:36:45 2014 +0200 winperf_msx_queues: minor fix --- checks/winperf_msx_queues | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index d7bfc21..ed3ab87 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -96,7 +96,7 @@ def check_winperf_msx_queues(item, params, info): offset = winperf_msx_queues.get(item) else: warn, crit = params['levels'] - if params['offset']: + if params.get('offset'): offset = str(params['offset']) # If no offset is set, we assume that still the default counters are used else:

10 years

Check_MK Git: check_mk: winperf_msx_queues: Fixed new feature from yesterday

by Bastian Kuhn

Module: check_mk Branch: master Commit: ea10275ea58c5c883031aa88fcbf733a9f8abc56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea10275ea58c5c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 13:31:23 2014 +0200 winperf_msx_queues: Fixed new feature from yesterday --- checks/winperf_msx_queues | 27 ++++++++++++++--- web/plugins/wato/check_parameters.py | 54 ++++++++++++++++++++++++---------- 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index c7a8f18..d7bfc21 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -54,7 +54,10 @@ # 6 0 0 0 0 rawcount # Default warn/crit levels for length of queues -msx_queues_default_levels = (500, 2000) +factory_settings['winperf_msx_queues'] = { + 'levels': ( 500, 2000 ), +} + # Queues to be inventorized (number are relative to counter base) winperf_msx_queues = { @@ -76,16 +79,31 @@ def inventory_winperf_msx_queues(info): # In case that rules for this host are set, # only use this rules if inventory_rules: - winperf_msx_queues = inventory_rules - return [ (name, "msx_queues_default_levels") for name in winperf_msx_queues ] + queues = inventory_rules + else: + queues = winperf_msx_queues + return [ (name, { "offset" : offset } ) for name, offset in queues.items() ] def check_winperf_msx_queues(item, params, info): num_instances = int(info[1][0]) if num_instances < 1: return (3, "no counters available, transport service running?") + + # Old default case: + if type(params) == tuple: + warn, crit = params + offset = winperf_msx_queues.get(item) + else: + warn, crit = params['levels'] + if params['offset']: + offset = str(params['offset']) + # If no offset is set, we assume that still the default counters are used + else: + offset = winperf_msx_queues.get(item) + for line in info[2:]: - if line[0] == winperf_msx_queues.get(item): + if line[0] == offset: length = int(line[-2]) warn, crit = params perfdata = [("length", length, warn, crit)] @@ -106,5 +124,6 @@ check_info["winperf_msx_queues"] = { 'inventory_function': inventory_winperf_msx_queues, 'service_description': 'Queue %s', 'has_perfdata': True, + "default_levels_variable" : "winperf_msx_queues", 'group': 'msx_queues', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 82be425..8379241 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1772,27 +1772,46 @@ register_check_parameters( has_inventory = False, ) +def transform_msx_queues(params): + if type(params) == tuple: + return { "levels" : ( params[0], params[1] ) } + return params + + register_check_parameters( subgroup_applications, "msx_queues", _("MS Exchange Message Queues"), - Tuple( - help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"), - elements = [ - Integer(title = _("Warning if above"), unit = _("E-Mails")), - Integer(title = _("Critical if above"), unit = _("E-Mails")) - ]), - OptionalDropdownChoice( + Transform( + Dictionary( + title = _("Set Levels"), + elements = [ + ( 'levels', + Tuple( + title = _("Maximum Number of E-Mails in Queue"), + help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"), + elements = [ + Integer(title = _("Warning if above"), unit = _("E-Mails")), + Integer(title = _("Critical if above"), unit = _("E-Mails")) + ]), + ), + ('offset', + Integer( + title = _("Offset"), + help = _("Use this only if you want to overwrite the postion of the information in the agent " + "Output. Also refer to the rule <i>Microsoft Exchange Queues Inventory</i> ") + ) + ), + ], + optional_keys = [ "offset" ], + ), + back = transform_msx_queues, + forth = transform_msx_queues, + ), + TextAscii( title = _("Explicit Queue Names"), - help = _("Select queue names that the rule should apply"), - choices = [ - ( "Active Remote Delivery", _("Active Remote Delivery") ), - ( "Retry Remote Delivery", _("Retry Remote Delivery") ), - ( "Active Mailbox Delivery", _("Active Mailbox Delivery") ), - ( "Poison Queue Length", _("Poison Queue Length") ), - ], - otherlabel = _("specify manually ->"), - explicit = TextAscii(allow_empty = False)), + help = _("Specify queue names that the rule should apply"), + ), "first" ) @@ -3979,10 +3998,12 @@ register_rule(group + '/' + subgroup_inventory, 'To do that, knowledge about the Agent Output is needed. '), valuespec = ListOf( Tuple( + orientation = "horizontal", elements = [ TextAscii( title = _("Name of Counter"), help = _("Name of the Counter to be monitored."), + size = 50, allow_empty = False, ), Integer( @@ -3991,6 +4012,7 @@ register_rule(group + '/' + subgroup_inventory, allow_empty = False, ), ]), + movable = False, add_label = _("Add Counter")), match = 'all', )

10 years

Check_MK Git: check_mk: #1392 WATO Folder filter: show only the paths a user is allowed to see

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c346794205b3f5fbec313e55935aa325763bf6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c346794205b3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:58:38 2014 +0200 #1392 WATO Folder filter: show only the paths a user is allowed to see --- .werks/1392 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/wato.py | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/1392 b/.werks/1392 new file mode 100644 index 0000000..54eca8f --- /dev/null +++ b/.werks/1392 @@ -0,0 +1,9 @@ +Title: WATO Folder filter: show only the paths a user is allowed to see +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1409655497 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cf3a8c9..5220e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ Multisite: * 1066 Implemented Dashboard Designer... + * 1392 WATO Folder filter: show only the paths a user is allowed to see * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 023f51f..bcc414d 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -47,7 +47,24 @@ class FilterWatoFile(Filter): def display(self): self.check_wato_data_update() - html.select(self.name, [("", "")] + self.selection) + # Note: WATO Folders that the user has not permissions to must not be visible. + # Permissions in this case means, that the user has view permissions for at + # least one host in that folder. + result = html.live.query("GET hosts\nCache: reload\nColumns: filename\nStats: state >= 0\n") + allowed_folders = set([""]) + for path, host_count in result: + # convert '/wato/server/hosts.mk' to 'server' + folder = path[6:-9] + # allow the folder an all of its parents + parts = folder.split("/") + subfolder = "" + for part in parts: + if subfolder: + subfolder += "/" + subfolder += part + allowed_folders.add(subfolder) + + html.select(self.name, [("", "")] + [ entry for entry in self.selection if (entry[0] in allowed_folders) ]) def filter(self, infoname): self.check_wato_data_update()

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014