Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64715 discussions

Check_MK Git: check_mk: Thanks to Hermann Maurer.

by Mathias Kettner

Module: check_mk Branch: master Commit: f64c6fb215f313e8b935d8cec2b3f4ad03816595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f64c6fb215f313… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:41:53 2014 +0100 Thanks to Hermann Maurer. --- .werks/1721 | 9 ++++++++ ChangeLog | 1 + checks/dell_om_mem | 64 ++++++++++++++++++++++++++++------------------------ 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/.werks/1721 b/.werks/1721 new file mode 100644 index 0000000..d922ed3 --- /dev/null +++ b/.werks/1721 @@ -0,0 +1,9 @@ +Title: dell_om_mem: Handle formerly unhandled situations with multiple errors +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418074869 +Class: fix + +Thanks for the bug report to Hermann Maurer. diff --git a/ChangeLog b/ChangeLog index e09711c..51a278d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now + * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/dell_om_mem b/checks/dell_om_mem index 3ed4562..4122758 100644 --- a/checks/dell_om_mem +++ b/checks/dell_om_mem @@ -27,52 +27,56 @@ def inventory_dell_om_mem(info): return [ (x[0], None) for x in info ] +# DellMemoryDeviceFailureModes ::= INTEGER { +# -- Note: These values are bit masks, so combination values are possible. +# -- If value is 0 (zero), memory device has no faults. +# eccSingleBitCorrectionWarningRate(1), -- ECC single bit correction warning rate exceeded +# eccSingleBitCorrectionFailureRate(2), -- ECC single bit correction failure rate exceeded +# eccMultiBitFault(4), -- ECC multibit fault encountered +# eccSingleBitCorrectionLoggingDisabled(8), -- ECC single bit correction logging disabled +# deviceDisabledBySpareActivation(16) -- device disabled because of spare activation + + def check_dell_om_mem(item, _no_params, info): - failure_mode = { - 0 : 'No failure', - 1 : 'ECC single bit correction warning rate exceeded', - 2 : 'ECC single bit correction failure rate exceeded', - 4 : 'ECC multibit fault encountered', - 8 : 'ECC single bit correction logging disabled', + failure_modes = { + 1 : 'ECC single bit correction warning rate exceeded', + 2 : 'ECC single bit correction failure rate exceeded', + 4 : 'ECC multibit fault encountered', + 8 : 'ECC single bit correction logging disabled', 16 : 'device disabled because of spare activation', } for location, status, size, failuremode in info: if location == item: - status = saveint(status) - failuremode = saveint(failuremode) - state = 0 - msg = "" - if status != 3: - state = 2 - msg = "Modul State is %s(!!), " % status - label = "" - if failuremode in [ 2, 4 ]: - state = 2 - label = "(!!)" - elif failuremode in [ 1, 8, 16 ]: - state = 1 - label = "(!)" - - size = get_bytes_human_readable(int(size)*1024) - return state, msg + "Failuremode: %s%s, Size: %s" % \ - (failure_mode[failuremode], label, size) + status = int(status) + failuremode = int(failuremode) + if failuremode == 0: + yield 0, "No failure" + else: + bitmask = 1 + while bitmask <= 16: + if failuremode & bitmask != 0: + if bitmask in [2, 4]: + yield 2, failure_modes[bitmask] + elif bitmask in [1, 8, 16]: + yield 1, failure_modes[bitmask] + bitmask *= 2 + yield 0, "Size: %s" % get_bytes_human_readable(int(size) * 1024) - return 3, "Module not found in SNMP tree" check_info["dell_om_mem"] = { "check_function" : check_dell_om_mem, "inventory_function" : inventory_dell_om_mem, - "service_description" : "Module %s", + "service_description" : "Memory Module %s", "has_perfdata" : False, # There is no other way to find out that openmanage is present. "snmp_scan_function" : scan_dell_om, "snmp_info" : ( ".1.3.6.1.4.1.674.10892.1.1100.50.1", [ - "8.1", #Location - "5.1", #Status - "14.1", #Size - "20.1", #FailureMode + "8.1", # Location + "5.1", # Status + "14.1", # Size + "20.1", # FailureMode ]), "includes" : [ "dell_om.include" ], }

9 years, 10 months

Check_MK Git: check_mk: #1721 FIX dell_om_mem: Handle formerly unhandled status code 3 ( ECC single bit correction failure rate exceeded)

by Mathias Kettner

