Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64690 discussions

Check_MK Git: check_mk: #1566 FIX 3ware_disks: consider VERIFYING state as OK now

by Mathias Kettner

Module: check_mk Branch: master Commit: 97609a6bc00dd1f1feecc021889441e5c91c7d1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97609a6bc00dd1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 15:40:36 2014 +0100 #1566 FIX 3ware_disks: consider VERIFYING state as OK now Thas has been done upon a feedback from Jim Welch. Thanks. --- .werks/1566 | 9 +++++++++ ChangeLog | 1 + checks/3ware_disks | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1566 b/.werks/1566 new file mode 100644 index 0000000..f0f8280 --- /dev/null +++ b/.werks/1566 @@ -0,0 +1,9 @@ +Title: 3ware_disks: consider VERIFYING state as OK now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417617573 +Class: fix + +Thas has been done upon a feedback from Jim Welch. Thanks. diff --git a/ChangeLog b/ChangeLog index 635f02a..916c011 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... + * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/3ware_disks b/checks/3ware_disks index 16784d3..6d4a08c 100644 --- a/checks/3ware_disks +++ b/checks/3ware_disks @@ -72,7 +72,7 @@ def check_3ware_disks(item, _no_params, info): model = line[-1] infotext = "%s (unit: %s, size: %s,%s, type: %s, model: %s)" % \ (status, unit_type, size, size_type, disk_type, model) - if status == "OK": + if status in [ "OK", "VERIFYING" ]: return (0, "disk status is " + infotext) else: return (2, "disk status is " + infotext)

9 years, 10 months

Check_MK Git: check_mk: #1565 mem.win: set default levels for page file to 80%/90%

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a362103b1292bda5badca6e2b2e96080bf465f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a362103b1292b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 15:32:33 2014 +0100 #1565 mem.win: set default levels for page file to 80%/90% --- .werks/1565 | 9 +++++++++ ChangeLog | 1 + checks/mem | 2 +- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1565 b/.werks/1565 new file mode 100644 index 0000000..6738b58 --- /dev/null +++ b/.werks/1565 @@ -0,0 +1,9 @@ +Title: mem.win: set default levels for page file to 80%/90% +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417617134 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index dfe8d90..6be1ef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels.... NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... + * 1565 mem.win: set default levels for page file to 80%/90% * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/mem b/checks/mem index ef6bbc7..326ef17 100644 --- a/checks/mem +++ b/checks/mem @@ -80,7 +80,7 @@ check_info['mem.used'] = { # Special memory and page file check for Windows factory_settings["memory_win_default_levels"] = { "memory" : ( 80.0, 90.0 ), - "pagefile" : ( 50.0, 70.0 ), + "pagefile" : ( 80.0, 90.0 ), } def inventory_mem_win(info): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e845338..50c4957 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1412,7 +1412,7 @@ register_check_parameters( default_difference = (0.5, 1.0) ) ], - default_value = (50.0, 70.0)) + default_value = (80.0, 90.0)) ), ("average", Integer (

9 years, 10 months

Check_MK Git: check_mk: #1607 FIX check_http: Fixed broken links in escaped plugin output

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a642346ce31bbde44ea7a57343b1b3b5faea81e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a642346ce31bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:31:58 2014 +0100 #1607 FIX check_http: Fixed broken links in escaped plugin output --- .werks/1607 | 9 +++++++++ ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1607 b/.werks/1607 new file mode 100644 index 0000000..88c35af --- /dev/null +++ b/.werks/1607 @@ -0,0 +1,9 @@ +Title: check_http: Fixed broken links in escaped plugin output +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417617101 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index dfe8d90..f35b1ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1585 FIX: Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small... * 1586 FIX: Dashboard: Toggling edit/non-edit is now reflected when reloading the page * 1605 FIX: Fixed perfometer of check check_mk-printer_supply_ricoh + * 1607 FIX: check_http: Fixed broken links in escaped plugin output WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index cf06dd6..b372d7f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -315,7 +315,7 @@ def format_plugin_output(output, row = None): if config.escape_plugin_output: output = re.sub("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*,]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % - (p.group(0), p.group(0)), output) + (p.group(0).replace('"', ''), p.group(0).replace('"', '')), output) return output

9 years, 10 months

Check_MK Git: check_mk: local check to monitor zombie processes

by Goetz Golla

