Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: 347bd0ae7e0006a1f17a9634155458c036787969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=347bd0ae7e0006… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Oct 27 09:35:36 2016 +0200 Fixed localisations. --- web/htdocs/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0c98995..153b721 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -236,7 +236,7 @@ class OutputFunnel(object): text = text.value if type(text) not in [str, unicode]: # also possible: type Exception! - raise MKGeneralException(_('Write accepts str and unicode objects only!')) + raise MKGeneralException(_('Type Error: html.write accepts str and unicode input objects only!')) if self.plugged: self.plugged_text += text @@ -928,7 +928,7 @@ class HTMLCheck_MK(HTMLGenerator): self.icon_button(None, _("Toggle context help texts"), "help", id="helpbutton", onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) - self.open_a(href=_("http://mathias-kettner.de"), class_="head_logo") + self.open_a(href="http://mathias-kettner.de", class_="head_logo") self.img(src="images/logo_cmk_small.png") self.close_a() self.close_td()

7 years, 10 months

htmllib refactoring: popup-trigger and context-buttons

by Roland Halbig

Module: check_mk Branch: master Commit: 37438839b7788573a03b8ea0aaf8d5770532046a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37438839b77885… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Oct 19 10:22:02 2016 +0200 htmllib refactoring: popup-trigger and context-buttons htmllib refactoring: updating test files. Fixed HTML bug in views/painters. Moving snapin functions back to sidebar.py Cleaning up htmllib integration test file. Checked if render refactoring hurts. fixed NotImplementedError without () --- tests/web/classes.py | 348 +++++++++++++++++------ tests/web/test_html.py | 31 ++- tests/web/test_htmllib_integration.py | 57 ++-- tests/web/tools.py | 121 +++++--- web/htdocs/htmllib.py | 508 +++++++++++++++++----------------- web/plugins/views/inventory.py | 2 +- web/plugins/views/painters.py | 8 +- 7 files changed, 654 insertions(+), 421 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=37438839b7…

7 years, 10 months

Hide EC from tactical overview when disabled in local sites and no events are found in any site

by Lars Michelsen

Module: check_mk Branch: master Commit: 32d06c9fe49e049e45bde3570a33b716cd978a4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32d06c9fe49e04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 26 17:10:40 2016 +0200 Hide EC from tactical overview when disabled in local sites and no events are found in any site --- web/plugins/sidebar/shipped.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index da0177d..203dee5 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -696,6 +696,10 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): if row["what"] == "event": amount, problems, unhandled_problems = row["data"] stales = 0 + + # no events open and disabled in local site: don't show events + if amount == 0 and not config.mkeventd_enabled: + continue else: amount, problems, unhandled_problems, stales = row["data"]

7 years, 10 months