Module: check_mk Branch: master Commit: dc13e6b9a3de1397a0e24ac6b221ac715fcffcd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc13e6b9a3de13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:41:53 2014 +0100 #1721 FIX dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded) Thanks to Hermann Maurer. --- .werks/1721 | 9 +++++++++ ChangeLog | 1 + checks/dell_om_mem | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1721 b/.werks/1721 new file mode 100644 index 0000000..9d645f9 --- /dev/null +++ b/.werks/1721 @@ -0,0 +1,9 @@ +Title: dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418074869 +Class: fix + +Thanks to Hermann Maurer. diff --git a/ChangeLog b/ChangeLog index e09711c..5bb1085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now + * 1721 FIX: dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded)... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/dell_om_mem b/checks/dell_om_mem index 3ed4562..ccf51d2 100644 --- a/checks/dell_om_mem +++ b/checks/dell_om_mem @@ -32,6 +32,7 @@ def check_dell_om_mem(item, _no_params, info): 0 : 'No failure', 1 : 'ECC single bit correction warning rate exceeded', 2 : 'ECC single bit correction failure rate exceeded', + 3 : 'ECC single bit correction failure rate exceeded', 4 : 'ECC multibit fault encountered', 8 : 'ECC single bit correction logging disabled', 16 : 'device disabled because of spare activation', @@ -47,7 +48,7 @@ def check_dell_om_mem(item, _no_params, info): state = 2 msg = "Modul State is %s(!!), " % status label = "" - if failuremode in [ 2, 4 ]: + if failuremode in [ 2, 4, 3 ]: state = 2 label = "(!!)" elif failuremode in [ 1, 8, 16 ]:

9 years, 10 months

Check_MK Git: check_mk: #1718 Show groups of regex match of events in details views of Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a67a618742930bf6b4663a649045963e1442cb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a67a618742930… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:48:19 2014 +0100 #1718 Show groups of regex match of events in details views of Event Console --- .werks/1718 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 19 +++++++++++++++++++ web/htdocs/status.css | 10 ++++++++++ 4 files changed, 39 insertions(+) diff --git a/.werks/1718 b/.werks/1718 new file mode 100644 index 0000000..5daef04 --- /dev/null +++ b/.werks/1718 @@ -0,0 +1,9 @@ +Title: Show groups of regex match of events in details views of Event Console +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1418071673 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9286c23..59e40f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view + * 1718 Show groups of regex match of events in details views of Event Console * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps * 1643 FIX: Improved error handling of exceptions when processing log lines diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index f30494e..d6643d3 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -334,6 +334,23 @@ if mkeventd_enabled: "paint" : lambda row: ("", row["event_text"].replace("\x01"," ")), } + def paint_ec_match_groups(row): + groups = row["event_match_groups"] + if groups: + code = "" + for text in groups: + code += '%s' % text + return "matchgroups", code + else: + return "", "" + + multisite_painters["event_match_groups"] = { + "title" : _("Match Groups"), + "short" : _("Match"), + "columns" : ["event_match_groups"], + "paint" : paint_ec_match_groups, + } + multisite_painters["event_first"] = { "title" : _("Time of first occurrance of this serial"), "short" : _("First"), @@ -906,6 +923,7 @@ if mkeventd_enabled: ('host_contacts', None, ''), ('host_icons', None, ''), ('event_text', None, ''), + ('event_match_groups', None, ''), ('event_comment', None, ''), ('event_owner', None, ''), ('event_first', None, ''), @@ -1002,6 +1020,7 @@ if mkeventd_enabled: ('event_state', None, ''), ('event_host', 'ec_history_of_host', ''), ('event_text', None, ''), + ('event_match_groups', None, ''), ('event_comment', None, ''), ('event_owner', None, ''), ('event_first', None, ''), diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 0631c30..4836d29 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -397,3 +397,13 @@ table.data tr.data td table.customvars td:last-child { border-left: 1px solid #bbb; padding-left: 5px; } + +td.matchgroups span { + margin-right: 3px; + background-color: #ffffff; + border: 1px solid #eeeeee; + border-radius: 3px; + box-shadow: 0px 0px 1px #888; + padding: 0px 3px; + font-family: monospace; +}

9 years, 10 months

