Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Rework helper function of notifications, support alert handlers

by Mathias Kettner

Module: check_mk Branch: master Commit: 480aa77377c3df75bd0dd0e8e617fa10e3876e67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480aa77377c3df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 19 11:38:28 2016 +0200 Rework helper function of notifications, support alert handlers --- modules/events.py | 35 +++++++++++++++++++++++++++++++++++ modules/notify.py | 40 +--------------------------------------- web/htdocs/valuespec.py | 1 + web/htdocs/wato.py | 16 ++++++++++++---- 4 files changed, 49 insertions(+), 43 deletions(-) diff --git a/modules/events.py b/modules/events.py index a659703..b220ea6 100644 --- a/modules/events.py +++ b/modules/events.py @@ -565,3 +565,38 @@ def remove_context_from_environment(plugin_context, prefix): for key in plugin_context: os.unsetenv(prefix + key) + +# recursively turns a python object (with lists, dictionaries and pods) containing parameters +# into a flat contextlist for use as environment variables in plugins +# +# this: { "LVL1": [{"VALUE": 42}, {"VALUE": 13}] } +# would be added as: +# PARAMETER_LVL1_1_VALUE = 42 +# PARAMETER_LVL1_2_VALUE = 13 +def add_to_event_context(plugin_context, prefix, param): + if isinstance(param, list): + plugin_context[prefix + "S"] = " ".join(param) + for nr, value in enumerate(param): + add_to_event_context(plugin_context, "%s_%d" % (prefix, nr + 1), value) + elif isinstance(param, dict): + for key, value in param.items(): + add_to_event_context(plugin_context, "%s_%s" % (prefix, key.upper()), value) + else: + plugin_context[prefix] = plugin_param_to_string(param) + + +def plugin_param_to_string(value): + if type(value) in ( str, unicode ): + return value + elif type(value) in ( int, float ): + return str(value) + elif value == None: + return "" + elif value == True: + return "yes" + elif value == False: + return "" + elif type(value) in ( tuple, list ): + return "\t".join(value) + else: + return repr(value) # Should never happen diff --git a/modules/notify.py b/modules/notify.py index 4107db0..43bab3f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1082,25 +1082,6 @@ def notify_via_email(plugin_context): # 2: Cannot send, retry does not make sense -# recursively turns a python object (with lists, dictionaries and pods) containing parameters -# into a flat contextlist for use as environment variables in plugins -# -# this: { "LVL1": [{"VALUE": 42}, {"VALUE": 13}] } -# would be added as: -# PARAMETER_LVL1_1_VALUE = 42 -# PARAMETER_LVL1_2_VALUE = 13 -def add_to_context(plugin_context, prefix, param): - if isinstance(param, list): - plugin_context[prefix + "S"] = " ".join(param) - for nr, value in enumerate(param): - add_to_context(plugin_context, "%s_%d" % (prefix, nr + 1), value) - elif isinstance(param, dict): - for key, value in param.items(): - add_to_context(plugin_context, "%s_%s" % (prefix, key.upper()), value) - else: - plugin_context[prefix] = plugin_param_to_string(param) - - # Add the plugin parameters to the envinroment. We have two types of parameters: # - list, the legacy style. This will lead to PARAMETERS_1, ... # - dict, the new style for scripts with WATO rule. This will lead to @@ -1108,9 +1089,7 @@ def add_to_context(plugin_context, prefix, param): def create_plugin_context(raw_context, params): plugin_context = {} plugin_context.update(raw_context) # Make a real copy - - add_to_context(plugin_context, "PARAMETER", params) - + add_to_event_context(plugin_context, "PARAMETER", params) return plugin_context @@ -1120,23 +1099,6 @@ def create_bulk_parameter_context(params): for (varname, value) in dict_context.items() ] -def plugin_param_to_string(value): - if type(value) in ( str, unicode ): - return value - elif type(value) in ( int, float ): - return str(value) - elif value == None: - return "" - elif value == True: - return "yes" - elif value == False: - return "" - elif type(value) in ( tuple, list ): - return "\t".join(value) - else: - return repr(value) # Should never happen - - def path_to_notification_script(plugin): # Call actual script without any arguments if local_notifications_dir: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2b44708..ee52e40 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1837,6 +1837,7 @@ class OptionalDropdownChoice(DropdownChoice): input_value = value else: input_value = self._explicit.default_value() + html.help(self._explicit.help()) self._explicit.render_input(varprefix + "_ex", input_value) html.write("</span>") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8418191..154f428 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13473,6 +13473,7 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, match = "all", deprecated = deprecated) + # Registers notification parameters for a certain notification script, # e.g. "mail" or "sms". This will create: # - A WATO host rule @@ -13481,21 +13482,28 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, # The match type will be set to "dict". g_notification_parameters = {} def register_notification_parameters(scriptname, valuespec): + register_user_script_parameters( + g_notification_parameters, + "notification_parameters", + "monconf/" + _("Notifications"), + scriptname, + valuespec) + +def register_user_script_parameters(ruleset_dict, ruleset_dict_name, ruleset_group, scriptname, valuespec): script_title = notification_script_title(scriptname) title = _("Parameters for %s") % script_title valuespec._title = _("Call with the following parameters:") register_rule( - "monconf/" + _("Notifications"), - "notification_parameters:" + scriptname, + ruleset_group, + ruleset_dict_name + ":" + scriptname, valuespec, title, itemtype = None, match = "dict" ) - - g_notification_parameters[scriptname] = valuespec + ruleset_dict[scriptname] = valuespec