Added site filter to event console views by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e5f57ddf0e61f206f3be5a3ddd23658c409ead3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e5f57ddf0e61f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 26 17:08:17 2016 +0200 Added site filter to event console views by default --- web/plugins/views/mkeventd.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 5a25fd2..7a929cc 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -673,6 +673,7 @@ if mkeventd_enabled: 'event_sl', 'event_sl_max', 'hostregex', + 'siteopt', ], 'hard_filtervars': [ ( 'event_phase_open', "on" ), @@ -847,6 +848,8 @@ if mkeventd_enabled: 'history_who', 'history_what', 'host_state_type', + 'hostregex', + 'siteopt', ], 'hard_filtervars': [ ('history_time_from', '1'),

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: a92528984476c0f6b70ceaa769d65435fa1acd85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a92528984476c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 26 17:10:15 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistColumn.cc | 4 ++-- livestatus/src/AttributelistFilter.cc | 4 ++-- livestatus/src/AttributelistFilter.h | 2 +- livestatus/src/Column.h | 4 ++-- livestatus/src/ColumnFilter.h | 5 +++-- livestatus/src/CustomVarsFilter.cc | 4 ++-- livestatus/src/CustomVarsFilter.h | 2 +- livestatus/src/DoubleFilter.cc | 6 +++--- livestatus/src/DoubleFilter.h | 2 +- livestatus/src/DynamicColumn.cc | 6 ++++-- livestatus/src/DynamicColumn.h | 4 +++- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 10 +++++----- livestatus/src/DynamicEventConsoleReplicationColumn.h | 4 +++- livestatus/src/DynamicLogwatchFileColumn.cc | 9 ++++----- livestatus/src/DynamicLogwatchFileColumn.h | 6 ++++-- livestatus/src/EventConsoleConnection.cc | 6 ++---- livestatus/src/EventConsoleConnection.h | 2 +- livestatus/src/Filter.cc | 3 --- livestatus/src/Filter.h | 5 ----- livestatus/src/HostFileColumn.cc | 10 +++++----- livestatus/src/HostlistFilter.cc | 6 +++--- livestatus/src/HostlistFilter.h | 2 +- livestatus/src/IntFilter.cc | 14 +++++++------- livestatus/src/IntFilter.h | 2 +- livestatus/src/ListFilter.cc | 8 ++++---- livestatus/src/ListFilter.h | 2 +- livestatus/src/LogCache.cc | 6 +++--- livestatus/src/LogCache.h | 2 +- livestatus/src/Logfile.cc | 5 +++-- livestatus/src/Logfile.h | 4 ++-- livestatus/src/Logger.h | 5 ++--- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/OutputBuffer.h | 2 ++ livestatus/src/Query.cc | 2 +- livestatus/src/Renderer.cc | 2 +- livestatus/src/ServicelistFilter.cc | 14 +++++++------- livestatus/src/ServicelistFilter.h | 2 +- livestatus/src/Store.cc | 5 +++-- livestatus/src/StringFilter.cc | 2 +- livestatus/src/StringFilter.h | 2 +- livestatus/src/TableEventConsole.cc | 10 ++++++---- livestatus/src/TableEventConsoleReplication.cc | 2 +- livestatus/src/TableHosts.cc | 2 +- livestatus/src/VariadicFilter.cc | 11 ++++++----- livestatus/src/VariadicFilter.h | 3 ++- livestatus/src/mk_logwatch.cc | 3 +-- livestatus/src/mk_logwatch.h | 4 +++- 47 files changed, 114 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a925289844…

7 years, 10 months

3971 Event Console: Event numbers are now also displayed in tactical overview snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 86f297304d129d15bfbc632ca176e0549ef516b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86f297304d129d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 26 16:09:45 2016 +0200 3971 Event Console: Event numbers are now also displayed in tactical overview snapin In addition to the host and service states, the tactical overview is now showing numbers for the open events in the Event Console. --- .werks/3971 | 10 ++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 113 ++++++++++++++++++++++++++++++++++------- 3 files changed, 105 insertions(+), 19 deletions(-) diff --git a/.werks/3971 b/.werks/3971 new file mode 100644 index 0000000..3ce5ec7 --- /dev/null +++ b/.werks/3971 @@ -0,0 +1,10 @@ +Title: Event Console: Event numbers are now also displayed in tactical overview snapin +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1477490226 +Class: feature + +In addition to the host and service states, the tactical overview is now showing numbers +for the open events in the Event Console. diff --git a/ChangeLog b/ChangeLog index 8c07565..2c9c0a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ Multisite: * 3959 Two new filters for the comment view: author and comment text field * 3970 SEC: Fixed possible URL injection on index page... + * 3971 Event Console: Event numbers are now also displayed in tactical overview snapin... * 3897 FIX: Fixed possible exception in raw edition when rendering graphs * 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output * 3902 FIX: Graph search view: Changing painter options made page empty diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d32a775..da0177d 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -589,6 +589,13 @@ def get_tactical_overview_data(extra_filter_headers): "Filter: host_custom_variable_names < _REALNAME\n" + \ extra_filter_headers + event_query = ( + "GET eventconsoleevents\n" + "Stats: event_phase != \n" + "Stats: event_phase = ack\n" + "Stats: event_phase = open\n" + ) + try: hstdata = sites.live().query_summed_stats(host_query) svcdata = sites.live().query_summed_stats(service_query) @@ -601,52 +608,120 @@ def get_tactical_overview_data(extra_filter_headers): if notdata is None: notdata = [0] + event_data = sites.live().query_summed_stats(event_query) + except livestatus.MKLivestatusNotFoundError: return None, None, None - return hstdata, svcdata, notdata + return hstdata, svcdata, notdata, event_data def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): if extra_url_variables is None: extra_url_variables = [] - hstdata, svcdata, notdata = get_tactical_overview_data(extra_filter_headers) + hstdata, svcdata, notdata, event_data = get_tactical_overview_data(extra_filter_headers) - if hstdata is None or svcdata is None or notdata is None: - html.write("<center>No data from any site</center>") + if hstdata is None or svcdata is None or notdata is None or event_data is None: + html.write("<center>%s</center>" % _("No data from any site")) return td_class = 'col3' if hstdata[-1] or svcdata[-1]: td_class = 'col4' - html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") - for title, data, view, stale_view, what in [ - (_("Hosts"), hstdata, 'hostproblems', 'stale_hosts', 'host'), - (_("Services"), svcdata, 'svcproblems', 'uncheckedsvc', 'service')]: + rows = [ + { + "what" : 'host', + "title" : _("Hosts"), + "data" : hstdata, + "views" : { + "all" : [ + ("view_name", "allhosts"), + ], + "handled" : [ + ("view_name", 'hostproblems'), + ], + "unhandled" : [ + ("view_name", "hostproblems"), + ("is_host_acknowledged", 0), + ], + "stale" : [ + ("view_name", 'stale_hosts'), + ], + }, + }, + { + "what" : "service", + "title" : _("Services"), + "data" : svcdata, + "views" : { + "all" : [ + ("view_name", "allservices"), + ], + "handled" : [ + ("view_name", "svcproblems"), + ], + "unhandled" : [ + ("view_name", "svcproblems"), + ("is_service_acknowledged", 0), + ], + "stale" : [ + ("view_name", "uncheckedsvc"), + ], + }, + }, + { + "what" : "event", + "title" : _("Events"), + "data" : event_data, + "views" : { + "all" : [ + ("view_name", "ec_events"), + ], + "handled" : [ + ("view_name", "ec_events"), + ("event_phase_ack", "on"), + ], + "unhandled" : [ + ("view_name", "ec_events"), + ("event_phase_open", "on"), + ], + "stale" : None, + }, + }, + ] - amount, problems, unhandled_problems, stales = data + html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") + for row in rows: + if row["what"] == "event": + amount, problems, unhandled_problems = row["data"] + stales = 0 + else: + amount, problems, unhandled_problems, stales = row["data"] - title_row = "<tr><th>%s</th><th>%s</th><th>%s</th>" % (title, _('Problems'), _('Unhandled')) + title_row = "<tr><th>%s</th><th>%s</th><th>%s</th>" % \ + (row["title"], _('Problems'), _('Unhandled')) if td_class == 'col4': title_row += "<th>%s</th></tr>" % _("Stale") html.write("%s\n" % title_row) html.write("<tr>") - url = html.makeuri_contextless([("view_name", "all" + what + "s")] + extra_url_variables, filename="view.py") - html.write('<td class="total %s"><a target="main" href="%s">%d</a></td>' % (td_class, url, amount)) + url = html.makeuri_contextless(row["views"]["all"] + extra_url_variables,filename="view.py") + html.write('<td class="total %s"><a target="main" href="%s">%d</a></td>' % + (td_class, url, amount)) - for value, unhandled in [ (problems, False), (unhandled_problems, True) ]: - url = html.makeuri_contextless([("view_name", view)] + extra_url_variables, filename="view.py") - if unhandled: - url += "&is_%s_acknowledged=0" % what + for value, ty in [ (problems, "handled"), (unhandled_problems, "unhandled") ]: + url = html.makeuri_contextless(row["views"][ty] + extra_url_variables, filename="view.py") text = link(str(value), url) html.write('<td class="%s%s">%s</td>' % (td_class, value == 0 and " " or ' states prob', text)) if td_class == 'col4': - url = html.makeuri_contextless([("view_name", stale_view)] + extra_url_variables, filename="view.py") - text = link(str(stales), url) - html.write('<td class="%s%s">%s</td>' % (td_class, value == 0 and " " or ' states prob', text)) + if row["views"]["stale"]: + url = html.makeuri_contextless(row["views"]["stale"] + extra_url_variables, filename="view.py") + text = link(str(stales), url) + html.write('<td class="%s%s">%s</td>' % (td_class, value == 0 and " " or ' states prob', text)) + else: + html.write("<td></td>\n") html.write("</tr>\n") html.write("</table>\n")