Check_MK Git: check_mk: #1719 Allow to allow both host name and IP address when checking for events in Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 3821ae6d250e93dd2fe33b511d44503211bd291b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3821ae6d250e93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:22:41 2014 +0100 #1719 Allow to allow both host name and IP address when checking for events in Event Console The check Check for events in Event Console used to allow either a match for the host name or the IP address when trying to find events that belong to a monitored host. Now there is a new third option Try both host name and IP address that will try to match the host name and the IP address at the same time and will match the event if one of both matches succeeds. This helps in situations where the Event Console sometimes just gets the IP address of the remote host correctly, but has no host name. --- .werks/1719 | 15 ++++++++++++ ChangeLog | 1 + mkeventd/lib/check_mkevents.cc | 41 +++++++++++++++++++++++++++------ mkeventd/web/plugins/wato/mkeventd.py | 8 ++++--- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/.werks/1719 b/.werks/1719 new file mode 100644 index 0000000..a5d2b48 --- /dev/null +++ b/.werks/1719 @@ -0,0 +1,15 @@ +Title: Allow to allow both host name and IP address when checking for events in Event Console +Level: 2 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1418073600 +Class: feature + +The check Check for events in Event Console used to allow either a +match for the host name or the IP address when trying to find events that +belong to a monitored host. Now there is a new third option Try both +host name and IP address that will try to match the host name and the +IP address at the same time and will match the event if one of both matches +succeeds. This helps in situations where the Event Console sometimes just +gets the IP address of the remote host correctly, but has no host name. diff --git a/ChangeLog b/ChangeLog index 59e40f5..5ac7b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -253,6 +253,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view * 1718 Show groups of regex match of events in details views of Event Console + * 1719 Allow to allow both host name and IP address when checking for events in Event Console... * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps * 1643 FIX: Improved error handling of exceptions when processing log lines diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 4d54be5..c9bcfeb 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -47,6 +47,26 @@ void usage() { printf("Usage: check_mkevents [-s SOCKETPATH] [-H REMOTE:PORT] [-a] HOST [APPLICATION]"); printf("\n -a do not take into account acknowledged events.\n"); + printf(" HOST may be a hostname, and IP address or hostname/IP-address.\n"); +} + + +string prepare_hostname_regex(const char *s) +{ + const char *scan = s; + string result = ""; + while (*scan) { + if (strchr("[](){}^$.*+?|\\", *scan)) { + result += "\\"; + result += *scan; + } + else if (*scan == '/') + result += "|"; + else + result += *scan; + scan ++; + } + return result; } @@ -174,15 +194,22 @@ int main(int argc, char** argv) // Create query message string query_message; - query_message.append("GET events\nFilter: event_host =~ "); - query_message.append(host); - query_message.append("\nFilter: event_phase in open ack\n"); - query_message.append("OutputFormat: plain\n"); + query_message += "GET events\nFilter: event_host "; + if (strchr(host, '/')) { + query_message += "~~ "; + query_message += prepare_hostname_regex(host); + } + else { + query_message += "=~ "; + query_message += host; + } + query_message += "\nFilter: event_phase in open ack\n"; + query_message += "OutputFormat: plain\n"; if (application) { - query_message.append("Filter: event_application ~~ "); - query_message.append(application); - query_message.append("\n"); + query_message += "Filter: event_application ~~ "; + query_message += application; + query_message += "\n"; } // Send message diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 298146f..bbd54ab 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1947,11 +1947,13 @@ register_rule( "host. This is needed in cases where the event source (syslog, snmptrapd) " "do not send a host name that matches the monitoring host name."), choices = [ - ( '$HOSTNAME$', _("Monitoring Host name") ), - ( '$HOSTADDRESS$', _("Host IP Address" ) ) ], + ( '$HOSTNAME$', _("Monitoring host name") ), + ( '$HOSTADDRESS$', _("Host IP address" ) ), + ( '$HOSTNAME$/$HOSTADDRESS$', _("Try both host name and IP address" ) ), + ], otherlabel = _("Specify explicitly"), explicit = TextAscii(allow_empty = False, attrencode = True), - default_value = '$HOSTNAME$', + default_value = '$HOSTNAME$/$HOSTADDRESS$', ) ), ( "item",

9 years, 10 months

Check_MK Git: check_mk: #1720 FIX Remove bogus column H.Down if " Consider times where the host is down" is switch off

by Mathias Kettner

