Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: e4f41f27241ef075e11c436c0052685f147956f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4f41f27241ef0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 15:51:51 2016 +0100 Removed some unused imports/vars --- agents/plugins/mk_tinkerforge | 1 - doc/treasures/active_checks/check_mail_loop | 1 - 2 files changed, 2 deletions(-) diff --git a/agents/plugins/mk_tinkerforge b/agents/plugins/mk_tinkerforge index 65275d4..6caffc0 100755 --- a/agents/plugins/mk_tinkerforge +++ b/agents/plugins/mk_tinkerforge @@ -76,7 +76,6 @@ def install(): import urllib2 import shutil - from fnmatch import fnmatch from zipfile import ZipFile from cStringIO import StringIO url = "http://download.tinkerforge.com/bindings/python/tinkerforge_python_bindings…" diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index af40f17..5c6e682 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -324,7 +324,6 @@ def send_mail(): now = time.time() key = random.randint(1, 1000) - from email.mime.text import MIMEText as text mail = email.mime.text.MIMEText("") mail['From'] = mail_from mail['To'] = mail_from

7 years, 10 months

console output: Fixed writing warnings/errors to stderr

by Lars Michelsen

Module: check_mk Branch: master Commit: 90decf8ed48091fc964b95fe14f83849735c270f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90decf8ed48091… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 15:52:21 2016 +0100 console output: Fixed writing warnings/errors to stderr --- cmk_base/console.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/console.py b/cmk_base/console.py index 8ead6cd..a446502 100644 --- a/cmk_base/console.py +++ b/cmk_base/console.py @@ -46,8 +46,8 @@ def output(text, *args, **kwargs): stream = kwargs.get("stream", sys.stdout) try: - sys.stdout.write(text) - sys.stdout.flush() + stream.write(text) + stream.flush() except: # TODO: Way to generic! pass # avoid exception on broken pipe (e.g. due to | head)

7 years, 10 months

storcli_pdisks, storcli_vdrive: Use params instead of hardcoded state interpretation

by Konstantin Büttner