Module: check_mk Branch: master Commit: 894e46d67ef434ecbf2ff0cafe2cee447ab4e8ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894e46d67ef434… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Dec 3 15:24:34 2014 +0100 local check to monitor zombie processes --- doc/treasures/localchecks/zombies | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/treasures/localchecks/zombies b/doc/treasures/localchecks/zombies new file mode 100755 index 0000000..2b1fb98 --- /dev/null +++ b/doc/treasures/localchecks/zombies @@ -0,0 +1,5 @@ +#!/bin/bash + +zombies=$( ps aux | awk '{ print $8 " " $2 }' | grep -w Z | wc -l ) + +echo "P Zombies zombies=$zombies;1;3"

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2129

by Mathias Kettner

Module: check_mk Branch: master Commit: b3a87d7b47f43acba32f9a718ff418ec2428adaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3a87d7b47f43a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 15:15:28 2014 +0100 Updated bug entries #2129 --- .bugs/2129 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bugs/2129 b/.bugs/2129 index b0f0873..0e19f55 100644 --- a/.bugs/2129 +++ b/.bugs/2129 @@ -1,9 +1,9 @@ -Title: check_dns: Multiple expected IP addresses can be set in two ways +Title: check_dns: Make use of the fact that multiple expected IP addresses can be set Component: wato State: open Date: 2014-06-16 15:36:50 Targetversion: 1.2.5i1 -Class: bug +Class: feature The check accept either multiple "-a <host>" or "-a <host1>,<host2>. This depends on the way you want the check to work. Either expect all of the addresses to be part of the

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2139

by Mathias Kettner

Module: check_mk Branch: master Commit: a7f69afa433dc06f1aebb1c55a405a6e5e18145a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f69afa433dc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 15:18:54 2014 +0100 Updated bug entries #2139 --- .bugs/2139 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bugs/2139 b/.bugs/2139 index 045cac3..2baff54 100644 --- a/.bugs/2139 +++ b/.bugs/2139 @@ -9,3 +9,5 @@ When there are pending mails for the user which sqlplus.sh does perform a su - to, the user gets a message "[YOU HAVE NEW MAIL]". This has been seen on an AIX host. This should be filtered somewhere. + +3.12.2014: forwarded that to Thorsten Bruhns

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1005

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f39b2ef25904554ddfbac16158856733af35923 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f39b2ef259045… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 15:12:55 2014 +0100 Updated bug entries #1005 --- .bugs/1005 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/1005 b/.bugs/1005 index fbf464f..b32ece5 100644 --- a/.bugs/1005 +++ b/.bugs/1005 @@ -1,9 +1,11 @@ Title: problems with run_cached when agent is not running for a while and $CACHEFILE.new is left over Component: core -State: open +Class: bug +State: done Date: 2014-08-18 11:56:44 Targetversion: future -Class: bug If it happens for some reason, that a $CACHEFILE.new is left over and the agent does not run for a while, the leftover $CACHEFILE.new blocks the execution of the agent section + +2014-12-03 15:12:53: changed state open -> done

9 years, 10 months

Check_MK Git: check_mk: #1604 FIX mysql_slave: Dealing with situation where connection with master is lost

by Lars Michelsen

Module: check_mk Branch: master Commit: 38a13253fd1681272dd77d08a249a4d946e64677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38a13253fd1681… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 12:36:46 2014 +0100 #1604 FIX mysql_slave: Dealing with situation where connection with master is lost --- .werks/1604 | 9 +++++++++ ChangeLog | 1 + checks/mysql_slave | 22 +++++++++++++--------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.werks/1604 b/.werks/1604 new file mode 100644 index 0000000..f62db71 --- /dev/null +++ b/.werks/1604 @@ -0,0 +1,9 @@ +Title: mysql_slave: Dealing with situation where connection with master is lost +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417606584 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 78d6d59..45a6025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output * 1603 FIX: ad_replication: fixed typo in plugin output + * 1604 FIX: mysql_slave: Dealing with situation where connection with master is lost Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/mysql_slave b/checks/mysql_slave index 33cc4d4..7631081 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -65,16 +65,20 @@ def check_mysql_slave(_unused, params, info): output.append('Slave-SQL: running') # Makes only sense to monitor the age when the SQL slave is running - out = 'Time behind Master: %s' % get_age_human_readable(data['Seconds_Behind_Master']) - warn, crit = params.get('seconds_behind_master', (None, None)) - if crit != None and data['Seconds_Behind_Master'] > crit: + if data['Seconds_Behind_Master'] == 'NULL': + output.append('Time behind master: NULL (Lost connection?)(!!)') state = 2 - out += '(!!)' - elif warn != None and data['Seconds_Behind_Master'] > warn: - state = max(state, 1) - out += '(!)' - output.append(out) - perfdata.append(('seconds_behind_master', data['Seconds_Behind_Master'], warn, crit)) + else: + out = 'Time behind Master: %s' % get_age_human_readable(data['Seconds_Behind_Master']) + warn, crit = params.get('seconds_behind_master', (None, None)) + if crit != None and data['Seconds_Behind_Master'] > crit: + state = 2 + out += '(!!)' + elif warn != None and data['Seconds_Behind_Master'] > warn: + state = max(state, 1) + out += '(!)' + output.append(out) + perfdata.append(('seconds_behind_master', data['Seconds_Behind_Master'], warn, crit)) else: output.append('Slave-SQL: not running(!!)') state = 2