Module: check_mk Branch: master Commit: 019ac78ed318a4cd334a713937bf43219cb2f539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019ac78ed318a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:30:07 2014 +0100 #1720 FIX Remove bogus column H.Down if "Consider times where the host is down" is switch off That column would be displayed nevertheless and was also zero. --- .werks/1720 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/availability.py | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.werks/1720 b/.werks/1720 new file mode 100644 index 0000000..463e8d4 --- /dev/null +++ b/.werks/1720 @@ -0,0 +1,9 @@ +Title: Remove bogus column H.Down if "Consider times where the host is down" is switch off +Level: 1 +Component: reporting +Compatible: compat +Version: 1.2.5i7 +Date: 1418074135 +Class: fix + +That column would be displayed nevertheless and was also zero. diff --git a/ChangeLog b/ChangeLog index 5ac7b22..e09711c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,9 @@ * 1559 FIX: Fix link from BI icon to BI views (aggregations affected by this host/service) * 1692 FIX: Aggregations with umlauts in title/topic can now be displayed in BI/Availability + Reporting & Availability: + * 1720 FIX: Remove bogus column H.Down if "Consider times where the host is down" is switch off... + Event Console: * 1169 Added host state type filter to "recent event history" view * 1718 Show groups of regex match of events in details views of Event Console diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index af317a0..ffdbe04 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1300,6 +1300,8 @@ def render_availability_group(group_title, range_title, group_id, availability, return False elif sid == "flapping" and not avoptions["consider"]["flapping"]: return False + elif sid == "host_down" and not avoptions["consider"]["host_down"]: + return False elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: return False else:

9 years, 10 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6cd33175488e1779d2c935ba60d65a5fdbe201ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd33175488e17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:23:38 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bdc2aea..57bf58c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1717 +1727

9 years, 10 months

Check_MK Git: check_mk: #1717 Split up LDAP configuration dialog into four boxes

by Mathias Kettner

Module: check_mk Branch: master Commit: cf8ef2b6cd67d80fca37f9cc738dfbb95182a78d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf8ef2b6cd67d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:25:50 2014 +0100 #1717 Split up LDAP configuration dialog into four boxes This allows folding part of the configuration and easier access to the Save & Test button. --- .werks/1717 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/1717 b/.werks/1717 new file mode 100644 index 0000000..236c0fb --- /dev/null +++ b/.werks/1717 @@ -0,0 +1,9 @@ +Title: Split up LDAP configuration dialog into four boxes +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1418070310 +Class: feature + +This allows folding part of the configuration and easier access to the Save & Test button. diff --git a/ChangeLog b/ChangeLog index 9fd9228..9286c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -210,6 +210,7 @@ * 1689 Creating WATO backends for each configured site now... * 1690 Pending changes can now be discarded... * 1693 Added search form to global settings page... + * 1717 Split up LDAP configuration dialog into four boxes... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7b88e45..63c9974 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7208,10 +7208,16 @@ def mode_ldap_config(phase): html.write('<div id=ldap>') html.write('<table><tr><td>') html.begin_form('ldap_config', method = "POST", action = 'wato.py?mode=ldap_config') - forms.header(_('LDAP Settings')) + need_header = True for (var, valuespec) in vs: value = current_settings.get(var, valuespec.default_value()) - forms.section(valuespec.title()) + if isinstance(valuespec, Dictionary): + valuespec._render = "form" + else: + if need_header: + forms.header(_('Other Settings')) + need_header = False + forms.section(valuespec.title()) valuespec.render_input(var, value) html.help(valuespec.help()) forms.end()

9 years, 10 months

Check_MK Git: check_mk: Fix size of icons in LDAP connection test

by Mathias Kettner

Module: check_mk Branch: master Commit: d758d231ab25d4396525bb14a278105517159037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d758d231ab25d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:23:30 2014 +0100 Fix size of icons in LDAP connection test --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d3ec85..7b88e45 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7346,9 +7346,9 @@ def mode_ldap_config(phase): msg = _('Exception: %s') % html.attrencode(e) if state: - img = '<img src="images/icon_success.png" alt="%s" />' % _('Success') + img = html.render_icon("success", _('Success')) else: - img = '<img src="images/icon_failed.png" alt="%s" />' % _('Failed') + img = html.render_icon("failed", _("Failed")) table.cell(_("Test"), title) table.cell(_("State"), img)

9 years, 10 months

Check_MK Git: check_mk: #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now

by Mathias Kettner