Module: check_mk Branch: master Commit: 95bcdfd7ee7870da04ee07f6d68a9a92dfe1f63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95bcdfd7ee7870… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 7 15:51:15 2016 +0100 storcli_pdisks, storcli_vdrive: Use params instead of hardcoded state interpretation --- checks/storcli_pdisks | 34 ++++++++++++++++++---------------- checks/storcli_vdrives | 39 +++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/checks/storcli_pdisks b/checks/storcli_pdisks index d89253f..cce58f6 100644 --- a/checks/storcli_pdisks +++ b/checks/storcli_pdisks @@ -24,6 +24,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +factory_settings["storcli_pdisks_default_levels"] = { + "Dedicated Hot Spare" : 0, + "Global Hot Spare" : 0, + "Unconfigured Good" : 0, + "Unconfigured Bad" : 1, + "Online" : 0, + "Offline" : 2, +} + def parse_storcli_pdisks(info): @@ -56,32 +65,25 @@ def parse_storcli_pdisks(info): def inventory_storcli_pdisks(parsed): for item in parsed: - yield (item, None) + yield (item, {}) -def check_storcli_pdisks(item, _no_params, parsed): +def check_storcli_pdisks(item, params, parsed): infotext = "Size: %f %s" % parsed[item]["size"] diskstate = parsed[item]["state"] - state_severities = { - "Dedicated Hot Spare" : 0, - "Global Hot Spare" : 0, - "Unconfigured Good" : 0, - "Unconfigured Bad" : 1, - "Online" : 0, - "Offline" : 2, - } - infotext += ", Disk State: %s" % diskstate - status = state_severities.get(diskstate, 3) + + status = params.get(diskstate, 3) return status, infotext check_info["storcli_pdisks"] = { - "parse_function" : parse_storcli_pdisks, - "inventory_function" : inventory_storcli_pdisks, - "check_function" : check_storcli_pdisks, - "service_description" : "RAID PDisk EID:Slot-Device %s" + "default_levels_variable" : "storcli_pdisks_default_levels", + "parse_function" : parse_storcli_pdisks, + "inventory_function" : inventory_storcli_pdisks, + "check_function" : check_storcli_pdisks, + "service_description" : "RAID PDisk EID:Slot-Device %s" } diff --git a/checks/storcli_vdrives b/checks/storcli_vdrives index f4c8094..223e9d8 100644 --- a/checks/storcli_vdrives +++ b/checks/storcli_vdrives @@ -24,10 +24,18 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +factory_settings["storcli_vdrives_default_levels"] = { + "Optimal" : 0, + "Partially Degraded" : 1, + "Degraded" : 2, + "Offline" : 1, + "Recovery" : 1, +} + def parse_storcli_vdrives(info): - raid_statedict = { + raid_statenames = { "Optl" : "Optimal", "Pdgd" : "Partially Degraded", "dgrd" : "Degraded", @@ -45,7 +53,7 @@ def parse_storcli_vdrives(info): item, raid_type, rawstate, access, consistent = line[:5] parsed[item] = { "raid_type" : raid_type, - "state" : raid_statedict.get(rawstate, rawstate), + "state" : raid_statenames.get(rawstate, rawstate), "access" : access, "consistent" : consistent, } @@ -57,10 +65,10 @@ def parse_storcli_vdrives(info): def inventory_storcli_vdrives(parsed): for item in parsed: - yield (item, None) + yield (item, {}) -def check_storcli_vdrives(item, _no_params, parsed): +def check_storcli_vdrives(item, params, parsed): yield 0, "Raid type is " + parsed[item]["raid_type"] yield 0, "Access: " + parsed[item]["access"] @@ -72,24 +80,15 @@ def check_storcli_vdrives(item, _no_params, parsed): device_state = parsed[item]["state"] infotext = "State is %s" % device_state - if device_state == "Optimal": - status = 0 - elif device_state == "Partially Degraded": - status = 1 - elif device_state == "Degraded": - status = 2 - elif device_state == "Offline": - status = 1 - elif device_state == "Recovery": - status = 1 - else: - status = 3 + + status = params.get(device_state, 3) yield status, infotext check_info["storcli_vdrives"] = { - "parse_function" : parse_storcli_vdrives, - "inventory_function" : inventory_storcli_vdrives, - "check_function" : check_storcli_vdrives, - "service_description" : "RAID Virtual Drive %s" + "default_levels_variable" : "storcli_vdrives_default_levels", + "parse_function" : parse_storcli_vdrives, + "inventory_function" : inventory_storcli_vdrives, + "check_function" : check_storcli_vdrives, + "service_description" : "RAID Virtual Drive %s" }

7 years, 10 months

3979 FIX vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e43ff99b18a69c18d7865f201ad77ad05ddd405 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e43ff99b18a69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 15:46:08 2016 +0100 3979 FIX vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded --- .werks/3979 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3979 b/.werks/3979 new file mode 100644 index 0000000..66eb8f4 --- /dev/null +++ b/.werks/3979 @@ -0,0 +1,10 @@ +Title: vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478529917 + + diff --git a/ChangeLog b/ChangeLog index 928b21d..0cf96ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... + * 3979 FIX: vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0e8fcbb..1caba17 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -518,7 +518,7 @@ fi # check would not be executed in case no guest additions are installed. # And that is something the check wants to detect echo '<<<vbox_guest>>>' -if type VBoxControl >/dev/null 2>&1 ; then +if type VBoxControl >/dev/null 2>&1 && lsmod | grep vboxguest >/dev/null 2>&1; then VBoxControl -nologo guestproperty enumerate | cut -d, -f1,2 [ ${PIPESTATUS[0]} = 0 ] || echo "ERROR" fi

7 years, 10 months

3939 FIX f5_bigip_conns: readded performance data and graphs

by Marcel Schulte

Module: check_mk Branch: master Commit: bbe7da9556157159dc3f8360d727fd025ce5e4ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbe7da95561571… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Nov 7 15:29:53 2016 +0100 3939 FIX f5_bigip_conns: readded performance data and graphs f5_bigip_conns check was missing perfdata and graphs since werk #3692. This has been fixed now. --- .werks/3939 | 11 +++++++++++ ChangeLog | 1 + checks/f5_bigip_conns | 14 ++++++++++---- web/plugins/metrics/check_mk.py | 11 +++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.werks/3939 b/.werks/3939 new file mode 100644 index 0000000..08aaa5a --- /dev/null +++ b/.werks/3939 @@ -0,0 +1,11 @@ +Title: f5_bigip_conns: readded performance data and graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478528863 + +f5_bigip_conns check was missing perfdata and graphs since werk #3692. This has been fixed now. + diff --git a/ChangeLog b/ChangeLog index 230e838..928b21d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 3986 FIX: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... + * 3939 FIX: f5_bigip_conns: readded performance data and graphs... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index bec1da4..9dfb8e7 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -41,9 +41,9 @@ def inventory_f5_bigip_conns(info): def check_f5_bigip_conns(item, params, info): - for val, what, title in [ - (info[0][0], "conns", "Connections"), - (info[0][1], "ssl_conns", "SSL connections")]: + for val, what, perfkey, title in [ + (info[0][0], "conns", "connections", "Connections"), + (info[0][1], "ssl_conns", "connections_ssl", "SSL connections")]: state = 0 infotext = "%s:" % title @@ -54,9 +54,15 @@ def check_f5_bigip_conns(item, params, info): infotext += " not configured" else: - state, extrainfo, perfdata = check_levels(int(val), what, params.get(what)) + warn, crit = params.get(what) + perfdata.append((perfkey, val, warn, crit)) + + state, extrainfo, extraperf = check_levels(int(val), what, params.get(what)) infotext += " %s%s" % (val, extrainfo) + if len(extraperf) > 0: + perfdata.append(extraperf[0]) + yield state, infotext, perfdata diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b2623ae..05545bf 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1295,6 +1295,12 @@ metric_info["connections"] = { "color" : "#a080b0", } +metric_info["connections_ssl"] = { + "title" : _("SSL connections"), + "unit" : "count", + "color" : "13/a", +} + metric_info["connections_async_writing"] = { "title" : _("Asynchronous writing connections"), "unit" : "count", @@ -4365,6 +4371,11 @@ check_metrics["check_mk-f5_bigip_interfaces"] = { "bytes_out": { "name" : "if_out_octets" } } +check_metrics["check_mk-f5_bigip_conns"] = { + "conns" : { "name" : "connections" }, + "ssl_conns" : { "name" : "connections_ssl" }, +} + check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 } } # convert us -> sec

7 years, 10 months

added disabled_sections example in check_mk.example.ini

by Andreas Boesl

Module: check_mk Branch: master Commit: 78488c5d7de2c1366a15d48014814a8264436c61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78488c5d7de2c1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 7 14:36:00 2016 +0100 added disabled_sections example in check_mk.example.ini --- agents/windows/check_mk.example.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 6b42005..8d6709c 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -34,6 +34,9 @@ # Just output certain sections (e.g. for upper hosts) # sections = check_mk winperf + # Disable specific sections (overrules sections parameter) + # disabled_sections = logfiles + # output sections in realtime updates. Please note that not all # sections can be used in realtime updates, the following is the # complete list

7 years, 10 months

3989 Logwatch patterns: now able to change state of context lines

by Andreas Boesl

Module: check_mk Branch: master Commit: 1cac61380a0fee895fc456b77dd9f2cf06109490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cac61380a0fee… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 7 14:28:50 2016 +0100 3989 Logwatch patterns: now able to change state of context lines You can now reclassify the state of context lines to a different state. For example to IGNORE, which prevents that the line is forwarded to the event console. --- .werks/3989 | 10 ++++++++++ ChangeLog | 3 ++- web/plugins/wato/check_parameters.py | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/3989 b/.werks/3989 new file mode 100644 index 0000000..3e0ab78 --- /dev/null +++ b/.werks/3989 @@ -0,0 +1,10 @@ +Title: Logwatch patterns: now able to change state of context lines +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1478525175 +Class: feature + +You can now reclassify the state of context lines to a different state. +For example to IGNORE, which prevents that the line is forwarded to the event console. diff --git a/ChangeLog b/ChangeLog index c6d8f9c..230e838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,8 @@ * 3949 ucd_cpu_load: Genugate devices are now displaying CPU load... * 3950 openbsd_sensors: Genugate devices are now handling hardware sensors... * 3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility - * 3988 Windows agent: no global option disabled_sections... + * 3988 Windows agent: new global option disabled_sections... + * 3989 Logwatch patterns: now able to change state of context lines... * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 268e445..19dcd2f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1367,6 +1367,7 @@ register_rule(group + '/' + subgroup_applications, ('W', _('WARNING')), ('O', _('OK')), ('I', _('IGNORE')), + ('.', _('Context Info')), ], default_value = "C", )), @@ -1377,6 +1378,7 @@ register_rule(group + '/' + subgroup_applications, ('W', _('WARNING')), ('O', _('OK')), ('I', _('IGNORE')), + ('.', _('Context Info')), ], default_value = "W", )), @@ -1387,9 +1389,21 @@ register_rule(group + '/' + subgroup_applications, ('W', _('WARNING')), ('O', _('OK')), ('I', _('IGNORE')), + ('.', _('Context Info')), ], default_value = "O", )), + ("._to", DropdownChoice( + title = _("Change Context Info to"), + choices = [ + ('C', _('CRITICAL')), + ('W', _('WARNING')), + ('O', _('OK')), + ('I', _('IGNORE')), + ('.', _('Context Info')), + ], + default_value = ".", + )), ], optional_keys = False ),

7 years, 10 months

Make trash icon on failed notifications a bit larger

by Mathias Kettner

Module: check_mk Branch: master Commit: dd2f130442817fde2edf54ca5e37938a6affeea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd2f130442817f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:52:21 2016 +0100 Make trash icon on failed notifications a bit larger --- web/plugins/sidebar/shipped.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e93c2fa..ba206a3 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -804,6 +804,13 @@ div.tacticalalert { div.spacertop { padding-top: 5px; } +#snapin_tactical_overview img { + width: 15px; + height: auto; + position: relative; + top: -1px; +} + """ % snapin_width

7 years, 10 months

4042 FIX Fix missing From address in synchronous SMTP notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: b25ee5bf37d1fc27acc21f4dd0919ebc11e782e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b25ee5bf37d1fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:53:28 2016 +0100 4042 FIX Fix missing From address in synchronous SMTP notifications If you use the new synchronous STMP devlivery for emails and do not specify an explicity From address, then the From address would be empty. This has been fixed. --- .werks/4042 | 11 +++++++++++ ChangeLog | 1 + notifications/mail | 32 ++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.werks/4042 b/.werks/4042 new file mode 100644 index 0000000..da74fc5 --- /dev/null +++ b/.werks/4042 @@ -0,0 +1,11 @@ +Title: Fix missing From address in synchronous SMTP notifications +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i2 +Date: 1478523159 +Class: fix + +If you use the new synchronous STMP devlivery for emails and do +not specify an explicity From address, then the From address +would be empty. This has been fixed. diff --git a/ChangeLog b/ChangeLog index c718034..c6d8f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 3972 It's now possible to bulk notifications based on Event console contacts * 3900 FIX: Notification analysis: Fixed wrong color for host notification states * 3968 FIX: Notifications / Alert handling: Fixed configuring nth notifications without state changes... + * 4042 FIX: Fix missing From address in synchronous SMTP notifications... BI: * 3955 BI rule ID can now be renamed diff --git a/notifications/mail b/notifications/mail index 6cf7187..64961ca 100755 --- a/notifications/mail +++ b/notifications/mail @@ -35,7 +35,7 @@ # attached graphs and such neat stuff. Sweet! -import os, re, sys, subprocess +import os, re, sys, subprocess, socket import urllib import urllib2 import base64 @@ -443,7 +443,6 @@ def send_mail_sendmail(m, target, from_address): def send_mail_smtp(message, target, from_address, context): import smtplib # for the error messages - import socket host_index = 1 retry_possible = False @@ -456,14 +455,14 @@ def send_mail_smtp(message, target, from_address, context): else: host_index += 1 - host = context[host_var] + smarthost = context[host_var] try: - send_mail_smtp_impl(message, target, host, from_address, context) + send_mail_smtp_impl(message, target, smarthost, from_address, context) success = True except socket.timeout, e: - sys.stderr.write("timeout connecting to \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("timeout connecting to \"%s\": %s\n" % (smarthost, str(e))) except socket.gaierror, e: - sys.stderr.write("socket error connecting to \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("socket error connecting to \"%s\": %s\n" % (smarthost, str(e))) except smtplib.SMTPRecipientsRefused, e: # the exception contains a dict of failed recipients to the respective error. since we # only have one recipient there has to be exactly one element @@ -479,18 +478,18 @@ def send_mail_smtp(message, target, from_address, context): sys.stderr.write("mail to \"%s\" refused: %d, %s\n" % (target, errorcode, message)) except smtplib.SMTPHeloError, e: retry_possible = True # server is acting up, this may be fixed quickly - sys.stderr.write("protocol error from \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("protocol error from \"%s\": %s\n" % (smarthost, str(e))) except smtplib.SMTPSenderRefused, e: sys.stderr.write("server didn't accept from-address \"%s\" refused: %s\n" %\ (from_address, str(e))) except smtplib.SMTPAuthenticationError, e: - sys.stderr.write("authentication failed on \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("authentication failed on \"%s\": %s\n" % (smarthost, str(e))) except smtplib.SMTPDataError, e: retry_possible = True # unexpected error - give retry a chance - sys.stderr.write("unexpected error code from \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("unexpected error code from \"%s\": %s\n" % (smarthost, str(e))) except smtplib.SMTPException, e: retry_possible = True # who knows what went wrong, a retry might just work - sys.stderr.write("undocumented error code from \"%s\": %s\n" % (host, str(e))) + sys.stderr.write("undocumented error code from \"%s\": %s\n" % (smarthost, str(e))) if success: return 0 @@ -499,7 +498,12 @@ def send_mail_smtp(message, target, from_address, context): else: return 2 -def send_mail_smtp_impl(message, target, host, from_address, context): + +def default_from_address(): + return os.environ.get("OMD_SITE", "checkmk") + "@" + socket.getfqdn() + + +def send_mail_smtp_impl(message, target, smarthost, from_address, context): import smtplib import types def getreply_wrapper(self): @@ -511,9 +515,9 @@ def send_mail_smtp_impl(message, target, host, from_address, context): encryption = context.get('PARAMETER_SMTP_ENCRYPTION', "NONE") if encryption == "SSL_TLS": - conn = smtplib.SMTP_SSL(host, port, from_address) + conn = smtplib.SMTP_SSL(smarthost, port) # , from_address) else: - conn = smtplib.SMTP(host, port, from_address) + conn = smtplib.SMTP(smarthost, port) # , from_address) # evil hack: the smtplib doesn't allow access to the reply code/message # in case of success. But we want it! @@ -913,7 +917,7 @@ def main(): sys.exit(2) # Create the mail and send it - from_address = context.get("PARAMETER_FROM") + from_address = context.get("PARAMETER_FROM") or default_from_address() reply_to = context.get("PARAMETER_REPLY_TO") m = multipart_mail(mailto, subject, from_address, reply_to, content_txt, content_html, attachments) try:

7 years, 10 months

3978 FIX mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')

by Lars Michelsen

Module: check_mk Branch: master Commit: d93687a00f0cfc643875e38b4f666f7ed7d5a63d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d93687a00f0cfc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 13:35:31 2016 +0100 3978 FIX mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...') On some CIFS shares the backup was not possible because chown / chmod operation failed with a permission denied error during backup. --- .werks/3978 | 10 ++++++++++ ChangeLog | 1 + bin/mkbackup | 29 +++++++++++++++++++++++------ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.werks/3978 b/.werks/3978 new file mode 100644 index 0000000..fa7ee7b --- /dev/null +++ b/.werks/3978 @@ -0,0 +1,10 @@ +Title: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...') +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i2 +Date: 1478522063 +Class: fix + +On some CIFS shares the backup was not possible because chown / chmod operation failed +with a permission denied error during backup. diff --git a/ChangeLog b/ChangeLog index 4ee89ee..c718034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 4036 Measurement of time used by Check_MK now includes time waited for agent... * 3648 FIX: Fixed log file parsing of host states... * 3965 FIX: Nagios: Improved handling of broken core config... + * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... Checks & Agents: * 3841 cups_queues: thresholds are now configurable in WATO... diff --git a/bin/mkbackup b/bin/mkbackup index f5c1265..5b5a7f2 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -170,8 +170,7 @@ def acquire_backup_lock(): if not os.path.exists(lock_file_path): try: g_backup_lock_f = tempfile.NamedTemporaryFile(mode="a+", dir="/tmp", delete=False) - os.chown(g_backup_lock_f.name, -1, grp.getgrnam("omd").gr_gid) - os.chmod(g_backup_lock_f.name, 0660) + set_permissions(g_backup_lock_f.name, -1, grp.getgrnam("omd").gr_gid, 0660) os.rename(g_backup_lock_f.name, lock_file_path) except (IOError, OSError), e: raise MKGeneralException("Failed to open lock file \"%s\": %s" % @@ -194,6 +193,26 @@ def acquire_backup_lock(): fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.fcntl(fd, fcntl.F_GETFD) | cloexec_flag) +def set_permissions(path, uid, gid, mode): + try: + os.chown(path, uid, gid) + except OSError, e: + if e.errno == 13: + pass # On CIFS mounts where "uid=0,forceuid,gid=1000,forcegid" mount options + # are set, this is not possible. So skip over. + else: + raise + + try: + os.chmod(path, mode) + except OSError, e: + if e.errno == 13: + pass # On CIFS mounts where "uid=0,forceuid,gid=1000,forcegid" mount options + # are set, this is not possible. So skip over. + else: + raise + + # TODO: Move to cmklib? def makedirs(path, user=None, group=None, mode=None): head, tail = os.path.split(path) @@ -229,8 +248,7 @@ def makedir(path, user=None, group=None, mode=None): else: gid = -1 - os.chown(path, uid, gid) - os.chmod(path, mode) + set_permissions(path, uid, gid, mode) # Wenn als root ausgeführt: @@ -1487,8 +1505,7 @@ def do_site_restore(opts, info, site=None): omd_root = "/omd/sites/%s" % site if not os.path.exists(omd_root): os.mkdir(omd_root) - os.chown(omd_root, pwd.getpwnam(site).pw_uid, grp.getgrnam(site).gr_gid) - os.chmod(omd_root, 0755) + set_permissions(omd_root, pwd.getpwnam(site).pw_uid, grp.getgrnam(site).gr_gid, 0775) cmd.append("-")

7 years, 10 months

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016