7 years, 10 months

4035 FIX df_zos: Fixed ignoring last filesystem after new discovery

by Sven Rueß

Module: check_mk Branch: master Commit: c183585e93f4281730e0fcabb62b3eba2fb08fbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c183585e93f428… Author: Sven RueÃ <sr(a)mathias-kettner.de> Date: Wed Oct 26 15:11:37 2016 +0200 4035 FIX df_zos: Fixed ignoring last filesystem after new discovery Filesystemcheck df_zos was ignoring the last filesystem, because not all versions of z/OS will end with a zero line after the df command. This was fixed with adding the pattern line fix at the end of the agent output. Pleae do a new discovery to check, if there is a filesystem is missing. --- .werks/4035 | 14 ++++++++++++++ ChangeLog | 1 + agents/z_os/README.convert | 6 ++++-- agents/z_os/check_mk_agent | 2 +- agents/z_os/check_mk_agent_wrapper | 2 +- checks/df_zos | 7 ++++--- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.werks/4035 b/.werks/4035 new file mode 100644 index 0000000..7cfa3c0 --- /dev/null +++ b/.werks/4035 @@ -0,0 +1,14 @@ +Title: df_zos: Fixed ignoring last filesystem after new discovery +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1477487290 + +Filesystemcheck df_zos was ignoring the last filesystem, because not all versions +of z/OS will end with a zero line after the df command. This was fixed with adding +the pattern line fix at the end of the agent output. + +Pleae do a new discovery to check, if there is a filesystem is missing. diff --git a/ChangeLog b/ChangeLog index 15e5f0c..8c07565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 3961 FIX: fixed error sections handling if parse function is available * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated... * 3985 FIX: mrpe: fixed broken long output when using the CMC... + * 4035 FIX: df_zos: Fixed ignoring last filesystem after new discovery... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/z_os/README.convert b/agents/z_os/README.convert index 8d88b84..310dde6 100644 --- a/agents/z_os/README.convert +++ b/agents/z_os/README.convert @@ -1,5 +1,7 @@ Lesbar: -iconv -f ibm-1047 -t utf-8 FILENAME | tr "\205" "\12" | tr -d "\302" +- Agent: iconv -f ibm-1047 -t utf-8 check_mk_agent | tr "\205" "\12" | tr -d "\302" > check_mk_agent.zOS +- Wrapper: iconv -f ibm-1047 -t utf-8 check_mk_agent_wrapper | tr "\205" "\12" | tr -d "\302" > check_mk_agent.wrapper z/OS: -iconv -f utf-8 -t ibm-1047 FILENAME | tr "\12" "\205" | tr -d "\302" +- Agent: iconv -f utf-8 -t ibm-1047 check_mk_agent.zOS | tr "\12" "\205" | tr -d "\302" > check_mk_agent +- Wrapper: iconv -f utf-8 -t ibm-1047 check_mk_agent.wrapper | tr "\12" "\205" | tr -d "\302" > check_mk_agent_wrapper diff --git a/agents/z_os/check_mk_agent b/agents/z_os/check_mk_agent index cc8f920..3189456 100644 --- a/agents/z_os/check_mk_agent +++ b/agents/z_os/check_mk_agent @@ -1 +1 @@ -{§@ònP`%¢£@N§¥%%§£@mÅÄÃmÁÄÄmÅÙÙÕÖò~ñ%§£@×ÁãÈ~a%%§£@ÔÒmÓÉÄÉÙ~a€¢aamm£%§£@ÔÒmÃÖÕÆÄÉÙ~a£am%{@Ô@¢€k@š@¢£@¢@@€%×ÁãÈ~[×ÁãÈza€¢a%%{@Á@§€£¢@@×ÓäÇÉÕâÄÉÙ@Š@¢š@@§€£@@£%{@€€£@@£@£@€£€£@@£@£K@×€¢@@£@Š%{@¢£¢@@€¢£@€£€£@¢@Š£@}LLL}@@}nnn}%×ÓäÇÉÕâÄÉÙ~[ÔÒmÓÉÄÉÙa€¢%%{@Á@§€£¢@@ÓÖÃÁÓÄÉÙ@Š@š@§€£@@£%{@€£€£@¢£@£@£@¢£@LLLnnnK@×¢%{@@£@@€££@@£¢@€£@@¢K%ÓÖÃÁÓÄÉÙ~[ÔÒmÓÉÄÉÙa%%{@Á@¢@@â×ÖÖÓÄÉÙ@Š@¢š@@£@£@£%{@€£€£@@£š@@£@€££@M¢@Š]%â×ÖÖÓÄÉÙ~[ÔÒmÃÖÕÆÄÉÙa¢%%@LLLmnnn%@å¢z@ñKòKø%@Á£Öâz@©aÖâ%@×€¢Ä£šz@[×ÓäÇÉÕâÄÉÙ%@ÓÄ£šz@[ÓÖÃÁÓÄÉÙ%@âÄ£šz@[â×ÖÖÓÄÉÙ%@Á£Ä£šz@[ÔÒmÃÖÕÆÄÉÙ%%~[MŠ]%%%{@×¢¢¢%@LLL¢nnn%@¢@`@`@€¢k¥¢©k¥¢©öôk€k@O@¢€@O@¢@`@ñ@`@}¢a@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\aMàñkàòkàókàô]@a}%%%{@ä£%@}LLL€£nnn}%a€¢aa€£%%%{@Æ¢š¢£¢%@LLLm©¢nnn%@`¥×@O@¢@ñ@O@¢@}¢a_à¢\[a{{{{{{{{{{a}%%%{@×€¢%@@[×ÓäÇÉÕâÄÉÙ@òna¥a€%£%@@@@@¢£@@[M¢]%@@@@%@@@@@@@@@@`§@[¢£@œ@^@£%@@@@@@@@@@@@Ka[¢£%@@@@@@@@%@@@@%%%%{@Ó@¢%@}LLLnnn}%@@[ÓÖÃÁÓÄÉÙ@^@£%@@@@@¢£@@[M¢]@^@%@@@@@@@@@@`@[¢£@`@`§@[¢£@œ@^@£%@@@@@@@@@@@@Ka[¢£%@@@@@@@@%@@@@%% \ No newline at end of file +{§@ònP`%¢£@N§¥%%§£@mÅÄÃmÁÄÄmÅÙÙÕÖò~ñ%§£@×ÁãÈ~a%%§£@ÔÒmÓÉÄÉÙ~a€¢aamm£%§£@ÔÒmÃÖÕÆÄÉÙ~a£am%{@Ô@¢€k@š@¢£@¢@@€%×ÁãÈ~[×ÁãÈza€¢a%%{@Á@§€£¢@@×ÓäÇÉÕâÄÉÙ@Š@¢š@@§€£@@£%{@€€£@@£@£@€£€£@@£@£K@×€¢@@£@Š%{@¢£¢@@€¢£@€£€£@¢@Š£@}LLL}@@}nnn}%×ÓäÇÉÕâÄÉÙ~[ÔÒmÓÉÄÉÙa€¢%%{@Á@§€£¢@@ÓÖÃÁÓÄÉÙ@Š@š@§€£@@£%{@€£€£@¢£@£@£@¢£@LLLnnnK@×¢%{@@£@@€££@@£¢@€£@@¢K%ÓÖÃÁÓÄÉÙ~[ÔÒmÓÉÄÉÙa%%{@Á@¢@@â×ÖÖÓÄÉÙ@Š@¢š@@£@£@£%{@€£€£@@£š@@£@€££@M¢@Š]%â×ÖÖÓÄÉÙ~[ÔÒmÃÖÕÆÄÉÙa¢%%@}LLLmnnn}%@}å¢z@ñKòKø}%@}Á£Öâz@©aÖâ}%@×€¢Ä£šz@[×ÓäÇÉÕâÄÉÙ%@ÓÄ£šz@[ÓÖÃÁÓÄÉÙ%@âÄ£šz@[â×ÖÖÓÄÉÙ%@Á£Ä£šz@[ÔÒmÃÖÕÆÄÉÙ%%~[MŠ]%%%{@×¢¢¢%@}LLL¢nnn}%@}¢@`@`@€¢k¥¢©k¥¢©öôk€k}@O@¢€@O@¢@`@ñ@`@}¢a@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\aMàñkàòkàókàô]@a}%%%{@ä£%@}LLL€£nnn}%a€¢aa€£%%%{@Æ¢š¢£¢%@}LLLm©¢nnn}%@`¥×@O@¢@ñ@O@¢@}¢a_à¢\[a{{{{{{{{{{a}%@}{{{{{{{{{{}%%%{@×€¢%@@[×ÓäÇÉÕâÄÉÙ@òna¥a€%£%@@@@@¢£@@[M¢]%@@@@%@@@@@@@@@@`§@[¢£@œ@^@£%@@@@@@@@@@@@Ka[¢£%@@@@@@@@%@@@@%%%%{@Ó@¢%@}LLLnnn}%@@[ÓÖÃÁÓÄÉÙ@^@£%@@@@@¢£@@[M¢]@^@%@@@@@@@@@@`@[¢£@`@`§@[¢£@œ@^@£%@@@@@@@@@@@@Ka[¢£%@@@@@@@@%@@@@%% \ No newline at end of file diff --git a/agents/z_os/check_mk_agent_wrapper b/agents/z_os/check_mk_agent_wrapper index b39eb51..ba57ed0 100644 --- a/agents/z_os/check_mk_agent_wrapper +++ b/agents/z_os/check_mk_agent_wrapper @@ -1 +1 @@ -{Zaa¢@@@@@@@@@@@@{§@ònP`{§£§£@mÅÄÃmÁÄÄmÅÙÙÕÖò~ñ§£@×ÁãÈ~a¢£@`@€£@[M@[ð]aK@Kamm£@O@¥@`ÉÂÔñðô÷@`£äãÆø@O@£@@@@@@@@@@ \ No newline at end of file +{Zaa¢%{§@ònP`%{§£%§£@mÅÄÃmÁÄÄmÅÙÙÕÖò~ñ%§£@×ÁãÈ~a%¢£@`@€£%@[M@[ð]a%K@Kamm£@O@¥@`ÉÔñðô÷@`£äãÆø@O@£% \ No newline at end of file diff --git a/checks/df_zos b/checks/df_zos index 5e4732d..b0f36c5 100644 --- a/checks/df_zos +++ b/checks/df_zos @@ -51,9 +51,10 @@ def parse_df_zos(info): for line in info: if line[0].startswith('#####'): # Add item for filesystem - parsed.setdefault(fs, {}) - parsed[fs].setdefault('size', usage) - parsed[fs].setdefault('options', options) + if fs and usage and options: + parsed.setdefault(fs, {}) + parsed[fs].setdefault('size', usage) + parsed[fs].setdefault('options', options) fs = None usage = []

7 years, 10 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 97549e67c79c83eb3755c2195d7b4d872824c5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97549e67c79c83… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Oct 26 15:07:34 2016 +0200 Reserved 1 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c34588c..edfadbd 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4035 +4036

7 years, 10 months

Removed deprecated reference to prediction module

by Lars Michelsen

Module: check_mk Branch: master Commit: cc6b6ee2625d05ff26c2432d86cc544cc22f9f82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc6b6ee2625d05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 26 13:13:31 2016 +0200 Removed deprecated reference to prediction module --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 564ada8..0f157fd 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -271,7 +271,7 @@ config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try: modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'events', - 'alert_handling', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] + 'alert_handling', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] for module in modules: if module_exists(module): load_module(module)

7 years, 10 months

Introduced new variable mkeventd_enabled in cmk config for cmc

by Lars Michelsen

Module: check_mk Branch: master Commit: 153389478a964c21089a2839b3880b0740121912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=153389478a964c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 26 13:58:57 2016 +0200 Introduced new variable mkeventd_enabled in cmk config for cmc --- modules/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/config.py b/modules/config.py index 11c9f3f..3228db4 100644 --- a/modules/config.py +++ b/modules/config.py @@ -29,6 +29,7 @@ # variables are preset in checks/* as well. monitoring_core = "nagios" # other option: "cmc" +mkeventd_enabled = False # Set by OMD hook agent_port = 6556 agent_ports = [] agent_encryption = []

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016