Module: check_mk Branch: master Commit: 775619ca0fee7525f1b427851ce1823e83b4f642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=775619ca0fee75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 18:10:42 2014 +0100 #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now --- .werks/1716 | 9 +++++++++ ChangeLog | 1 + checks/windows_tasks | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1716 b/.werks/1716 new file mode 100644 index 0000000..b90f2b5 --- /dev/null +++ b/.werks/1716 @@ -0,0 +1,9 @@ +Title: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418058616 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a28ed89..9fd9228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 1711 FIX: win_printers.ps1: ignore temporary printers created by RDP terminal sessions... * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... + * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/windows_tasks b/checks/windows_tasks index b921361..2c520b2 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -38,6 +38,8 @@ # Last Result : 1 # Scheduled Task State : Disabled +# A list of all task state can be found here: +# http://msdn.microsoft.com/en-us/library/aa383604%28VS.85%29.aspx def windows_tasks_convert(info): data = {} @@ -65,12 +67,14 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301 ]: # SCHED_S_TASK_RUNNING + if last_result not in [ 0, 0x00041301, 0x00041325 ]: # SCHED_S_TASK_RUNNING, SCHED_S_TASK_QUEUED state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) if last_result == 0x00041301: msg[-1] += " (currently running)" + elif last_result == 0x00041325: + msg[-1] += " (queued)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")

9 years, 10 months

Check_MK Git: check_mk: #1715 Output icon information in CSV/JSON/ Python export of views

by Mathias Kettner

Module: check_mk Branch: master Commit: e94cc003ab9abb662aac615a5f33cf7ee03820bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94cc003ab9abb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 17:57:55 2014 +0100 #1715 Output icon information in CSV/JSON/Python export of views When exporting views to JSON, Python or CSV the column with the icons is now no longer empty but is a space separated list of all icon names of the host/sevice in question - without path information or the suffixes of the file type. That way you now can get additional information about the objects. --- .werks/1715 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 10 +++++++--- web/plugins/icons/builtin.py | 2 +- web/plugins/views/painters.py | 18 +++++++++++++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.werks/1715 b/.werks/1715 new file mode 100644 index 0000000..019e372 --- /dev/null +++ b/.werks/1715 @@ -0,0 +1,13 @@ +Title: Output icon information in CSV/JSON/Python export of views +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418057797 +Class: feature + +When exporting views to JSON, Python or CSV the column with the icons +is now no longer empty but is a space separated list of all icon names +of the host/sevice in question - without path information or the suffixes +of the file type. That way you now can get additional information about +the objects. diff --git a/ChangeLog b/ChangeLog index 45bb972..a28ed89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -146,6 +146,7 @@ * 1700 Enable icon for link to host/service parameters per default now... * 1705 Better styling of dashboard designer * 1714 Add support for jsonp export (next to json and python)... + * 1715 Output icon information in CSV/JSON/Python export of views... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9d7740a..d0c0b16 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -328,10 +328,14 @@ class html: def icon(self, help, icon): self.write(self.render_icon(icon, help)) - def render_icon(self, icon, help, middle=True): + def render_icon(self, icon, help="", middle=True): align = middle and ' align=absmiddle' or '' - return '<img%s class=icon title="%s" src="images/icon_%s.png" />' % \ - (align, self.attrencode(help), icon) + title = help and ' title="%s"' % self.attrencode(help) or "" + if "/" in icon: + src = "images/" + icon + else: + src = "images/icon_%s.png" % icon + return '<img src="%s" class=icon%s%s />' % (src, align, title) def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index d25f979..1b4af8d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -68,7 +68,7 @@ def paint_icon_image(what, row, tags, custom_vars): if row[what + '_icon_image']: - return '<img align=absmiddle class=icon src="images/icons/%s">' % row[what + '_icon_image'] + return html.render_icon("icons/" + row[what + '_icon_image']) multisite_icons.append({ 'columns': [ 'icon_image' ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 448d033..fe896e2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -151,7 +151,23 @@ def paint_icons(what, row): except Exception, e: output += 'Exception in icon plugin! ' + traceback.format_exc() - return "icons", output + if html.output_format == "html": + return "icons", output + else: + # Strip icon names out of HTML code that is generated by htmllib.render_icon() + icon_rename_regex = regex('<img src="([^"]*)"[^>]*>') + icons = [] + for n in icon_rename_regex.findall(output): + if n.startswith("images/"): + n = n[7:] + if n.startswith("icon_"): + n = n[5:] + if n.endswith(".png"): + n = n[:-4] + elif n.endswith(".gif"): + n = n[:-4] + icons.append(n.encode('utf-8')) + return "icons", " ".join(icons) def iconpainter_columns(what): cols = set(['site',

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits