Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4325 FIX check_cpu_peaks: Make the check working with current Check_MK APi

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fcee8524caab7a46d2fb4fd4926de7152feee02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fcee8524caab7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 08:49:14 2017 +0100 4325 FIX check_cpu_peaks: Make the check working with current Check_MK APi Change-Id: I01114608b250c7792b68a48a8deb00780c2f1476 --- .werks/4325 | 9 +++++++++ ChangeLog | 1 + active_checks/.f12 | 4 ++-- active_checks/check_cpu_peaks | 27 ++++----------------------- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.werks/4325 b/.werks/4325 new file mode 100644 index 0000000..cc338a2 --- /dev/null +++ b/.werks/4325 @@ -0,0 +1,9 @@ +Title: check_cpu_peaks: Make the check working with current Check_MK APi +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486453730 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1e43620..a22e79a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ NOTE: Please refer to the migration notes! * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... * 4338 FIX: aix_hacmp_resources: fixed state handling + * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/active_checks/.f12 b/active_checks/.f12 index d2d5c70..6ed9828 100755 --- a/active_checks/.f12 +++ b/active_checks/.f12 @@ -1,10 +1,10 @@ #!/bin/bash -SITE=${SITE:-$(cat ../../../.site 2>/dev/null)} +SITE=${SITE:-$(cat ../.site 2>/dev/null)} SITE=${SITE:-$(omd sites --bare | head -n 1)} echo "Installing to /omd/sites/$SITE/lib/nagios/plugins" make -RSYNC_OPTS="-av +RSYNC_OPTS="-a --chown=root:root --exclude=.*.swp --exclude=Makefile diff --git a/active_checks/check_cpu_peaks b/active_checks/check_cpu_peaks index 30d90ab..2baf6af 100755 --- a/active_checks/check_cpu_peaks +++ b/active_checks/check_cpu_peaks @@ -26,23 +26,8 @@ import sys, os, time, getopt -class MKGeneralException(Exception): - def __init__(self, reason): - super(MKGeneralException, self).__init__() - self.reason = reason - - - def __str__(self): - return self.reason - - -# Note: This check only works in an OMD environment! -# TODO: Clean this mess up! Define and use an official API to predictive monitoring. -sys.path.append(os.path.expanduser("~/share/check_mk/modules")) -execfile(os.path.expanduser("~/etc/check_mk/defaults")) -execfile(os.path.expanduser("~/share/check_mk/modules/prediction.py")) -execfile(os.path.expanduser("~/share/check_mk/modules/check_mk_base.py")) -rrdcached_socket = None +from cmk.exceptions import MKGeneralException +import cmk_base.prediction as prediction def usage(): sys.stderr.write("""== check_cpu_peaks == @@ -112,9 +97,7 @@ try: util_total = [] is_windows = True try: - # can not check for get_rrd_data because it's hacky included with execfile - # pylint: disable=undefined-variable - data = get_rrd_data(host, "CPU utilization", "util", "MAX", fromtime, untiltime) + data = prediction.get_rrd_data(host, "CPU utilization", "util", "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0] #util_total = [ x for x in datasets[0] if x != None ] @@ -125,9 +108,7 @@ try: # looks like this is not a windows rrd... is_windows = False for key in ["system", "user", "wait"]: - # can not check for get_rrd_data because it's hacky included with execfile - # pylint: disable=undefined-variable - data = get_rrd_data(host, "CPU utilization", key, "MAX", fromtime, untiltime) + data = prediction.get_rrd_data(host, "CPU utilization", key, "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0]

7 years, 7 months

Remove debug output.

by Sven Panne

Module: check_mk Branch: master Commit: 3db4f0f2b1c4d845fdf70506cd99238132dbaff2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3db4f0f2b1c4d8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 16:48:16 2017 +0100 Remove debug output. Change-Id: I3f8612967a7fe9c7ab7c010b733e34c8ff51d7cc --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index d5b35b4..6dbede3 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,6 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo "==============================================================================" .werks/werks: $(WERKS) - echo $(WERKS) PYTHONPATH=. python scripts/precompile-werks # NOTE: Old tar versions (e.g. on CentOS 5) don't have the --transform option,

7 years, 7 months

Optimized images.

by Sven Panne

Module: check_mk Branch: master Commit: 17aaafafb94aa0aca707a2249c6cadc04c70e2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17aaafafb94aa0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 16:43:45 2017 +0100 Optimized images. Change-Id: Ia0417b3184073e4be642835a7f41abf67de2e25f --- web/htdocs/images/button_backup_restore.png | Bin 2653 -> 1992 bytes web/htdocs/images/button_backup_restore_start.png | Bin 2653 -> 1992 bytes web/htdocs/images/button_backup_start.png | Bin 2558 -> 2024 bytes web/htdocs/images/button_backup_state.png | Bin 4298 -> 3624 bytes web/htdocs/images/button_backup_stop.png | Bin 796 -> 514 bytes web/htdocs/images/button_bi_rules.png | Bin 2203 -> 1723 bytes web/htdocs/images/button_bitree.png | Bin 2672 -> 2096 bytes web/htdocs/images/button_mkeventd.png | Bin 4609 -> 3972 bytes web/htdocs/images/button_mkeventd_rules.png | Bin 2203 -> 1723 bytes web/htdocs/images/button_new_bookmark_list.png | Bin 5047 -> 4126 bytes web/htdocs/images/button_showhide.png | Bin 3885 -> 3246 bytes .../images/icon_alert_alert_handler_failed.png | Bin 4309 -> 4244 bytes .../images/icon_alert_alert_handler_started.png | Bin 3672 -> 3610 bytes web/htdocs/images/icon_backup_job_new.png | Bin 5804 -> 4787 bytes web/htdocs/images/icon_backup_restore.png | Bin 2653 -> 1992 bytes web/htdocs/images/icon_backup_restore_state.png | Bin 4298 -> 3624 bytes web/htdocs/images/icon_backup_restore_stop.png | Bin 796 -> 514 bytes web/htdocs/images/icon_backup_target_edit.png | Bin 3206 -> 2614 bytes web/htdocs/images/icon_backup_targets.png | Bin 3206 -> 2614 bytes web/htdocs/images/icon_bi_rules.png | Bin 2203 -> 1723 bytes web/htdocs/images/icon_bilist.png | Bin 2372 -> 1918 bytes web/htdocs/images/icon_bitree.png | Bin 2672 -> 2096 bytes web/htdocs/images/icon_bookmark_list.png | Bin 5047 -> 4126 bytes web/htdocs/images/icon_bulk_import.png | Bin 4419 -> 4205 bytes web/htdocs/images/icon_cannot_reschedule.png | Bin 3393 -> 2619 bytes web/htdocs/images/icon_checkbox.png | Bin 1313 -> 856 bytes web/htdocs/images/icon_clear.png | Bin 2484 -> 1918 bytes web/htdocs/images/icon_counting.png | Bin 2907 -> 2280 bytes web/htdocs/images/icon_delayed.png | Bin 4812 -> 3784 bytes web/htdocs/images/icon_drag.png | Bin 2011 -> 1631 bytes web/htdocs/images/icon_guitest.png | Bin 4747 -> 3848 bytes web/htdocs/images/icon_inactive.png | Bin 2729 -> 2292 bytes web/htdocs/images/icon_inverted.png | Bin 2653 -> 1992 bytes web/htdocs/images/icon_mk.png | Bin 2096 -> 1669 bytes web/htdocs/images/icon_mkeventd.png | Bin 4609 -> 3972 bytes web/htdocs/images/icon_mkeventd_rules.png | Bin 2203 -> 1723 bytes web/htdocs/images/icon_move.png | Bin 4656 -> 4381 bytes web/htdocs/images/icon_nagios.png | Bin 1762 -> 1560 bytes web/htdocs/images/icon_nagvis.png | Bin 4044 -> 3205 bytes web/htdocs/images/icon_new_bookmark_list.png | Bin 5047 -> 4126 bytes web/htdocs/images/icon_nodowntime.png | Bin 4808 -> 4565 bytes web/htdocs/images/icon_notifications.png | Bin 4436 -> 3573 bytes web/htdocs/images/icon_passwords.png | Bin 2339 -> 1798 bytes web/htdocs/images/icon_perm_no.png | Bin 5630 -> 4647 bytes web/htdocs/images/icon_perm_no_default.png | Bin 5056 -> 3553 bytes web/htdocs/images/icon_perm_yes.png | Bin 2855 -> 2217 bytes web/htdocs/images/icon_perm_yes_default.png | Bin 2310 -> 1915 bytes web/htdocs/images/icon_plugins_os.png | Bin 3338 -> 3004 bytes web/htdocs/images/icon_read_only.png | Bin 3062 -> 2590 bytes web/htdocs/images/icon_resetcounters.png | Bin 2484 -> 1918 bytes web/htdocs/images/icon_snmpmib.png | Bin 4522 -> 3528 bytes web/htdocs/images/icon_unusedbirules.png | Bin 2978 -> 2511 bytes web/htdocs/images/icon_werk_ack.png | Bin 2855 -> 2217 bytes web/htdocs/images/icons/mkeventd.png | Bin 4609 -> 3972 bytes web/htdocs/images/logo_cmk_small.png | Bin 3674 -> 2608 bytes web/htdocs/images/new.png | Bin 1953 -> 1812 bytes web/htdocs/images/select_arrow.png | Bin 413 -> 334 bytes web/htdocs/images/sidebar_top.png | Bin 16767 -> 13236 bytes 58 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=17aaafafb9…

7 years, 7 months

Moved install target

by Sven Panne

Module: check_mk Branch: master Commit: c898febaedf87acff2874efbe44fd958d7b34d56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c898febaedf87a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 15:52:15 2017 +0100 Moved install target Change-Id: If6ddce0d7a395892505dff37cf747f3952105a1e --- Makefile | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58b9a06..2c35f80 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,10 @@ HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* $$(find agents/cfg_examples -type f) \ agents/special/* \ $$(find agents/plugins -type f) \ - $(wildcard enterprise/cmk_base/cee/*.py enterprise/modules/*.py enterprise/web/htdocs/*.py enterprise/web/plugins/*/*/*.py) + $(wildcard enterprise/cmk_base/cee/*.py \ + enterprise/modules/*.py \ + enterprise/web/htdocs/*.py \ + enterprise/web/plugins/*/*/*.py) FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.c *.h)) \ @@ -94,7 +97,7 @@ JAVASCRIPT_MINI := $(patsubst %.js,%_min.js,$(JAVASCRIPT_SOURCES)) .PHONY: all analyze build check check-binaries check-permissions check-spaces \ check-version clean cppcheck dist documentation format \ - GTAGS headers healspaces help iwyu mrproper \ + GTAGS headers healspaces help install iwyu mrproper \ optimize-images packages setup setversion tidy version all: dist packages @@ -227,6 +230,41 @@ cmc-$(VERSION).tar.gz: build: config.h $(MAKE) -C enterprise/core -j8 $(MAKE) -C enterprise/locale all + +install: + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/web + cp -rv enterprise/web/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/web + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/modules + install -m 644 enterprise/modules/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/modules + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python/cmk_base/cee + install -m 644 enterprise/cmk_base/cee/* $(DESTDIR)$(OMD_ROOT)/lib/python/cmk_base/cee + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/alert_handlers + install -m 755 enterprise/alert_handlers/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/alert_handlers + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/bakery + install -m 644 enterprise/agents/bakery/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/bakery + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/plugins + install -m 755 enterprise/agents/mk-remote-alert-handler $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents + install -m 755 enterprise/agents/plugins/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/plugins + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/plugins + install -m 755 enterprise/agents/windows/plugins/*.exe $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/plugins + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/reporting/images + install -m 644 enterprise/reporting/images/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/reporting/images + mkdir -p $(DESTDIR)$(OMD_ROOT)/bin + install -m 755 enterprise/core/src/cmc $(DESTDIR)$(OMD_ROOT)/bin + install -m 755 enterprise/bin/* $(DESTDIR)$(OMD_ROOT)/bin + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/cmc + install -m 755 enterprise/core/src/checkhelper/checkhelper $(DESTDIR)$(OMD_ROOT)/lib/cmc + install -m 755 enterprise/core/src/checkhelper/icmpsender $(DESTDIR)$(OMD_ROOT)/lib/cmc + install -m 755 enterprise/core/src/checkhelper/icmpreceiver $(DESTDIR)$(OMD_ROOT)/lib/cmc + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/locale/de/LC_MESSAGES + install -m 644 enterprise/locale/de/LC_MESSAGES/multisite.mo $(DESTDIR)$(OMD_ROOT)/share/check_mk/locale/de/LC_MESSAGES + install -m 644 enterprise/locale/de/alias $(DESTDIR)$(OMD_ROOT)/share/check_mk/locale/de + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins + install -m 755 enterprise/active_checks/check_lql_service $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise + install -m 644 enterprise/ChangeLog enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace + install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise endif packages:

7 years, 7 months

Fixed line separation of ldap sync changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d93df3c2ea438ccbd02d217c6ff6220a27ef238 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d93df3c2ea438… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 16:28:08 2017 +0100 Fixed line separation of ldap sync changes Change-Id: I37f31260da1161a693bd84e18f39f2d476e11ff1 --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3c95174..d747f94 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1022,7 +1022,7 @@ class LDAPUserConnector(UserConnector): self.log('SYNC FINISHED - Duration: %0.3f sec' % duration) if changes: - wato.add_change("edit-users", "\n".join(changes), add_user=False) + wato.add_change("edit-users", " \n".join(changes), add_user=False) # delete the fail flag file after successful sync try:

7 years, 7 months

Fixed optimize-images.

by Sven Panne

Module: check_mk Branch: master Commit: c13526c4d20ab770072ce79e1a4e99b25941fa5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c13526c4d20ab7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 16:39:04 2017 +0100 Fixed optimize-images. Change-Id: Ied384c00df6e18b0277056c75fd40b346084aa98 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c35f80..d5b35b4 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,9 @@ WERKS := $(wildcard $(addsuffix /.werks/[0-9]*,. enterprise)) JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/js/*.js,. enterprise))) JAVASCRIPT_MINI := $(patsubst %.js,%_min.js,$(JAVASCRIPT_SOURCES)) +PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons)) + + .PHONY: all analyze build check check-binaries check-permissions check-spaces \ check-version clean cppcheck dist documentation format \ GTAGS headers healspaces help install iwyu mrproper \ @@ -311,7 +314,7 @@ healspaces: optimize-images: @if type pngcrush >/dev/null 2>&1; then \ - for F in web/htdocs/images/*.png web/htdocs/images/icons/*.png; do \ + for F in $(PNG_FILES); do \ echo "Optimizing $$F..." ; \ pngcrush -q -rem alla -brute $$F $$F.opt ; \ mv $$F.opt $$F; \

7 years, 7 months

ldap sync: Only add a pending change entry in case there were changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 8381f24255c2cd28241887289ba5e8105b29c706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8381f24255c2cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 16:26:34 2017 +0100 ldap sync: Only add a pending change entry in case there were changes Change-Id: Ia323524d5ac897832126b09a76f798ec9706c793 --- web/plugins/userdb/ldap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 842b886..3c95174 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1021,7 +1021,8 @@ class LDAPUserConnector(UserConnector): duration = time.time() - start_time self.log('SYNC FINISHED - Duration: %0.3f sec' % duration) - wato.add_change("edit-users", "\n".join(changes), add_user=False) + if changes: + wato.add_change("edit-users", "\n".join(changes), add_user=False) # delete the fail flag file after successful sync try:

7 years, 7 months

4324 FIX Fixed possible exception when saving user with special characters in user name

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e4f32891d3776b3a0a9d1b091ca28dceaffebc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e4f32891d3776… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 16:25:23 2017 +0100 4324 FIX Fixed possible exception when saving user with special characters in user name Change-Id: I65b1f1d5ce896adb71ad6eb9cec00cce3df13b46 --- .werks/4324 | 9 +++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4324 b/.werks/4324 new file mode 100644 index 0000000..c22200f --- /dev/null +++ b/.werks/4324 @@ -0,0 +1,9 @@ +Title: Fixed possible exception when saving user with special characters in user name +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486394692 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a49746c..1e43620 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 4317 FIX: Rule list: Removed the row limit of the rule tables * 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets * 4323 FIX: Fixed wrong %s in notification rule title deletion confirm dialog + * 4324 FIX: Fixed possible exception when saving user with special characters in user name Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 3ca11ad..8fc965e 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -729,7 +729,7 @@ def save_users(profiles): # Write user specific files for user_id, user in profiles.items(): - user_dir = cmk.paths.var_dir + "/web/" + user_id + user_dir = cmk.paths.var_dir + "/web/" + user_id.encode("utf-8") make_nagios_directory(user_dir) # authentication secret for local processes @@ -737,7 +737,7 @@ def save_users(profiles): if "automation_secret" in user: store.save_file(auth_file, "%s\n" % user["automation_secret"]) elif os.path.exists(auth_file): - os.unlink(make_utf8(auth_file)) + os.unlink(auth_file) # Write out user attributes which are written to dedicated files in the user # profile directory. The primary reason to have separate files, is to reduce

7 years, 7 months

4323 FIX Fixed wrong %s in notification rule title deletion confirm dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: dc59a69ece5034c67723f5921017050a80bc3de6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc59a69ece5034… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 16:10:55 2017 +0100 4323 FIX Fixed wrong %s in notification rule title deletion confirm dialog Change-Id: I9a9ad6a2a801b40ccfc244a636eb191b09fcdd3e --- .werks/4323 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4323 b/.werks/4323 new file mode 100644 index 0000000..fe85099 --- /dev/null +++ b/.werks/4323 @@ -0,0 +1,9 @@ +Title: Fixed wrong %s in notification rule title deletion confirm dialog +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486393832 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 03fe1a9..a49746c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 4231 FIX: Fixed broken host renaming when files are in var/check_mk/web * 4317 FIX: Rule list: Removed the row limit of the rule tables * 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets + * 4323 FIX: Fixed wrong %s in notification rule title deletion confirm dialog Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1726ff6..217cce7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7866,7 +7866,7 @@ def generic_rule_list_actions(rules, what, what_title, save_rules): if html.has_var("_delete"): nr = int(html.var("_delete")) rule = rules[nr] - c = wato_confirm(_("Confirm deletion of %s"), + c = wato_confirm(_("Confirm deletion of %s") % what_title, _("Do you really want to delete the %s %d %s?") % (what_title, nr, rule.get("description",""))) if c:

7 years, 7 months

Lots of fixes and cleanups for our build system.

by Sven Panne

Module: check_mk Branch: master Commit: b4a995b08bccf1bdb8bbfb27c3663792b1aca587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4a995b08bccf1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 14:07:23 2017 +0100 Lots of fixes and cleanups for our build system. Change-Id: Iae098b6ec343c5e3f30921aee6a6d152930e69c8 --- Makefile | 128 +++++++++++++++++++++++++++++++++++++-------------------------- web/.f12 | 2 +- 2 files changed, 77 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b4a995b08b…

7 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017