9 years, 10 months

Check_MK Git: check_mk: #1603 FIX ad_replication: fixed typo in plugin output

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bdc861db7b4ab849d7e47aeddee3a9ce2dbb2dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bdc861db7b4ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 12:27:46 2014 +0100 #1603 FIX ad_replication: fixed typo in plugin output --- .werks/1603 | 9 +++++++++ ChangeLog | 1 + checks/ad_replication | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1603 b/.werks/1603 new file mode 100644 index 0000000..27a367f --- /dev/null +++ b/.werks/1603 @@ -0,0 +1,9 @@ +Title: ad_replication: fixed typo in plugin output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417606053 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2eaf4a8..78d6d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1590 FIX: printer_supply_ricoh: Fixed broken check * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output + * 1603 FIX: ad_replication: fixed typo in plugin output Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/ad_replication b/checks/ad_replication index 336580e..bc98b0c 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -82,7 +82,7 @@ def check_ad_replication(item, params, info): if int(numFailures) > maxFailuresWarn: status = 1 output += '(!) %s/%s replication of context %s reached ' \ - ' the threshold of maxmimum failures (%s) (Last Success: %s, ' \ + ' the threshold of maximum failures (%s) (Last Success: %s, ' \ 'LastFailure: %s NumFailures: %s Status: %s), ' % \ (sourceSite, sourceDC, namingContext, maxFailuresWarn, timeLastFailure, timeLastSuccess, numFailures, statusLastFailure) @@ -90,7 +90,7 @@ def check_ad_replication(item, params, info): if int(numFailures) > maxFailuresCrit: status = 2 output += '(!!) %s/%s replication of context %s reached ' \ - ' the threshold of maxmimum failures (%s) (Last Success: %s, ' \ + ' the threshold of maximum failures (%s) (Last Success: %s, ' \ 'LastFailure: %s NumFailures: %s Status: %s), ' % \ (sourceSite, sourceDC, namingContext, maxFailuresCrit, timeLastFailure, timeLastSuccess, numFailures, statusLastFailure)

9 years, 10 months

Check_MK Git: check_mk: #1606 FIX Moved notify.log to var/log/

by Lars Michelsen

notify.log in OMD environments Message-ID: <547f18f2./ao9zGjEm8H06Tu7%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5e6780a84e0d0b0a1dc6d5c07974877c5e17a01a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e6780a84e0d0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:06:26 2014 +0100 #1606 FIX Moved notify.log to var/log/notify.log in OMD environments The log was located in var/check_mk/notify.log but had no log rotation. We moved it to var/log/notify.log now and added a log rotation. The related configuration options have been changed to be enabled by default. We also removed the option to totally disable this logfile because we'd rather have some log information about eventual missing notifications than no information at all. --- .werks/1606 | 14 ++++++++++++++ ChangeLog | 1 + modules/notify.py | 11 +++++------ notifications/debug | 2 +- web/htdocs/wato.py | 8 ++++++++ web/plugins/wato/backup_domains.py | 1 - web/plugins/wato/check_mk_configuration.py | 13 ++----------- web/plugins/wato/globals_notification.py | 22 +++++++++++++--------- 8 files changed, 44 insertions(+), 28 deletions(-) diff --git a/.werks/1606 b/.werks/1606 new file mode 100644 index 0000000..3270af0 --- /dev/null +++ b/.werks/1606 @@ -0,0 +1,14 @@ +Title: Moved notify.log to var/log/notify.log in OMD environments +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417615456 +Class: fix + +The log was located in var/check_mk/notify.log but had no log rotation. +We moved it to var/log/notify.log now and added a log rotation. The +related configuration options have been changed to be enabled by default. +We also removed the option to totally disable this logfile because we'd +rather have some log information about eventual missing notifications +than no information at all. diff --git a/ChangeLog b/ChangeLog index 8c4dc1e..dbc87cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core... * 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts... * 1583 FIX: Can use contact groups without hosts/services assigned in RBN rules now... + * 1606 FIX: Moved notify.log to var/log/notify.log in OMD environments... BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/modules/notify.py b/modules/notify.py index 87e94c9..871fb30 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -54,8 +54,8 @@ notification_logdir = var_dir + "/notify" notification_spooldir = var_dir + "/notify/spool" notification_bulkdir = var_dir + "/notify/bulk" notification_core_log = var_dir + "/notify/nagios.log" # Fallback for history if no CMC running -notification_log = notification_logdir + "/notify.log" -notification_logging = 0 +notification_log = log_dir + "/notify.log" +notification_logging = 1 notification_backlog = 10 # keep the last 10 notification contexts for reference # Settings for new rule based notifications @@ -133,7 +133,9 @@ Available commands: # keepalive mode (used by CMC), sends out one notifications from # several possible sources or sends out all ripe bulk notifications. def do_notify(args): - global notify_mode + global notify_mode, notification_logging + if notification_logging == 0: + notification_logging = 1 # transform deprecated value 0 to 1 try: if not os.path.exists(notification_logdir): os.makedirs(notification_logdir) @@ -1230,9 +1232,6 @@ def notify_via_email(plugin_context): else: notify_log("No UTF-8 encoding found in your locale -a! Please provide C.UTF-8 encoding.") - if notification_logging >= 2: - file(var_dir + "/notify/body.log", "w").write(body.encode("utf-8")) - # Important: we must not output anything on stdout or stderr. Data of stdout # goes back into the socket to the CMC in keepalive mode and garbles the # handshake signal. diff --git a/notifications/debug b/notifications/debug index 8cf29ee..d68a3bb 100644 --- a/notifications/debug +++ b/notifications/debug @@ -14,7 +14,7 @@ # or notification_logging=2 in main.mk (or via WATO in the # global settings: Notification -> Debug notifications, then # you will see this output in the notitifcation log file. -# Under OMD this file is in ~/var/check_mk/notify/notify.log. +# Under OMD this file is in ~/var/log/notify.log. # Please refer to the official documentation for more details. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a626574..d941df6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -18179,6 +18179,14 @@ def is_a_checkbox(vs): else: return False +def site_neutral_path(path): + if path.startswith('/omd'): + parts = path.split('/') + parts[3] = '<siteid>' + return '/'.join(parts) + else: + return path + #. # .--Plugins-------------------------------------------------------------. # | ____ _ _ | diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 35bb452..02da707 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -182,7 +182,6 @@ else: "prefix" : defaults.omd_root, "paths" : [ ("dir", "var/log"), - ("file", "var/check_mk/notify/notify.log"), ("file", "var/nagios/livestatus.log"), ("dir", "var/pnp4nagios/log"), ], diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 29936a1..070f672 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1138,27 +1138,18 @@ register_configvar(group, "for the operation, but on the other hand will lead to a slightly higher load " "of Nagios for the first couple of minutes after the restart. "))) -def log_dir_path(): - path = defaults.log_dir - if path.startswith('/omd'): - parts = path.split('/') - parts[2] = '<siteid>' - return '/'.join(parts) - else: - return path - register_configvar(group, "debug_log", Transform( Checkbox( - label = _("Write exceptions to <tt>%s/crashed-checks.log</tt>" % log_dir_path()), + label = _("Write exceptions to <tt>%s/crashed-checks.log</tt>" % site_neutral_path(defaults.log_dir)), ), title = _("Log exceptions in check plugins"), help = _("If this option is enabled Check_MK will create a debug logfile at " "<tt>%s/crashed-checks.log</tt> " "containing details about failed checks (those which have the state <i>UNKNOWN " "and the output UNKNOWN - invalid output from plugin</i>...) Per default no " - "logfile is written.") % log_dir_path(), + "logfile is written.") % site_neutral_path(defaults.log_dir), forth = lambda x: not not x, ), need_restart = True) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 9d4927e..9b43932 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -84,16 +84,20 @@ register_configvar(group, register_configvar(group, "notification_logging", - DropdownChoice( - title = _("Notification logfile"), - help = _("When notification debugging is on, additional information will be " - "logged in the notification logfile <tt>%s</tt>." % - (defaults.var_dir + "/notify/notify.log")), - choices = [ - ( 0, _("No logging")), - ( 1, _("One line per notification")), - ( 2, _("Full dump of all variables and command"))] + Transform( + DropdownChoice( + choices = [ + ( 1, _("Normal logging")), + ( 2, _("Full dump of all variables and command")) + ], + default_value = 1, ), + forth = lambda x: x == 0 and 1 or x, # transform deprecated value 0 (no logging) to 1 + title = _("Notification log level"), + help = _("You can configure the notification mechanism to log more details about " + "the notifications into the notification log. These information are logged " + "into the file <tt>%s</tt>") % site_neutral_path(defaults.log_dir + "/notify.log"), + ), domain = "check_mk") register_configvar(group,

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