8 years, 3 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 30ed2889e0761bbf939c61d6d52caf5fdca749fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30ed2889e0761b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 18 15:30:36 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/CustomVarsColumn.cc | 104 +----------------------------- livestatus/src/CustomVarsColumn.h | 15 ++--- livestatus/src/CustomVarsDictColumn.cc | 64 ++++++++++++++++++ livestatus/src/CustomVarsDictColumn.h | 44 +++++++++++++ livestatus/src/CustomVarsNamesColumn.cc | 62 ++++++++++++++++++ livestatus/src/CustomVarsNamesColumn.h | 44 +++++++++++++ livestatus/src/CustomVarsValuesColumn.cc | 62 ++++++++++++++++++ livestatus/src/CustomVarsValuesColumn.h | 45 +++++++++++++ livestatus/src/TableContacts.cc | 22 ++++--- livestatus/src/TableHosts.cc | 24 +++---- livestatus/src/TableServices.cc | 22 ++++--- 11 files changed, 364 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30ed2889e0…

8 years, 3 months

3672 FIX Agent sections cached by the agent could cause stale services

by Lars Michelsen

Module: check_mk Branch: master Commit: a50bbb6f450a8c5f79837be45ff9f99dccb60851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a50bbb6f450a8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 18 14:50:51 2016 +0200 3672 FIX Agent sections cached by the agent could cause stale services There are situations, when the agent is caching sections and the check interval of a check is configured to a special value, that services will become stale even when the agent could still send cached information. For example the ntp section which is cached for 30 seconds, wen using a check interval of 120 seconds, could become stale after 180 seconds when the update of the agent cache takes more than 60 seconds. The agent would then throw away the cache which is currently updated and return no ntp section which results in a stale service then. The fix is now, that in such a situation the agent is processing the old, already cached, section and restarting the cache update immediately (instead of the last run as it was before). --- .werks/3672 | 22 ++++++++++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 7 ++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/3672 b/.werks/3672 new file mode 100644 index 0000000..4fee24f --- /dev/null +++ b/.werks/3672 @@ -0,0 +1,22 @@ +Title: Agent sections cached by the agent could cause stale services +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468845997 + +There are situations, when the agent is caching sections and the check +interval of a check is configured to a special value, that services will +become stale even when the agent could still send cached information. + +For example the ntp section which is cached for 30 seconds, wen using a +check interval of 120 seconds, could become stale after 180 seconds when +the update of the agent cache takes more than 60 seconds. The agent would +then throw away the cache which is currently updated and return no ntp +section which results in a stale service then. + +The fix is now, that in such a situation the agent is processing the old, +already cached, section and restarting the cache update immediately +(instead of the last run as it was before). diff --git a/ChangeLog b/ChangeLog index 219c4a7..cea99fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -313,6 +313,7 @@ * 3708 FIX: cisco_vpn_tunnel: fixed missing phase 2 data * 3556 FIX: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate * 3709 FIX: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces + * 3672 FIX: Agent sections cached by the agent could cause stale services... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 30afede..fa4e8db 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -145,8 +145,10 @@ function run_cached () { if [ ! -d $MK_VARDIR/cache ]; then mkdir -p $MK_VARDIR/cache ; fi CACHEFILE="$MK_VARDIR/cache/$NAME.cache" - # Check if the creation of the cache takes suspiciously long and return - # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE + # Check if the creation of the cache takes suspiciously long and kill the + # process if the age (access time) of $CACHEFILE.new is twice the MAXAGE. + # Output the evantually already cached section anyways and start the cache + # update again. if [ -e "$CACHEFILE.new" ] ; then local CF_ATIME=$(stat -c %X "$CACHEFILE.new") if [ $((NOW - CF_ATIME)) -ge $((MAXAGE * 2)) ] ; then @@ -154,7 +156,6 @@ function run_cached () { # it is still running. This avoids overlapping processes! fuser -k -9 "$CACHEFILE.new" >/dev/null 2>&1 rm -f "$CACHEFILE.new" - return fi fi

8 years, 3 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: f4a7642ae391f8724c3b9c4bf164f8f021a7d477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a7642ae391f8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 18 13:55:33 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/CustomVarsColumn.cc | 152 ++++++++++++++++++++++++------------ livestatus/src/CustomVarsColumn.h | 27 +++---- livestatus/src/CustomVarsFilter.cc | 19 ++--- livestatus/src/TableContacts.cc | 6 +- livestatus/src/TableHosts.cc | 6 +- livestatus/src/TableServices.cc | 6 +- 6 files changed, 128 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f4a7642ae3…

8 years, 3 months

3695 f5_bigip_cluster_v11: Now WATO configurable

by Konstantin Büttner

Module: check_mk Branch: master Commit: f7e6a623dd18fb358335e5c03a1be1c28fa1b66b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7e6a623dd18fb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 18 11:33:19 2016 +0200 3695 f5_bigip_cluster_v11: Now WATO configurable How the config sync status is to be interpreted is now configurable. Rediscovery required. --- .werks/3695 | 10 +++++ ChangeLog | 2 + checks/f5_bigip_cluster_v11 | 81 +++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 23 ++++++++++ 4 files changed, 85 insertions(+), 31 deletions(-) diff --git a/.werks/3695 b/.werks/3695 new file mode 100644 index 0000000..aa43590 --- /dev/null +++ b/.werks/3695 @@ -0,0 +1,10 @@ +Title: f5_bigip_cluster_v11: Now WATO configurable +Level: 1 +Component: checks +Compatible: incomp +Version: 1.4.0i1 +Date: 1468834348 +Class: feature + +How the config sync status is to be interpreted is now configurable. +Rediscovery required. diff --git a/ChangeLog b/ChangeLog index c35803a..219c4a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,8 @@ * 3706 hp_proliant_systeminfo, hp_proliant_mem, hp_proliant_da_phydrv: new inventory plugins * 3671 mssql_backup: Is now aware of backup types and outputs ages per backup type * 3558 check_mail: now able to process mail body with Content-Transfer-Encoding base64... + * 3695 f5_bigip_cluster_v11: Now WATO configurable... + NOTE: Please refer to the migration notes! * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/f5_bigip_cluster_v11 b/checks/f5_bigip_cluster_v11 index 3b16a23..a44679d 100644 --- a/checks/f5_bigip_cluster_v11 +++ b/checks/f5_bigip_cluster_v11 @@ -34,45 +34,64 @@ # F5 nodes need to be ntp synced otherwise status reports might be wrong. -f5_bigip_cluster_v11_states = { - '0': ( "Unknown", 3), - '1': ( "Syncing", 0), - '2': ( "Need Manual Sync", 1), - '3': ( "In Sync", 0), - '4': ( "Sync Failed", 2), - '5': ( "Sync Disconnected", 2), - '6': ( "Standalone", 2), - '7': ( "Awaiting Initial Sync", 1), - '8': ( "Incompatible Version", 2), - '9': ( "Partial Sync", 2), +factory_settings["f5_bigip_cluster_v11"] = { + '0': 3, + '1': 0, + '2': 1, + '3': 0, + '4': 2, + '5': 2, + '6': 2, + '7': 1, + '8': 2, + '9': 2, } def inventory_f5_bigip_cluster_v11(info): if len(info) == 1: - return [(None, None)] + return [(None, {})] -def check_f5_bigip_cluster_v11(_no_item, _no_params, info): - statusid, statustxt = info[0] - statename, state = f5_bigip_cluster_v11_states[statusid] - infotext = statename - if statename != statustxt: - infotext += ' - ' + statustxt - return state, infotext +def check_f5_bigip_cluster_v11(_no_item, params, info): + + status_names = { + '0': "Unknown", + '1': "Syncing", + '2': "Need Manual Sync", + '3': "In Sync", + '4': "Sync Failed", + '5': "Sync Disconnected", + '6': "Standalone", + '7': "Awaiting Initial Sync", + '8': "Incompatible Version", + '9': "Partial Sync", + } + + status_id, status_txt = info[0] + + status = params[status_id] + status_name = status_names[status_id] + + infotext = status_name + if status_name != status_txt: + infotext += ' - ' + status_txt + return status, infotext check_info["f5_bigip_cluster_v11"] = { - 'check_function': check_f5_bigip_cluster_v11, - 'inventory_function': inventory_f5_bigip_cluster_v11, - 'service_description': 'Config Sync Status', - 'snmp_info': ('.1.3.6.1.4.1.3375.2.1.14.1', [ - "1.0", # sysCmSyncStatusId - "2.0" # sysCmSyncStatusStatus - ]), - - 'snmp_scan_function': \ - lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ - and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower() \ - and int(oid(".1.3.6.1.4.1.3375.2.1.4.2.0").split('.')[0]) >= 11, + 'default_levels_variable' : 'f5_bigip_cluster_v11', + 'check_function' : check_f5_bigip_cluster_v11, + 'inventory_function' : inventory_f5_bigip_cluster_v11, + 'service_description' : 'Config Sync Status', + 'snmp_info' : ('.1.3.6.1.4.1.3375.2.1.14.1', [ + "1.0", # sysCmSyncStatusId + "2.0" # sysCmSyncStatusStatus + ]), + + 'snmp_scan_function' : \ + lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower() \ + and int(oid(".1.3.6.1.4.1.3375.2.1.4.2.0").split('.')[0]) >= 11, + 'group' : 'f5_bigip_cluster_v11', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d0d668a..5b848f2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -212,6 +212,29 @@ register_check_parameters( "first" ) +register_check_parameters( + subgroup_networking, + "f5_bigip_cluster_v11", + _(u"Configuration Sync Status for F5 BigIP devices"), + Dictionary( + title = _("Interpretation of Config Sync Status"), + elements = [ + ("0", MonitoringState(title = "Unknown", default_value = 3)), + ("1", MonitoringState(title = "Syncing", default_value = 0)), + ("2", MonitoringState(title = "Need Manual Sync", default_value = 1)), + ("3", MonitoringState(title = "In Sync", default_value = 0)), + ("4", MonitoringState(title = "Sync Failed", default_value = 2)), + ("5", MonitoringState(title = "Sync Disconnected", default_value = 2)), + ("6", MonitoringState(title = "Standalone", default_value = 2)), + ("7", MonitoringState(title = "Awaiting Initial Sync", default_value = 1)), + ("8", MonitoringState(title = "Incompatible Version", default_value = 2)), + ("9", MonitoringState(title = "Partial Sync", default_value = 2)), + ] + ), + None, + "dict" +) + #. # .--Inventory-----------------------------------------------------------. # | ___ _ |

8 years, 3 months

Revert "fixed obvious bug"

by Andreas Boesl

Module: check_mk Branch: master Commit: 8bacc913f023eb92ed8159a294d2c5063d4ccaff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bacc913f023eb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 18 11:27:08 2016 +0200 Revert "fixed obvious bug" This reverts commit f66e432d02bff2630e4eafcc231da0730bef2afa. --- doc/treasures/active_checks/check_mail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 99974b7..f4e96c1 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -312,7 +312,7 @@ def forward_to_ec(mails): payload = base64.b64decode(payload) log_line += '|' + payload[:body_limit] break - else: + else: payload = msg.get_payload() if encoding == "base64": payload = base64.b64decode(payload)

8 years, 3 months

fixed obvious bug

by Andreas Boesl

Module: check_mk Branch: master Commit: f66e432d02bff2630e4eafcc231da0730bef2afa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f66e432d02bff2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 18 11:26:39 2016 +0200 fixed obvious bug --- doc/treasures/active_checks/check_mail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index f4e96c1..99974b7 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -312,7 +312,7 @@ def forward_to_ec(mails): payload = base64.b64decode(payload) log_line += '|' + payload[:body_limit] break - else: + else: payload = msg.get_payload() if encoding == "base64": payload = base64.b64decode(payload)

8 years, 3 months

fixed obvious bug

by Andreas Boesl

Module: check_mk Branch: master Commit: d6317846e90f49ea5bc29c84dcc50cd13d106187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6317846e90f49… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 18 11:25:40 2016 +0200 fixed obvious bug --- doc/treasures/active_checks/check_mail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index d88ae28..f4e96c1 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -308,13 +308,13 @@ def forward_to_ec(mails): disposition = str(part.get('Content-Disposition')) if content_type == 'text/plain' and 'attachment' not in disposition: payload = part.get_payload() - if encoding == "base64" + if encoding == "base64": payload = base64.b64decode(payload) log_line += '|' + payload[:body_limit] break else: payload = msg.get_payload() - if encoding == "base64" + if encoding == "base64": payload = base64.b64decode(payload) log_line += '|' + payload[:body_limit]

8 years, 3 months

3558 check_mail: now able to process mail body with Content-Transfer-Encoding base64

by Andreas Boesl

Module: check_mk Branch: master Commit: f44b2f0925b735e5fbd4443a5c203cd1dadfc672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f44b2f0925b735… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 18 11:16:07 2016 +0200 3558 check_mail: now able to process mail body with Content-Transfer-Encoding base64 When forwarding mails to the event console the plugin now decodes any base64 content back to human readable lines. --- .werks/3558 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail | 15 ++++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/3558 b/.werks/3558 new file mode 100644 index 0000000..7eda279 --- /dev/null +++ b/.werks/3558 @@ -0,0 +1,10 @@ +Title: check_mail: now able to process mail body with Content-Transfer-Encoding base64 +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1468833224 +Class: feature + +When forwarding mails to the event console the plugin now +decodes any base64 content back to human readable lines. diff --git a/ChangeLog b/ChangeLog index 6b2d57b..c35803a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 3554 Inotify: Added configurable levels for movedto, movefrom and move self * 3706 hp_proliant_systeminfo, hp_proliant_mem, hp_proliant_da_phydrv: new inventory plugins * 3671 mssql_backup: Is now aware of backup types and outputs ages per backup type + * 3558 check_mail: now able to process mail body with Content-Transfer-Encoding base64... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index bdc2ba2..d88ae28 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -26,6 +26,7 @@ import sys, getopt, os, time, random, poplib, imaplib, email import traceback, socket, re +import base64 def parse_exception(e): e = str(e) @@ -296,7 +297,8 @@ def forward_to_ec(mails): cur_time = syslog_time() priority = 5 # OK for index, msg in mails.items(): - subject = msg.get('Subject', 'None') + subject = msg.get('Subject', 'None') + encoding = msg.get('Content-Transfer-Encoding', 'None') log_line = subject # Now add the body to the event if msg.is_multipart(): @@ -305,10 +307,17 @@ def forward_to_ec(mails): content_type = part.get_content_type() disposition = str(part.get('Content-Disposition')) if content_type == 'text/plain' and 'attachment' not in disposition: - log_line += '|' + part.get_payload()[:body_limit] + payload = part.get_payload() + if encoding == "base64" + payload = base64.b64decode(payload) + log_line += '|' + payload[:body_limit] break else: - log_line += '|' + msg.get_payload()[:body_limit] + payload = msg.get_payload() + if encoding == "base64" + payload = base64.b64decode(payload) + log_line += '|' + payload[:body_limit] + log_line = log_line.replace('\r\n', '\0') log_line = log_line.replace('\n', '\0')

8 years, 3 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 71913336b75923df5bad5f9864c6497f4aaee887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71913336b75923… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 18 10:48:27 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Makefile.am | 4 + livestatus/src/Query.cc | 18 +-- livestatus/src/Query.h | 3 +- livestatus/src/Renderer.cc | 313 ++++---------------------------------- livestatus/src/Renderer.h | 80 ++++++---- livestatus/src/RendererCSV.cc | 102 +++++++++++++ livestatus/src/RendererCSV.h | 79 ++++++++++ livestatus/src/RendererJSON.cc | 97 ++++++++++++ livestatus/src/RendererJSON.h | 67 ++++++++ livestatus/src/RendererPython.cc | 101 ++++++++++++ livestatus/src/RendererPython.h | 67 ++++++++ 11 files changed, 608 insertions(+), 323 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=71913336b7…

8 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016