Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: #1395 Event Console can now create notifications via Check_MK RBN

by Mathias Kettner

Module: check_mk Branch: master Commit: a45aa32f3d737d5e3a78a0d9433f6bed4c5da6c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a45aa32f3d737d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 3 16:09:32 2014 +0200 #1395 Event Console can now create notifications via Check_MK RBN The Event Console has now the new builtin action Send monitoring notification that can be used in all three situations where actions are possible: <ul> <li>When an event is being opened</li> <li>When an event is being cancelled</li> <li>By a user executing an action on an open event</li> </ul> This new action creates a monitoring notification just as the ones that happen, when in normal (non-EC) monitoring a service goes from OK to CRIT or vice versa. This notification is being process by the rule based notifications and is handled just like a monitoring notification. Why whould you want to do that? <ul> <li>You can use the same notification plugins for alarms triggered by the monitoring and by the Event Console. No need for an extra SMS script in the Event Console.</li> <li>You can use all of the flexiblity of existing notification plugins - including configuring their parameters via WATO.</li> <li>All notifications from your Check_MK environment are now controlled by a common set of notification rule. For example if a user wants to disable all of his notifications then there is just one place for doing that.</li> </ul> There is nothing you need to setup. Just check the action Send monitoring notification in your event rules and that's it. Note: Because events are not exactly the same as services and because of the nature of distributed monitoring there are a few specialities in notifications that come from the Event Console: <ul> <li>EC notifications have only limited information about the host. There is no information about host tags or WATO folders. Do not use matching criteria on those or otherwise that match will always fail.</li> <li>EC notifications currently have no information about contacts or groups of a host. This would need an online Livestatus query, but that would fail if the host is being monitored by a remote system.</li> <li>EC notifications do not have a previous host or service state, since the Event Console is a stateless monitoring. Do not set any matching criteria on the event type since none of these can be fullfilled currently.</li> <li>All EC notifications are sent as service notifications. The name of the event's application is taken as service description.</li> </ul> The notification rules have got a new matching option especially for EC notifications: Event Console alerts. Here you can make a notification rule deal only with EC notifications or exclude just those. You can also match on EC specific fields like the event's rule id, syslog priority, syslog facility and event comment. Most of the event's special fields are available as notification context variables - to be used in custom notification scripts or template definitions. Please use the standard debugging methods for displaying all variables. At least defined are <tt>EC_ID</tt>, <tt>EC_RULE_ID</tt>, <tt>EC_PRIORITY</tt>, <tt>EC_FACILITY</tt>, <tt>EC_PHASE</tt>, <tt>EC_COMMENT</tt>, <tt>EC_OWNER</tt>, <tt>EC_PID</tt>, <tt>EC_MATCH_GROUPS</tt>, and <tt>EC_CONTACT_GROUPS</tt>. --- .werks/1395 | 71 ++++++++++++++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 115 +++++++++++++++++++++++++++++++++------ mkeventd/web/htdocs/mkeventd.py | 3 +- modules/notify.py | 70 ++++++++++++++++++++++-- web/htdocs/wato.py | 59 ++++++++++++++++++-- 6 files changed, 290 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a45aa32f3d…

10 years, 1 month

Check_MK Git: check_mk: #1177 Hivemanger: New agent to check hivemanager devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 41b81e77319b9e26c4b97b7ba395a0193de04d54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b81e77319b9e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 3 11:51:21 2014 +0200 #1177 Hivemanger: New agent to check hivemanager devices --- .werks/1177 | 9 +++ ChangeLog | 3 +- checks/agent_hivmanager | 31 +++++++++ checks/hivemanager_devices | 106 +++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 35 ++++++++++ web/plugins/wato/datasource_programs.py | 12 ++++ 6 files changed, 195 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=41b81e7731…

10 years, 1 month

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: d1011ebc86eb135ababbdd87162d9848e9710155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1011ebc86eb13… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 3 11:51:58 2014 +0200 merge conflict ---

10 years, 1 month

Check_MK Git: check_mk: Cleaned up some already implemented drafts

by Mathias Kettner

Module: check_mk Branch: master Commit: 2dae2a152e5ce15af0c9a1b1899bdee562bcab30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dae2a152e5ce1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 3 09:28:14 2014 +0200 Cleaned up some already implemented drafts --- doc/drafts/LIESMICH.hardwareinventur | 358 -------------------------- doc/drafts/LIESMICH.hosts_umbenennen | 60 ----- doc/drafts/README.notification_configuration | 89 ------- 3 files changed, 507 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2dae2a152e…

10 years, 1 month

Check_MK Git: check_mk: mail: fixed typos

by Bastian Kuhn

Module: check_mk Branch: master Commit: cdc974255e5360d624d44628b03da3bec475859b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdc974255e5360… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 19:58:42 2014 +0200 mail: fixed typos --- notifications/mail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index a97e3d5..06c0408 100755 --- a/notifications/mail +++ b/notifications/mail @@ -246,11 +246,11 @@ body_elements = [ "$LONGSERVICEOUTPUT$", "$LONGSERVICEOUTPUT$",), - ( "ack_author", "host", False, "Acknowledge Author", + ( "ack_author", "service", False, "Acknowledge Author", "$SERVICEACKAUTHOR$", "$SERVICEACKAUTHOR$",), - ( "ack_comment", "host", False, "Acknowledge Comment", + ( "ack_comment", "service", False, "Acknowledge Comment", "$SERVICEACKCOMMENT$", "$SERVICEACKCOMMENT$",),

10 years, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits