Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Updated bug entries #0966

by Mathias Kettner

Module: check_mk Branch: master Commit: 653a5cb79bd584b934b3a1b89325527c33a03a0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=653a5cb79bd584… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 09:25:16 2013 -0500 Updated bug entries #0966 --- .bugs/966 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/966 b/.bugs/966 index 915abcf..b8b0f8d 100644 --- a/.bugs/966 +++ b/.bugs/966 @@ -1,9 +1,9 @@ Title: defunct and other entries on ps section of AIX agent confuse ps check Component: checks -State: open +Class: bug +State: works4me Date: 2013-08-08 17:05:36 Targetversion: future -Class: bug The section that needs to be reviewed is "<<<ps>>>". I would prefer not to post the entire agent output, but instead I will provide the relevant @@ -37,3 +37,8 @@ On Wed, May 22, 2013 at 10:00 AM, Mathias Kettner <mk(a)mathias-kettner.de>wrote: > > Mathais > + +2013-10-18 09:25:11: changed state open -> works4me +Current state is that the lines in question are simply being +ignored and cause now trouble. Counting zombies and stuff could +be done, but is not a bug but a feature reqeust.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0832, #0977

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c24480d4ae51cc065e887956b5fecc02b8ac2c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c24480d4ae51c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 11:16:24 2013 -0500 Updated bug entries #0832, #0977 --- .bugs/832 | 9 +++++++-- .bugs/977 | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.bugs/832 b/.bugs/832 index ab41174..11dd3e6 100644 --- a/.bugs/832 +++ b/.bugs/832 @@ -1,9 +1,14 @@ Title: snmp infos are missing in wato inventory until clicking full scan Component: wato -State: open +Class: bug +State: wontfix Date: 2013-10-17 15:57:04 Targetversion: 1.4.0 -Class: bug When adding a hosts, either a tcp+snmp or snmp only, the Informationen from the snmp checks are missing after clicking "Save and go to services". They will not shown befor clicking on "Full Scan" + +2013-10-18 11:16:22: changed state open -> wontfix +That as it's designed. Thats the reason why the button is there. +To avoid a full scan automatically happen every time you go +to that page. diff --git a/.bugs/977 b/.bugs/977 index ce0585b..6a48ab4 100644 --- a/.bugs/977 +++ b/.bugs/977 @@ -9,3 +9,8 @@ When you issue a command on hosts/services and confirm then you see a blue message with a link back to the view. In that situation there must be no reload of the view container. But this happens. If you wait long enough then hosts/services get visible again. + +An even better resolution would be to drop that intermediate page at +all and instead print the result of the command in a kind of overlay +window that goes away after a view seconds or when you hover over +it. That saves one mouse click.

10 years, 11 months

Check_MK Git: check_mk: FIX: remove duplicate entries from Quicksearch

by Mathias Kettner

Module: check_mk Branch: master Commit: f6af5c08a28765a78cc81bf899d189ac77985339 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6af5c08a28765… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 11:31:18 2013 -0500 FIX: remove duplicate entries from Quicksearch --- .bugs/831 | 6 ++++-- .bugs/998 | 9 +++++++-- ChangeLog | 1 + web/htdocs/sidebar.py | 16 +++++++++++----- web/plugins/sidebar/search.py | 1 + 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.bugs/831 b/.bugs/831 index 998061d..d2a797c 100644 --- a/.bugs/831 +++ b/.bugs/831 @@ -1,8 +1,10 @@ Title: Quicksearch: Duplicate results Component: multisite -State: open +Class: bug +State: done Date: 2013-10-16 13:41:13 Targetversion: 1.4.0 -Class: bug In Version 1.2.3i4, the quicksearch repeats some of the results what means that some of the hosts are shown twice. + +2013-10-18 11:31:07: changed state open -> done diff --git a/.bugs/998 b/.bugs/998 index c1298ff..ba2287c 100644 --- a/.bugs/998 +++ b/.bugs/998 @@ -1,12 +1,17 @@ Title: ntp check does not disable dns lookups and uses ipv6 as default with newer ntp versions Component: checks -State: open +Class: bug +State: wontfix Date: 2013-08-09 12:39:37 Targetversion: future -Class: bug check_mk_agents ntp check calls 'ntpq -p' as check command. This uses dns to resolve addresses of ntp servers and uses ipv6 as default if available. Both may lead to timeouts of the check. Calling 'ntpq -4np' might be a better choice. Solution not clear. -n introduces other problems. + +2013-10-18 11:19:19: changed state open -> wontfix +Adding -n causes trouble when using pool.ntp.org and stuff, +because the IP addresses are always changing. That make +the ntp.peers check unhappy. diff --git a/ChangeLog b/ChangeLog index d4cec65..78d7587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses + * FIX: Remove duplicate entries from Quicksearch BI: * FIX: Fix exception when showing BI tree in reporting time warp diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 8e9c1aa..5f6b478 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -594,6 +594,7 @@ def page_edit_bookmark(): html.footer() +#. # .--Quicksearch---------------------------------------------------------. # | ___ _ _ _ | # | / _ \ _ _(_) ___| | _____ ___ __ _ _ __ ___| |__ | @@ -712,17 +713,22 @@ def render_search_results(ty, objects): display_site = True break + # Remove duplicate entries, i.e. with the same name and + # the same URL. + unique = set([]) for obj in objects: if len(obj) == 3: plugin, site, name = obj url = url_tmpl % {'name': name, 'site': site} else: plugin, site, name, url = obj - html.write('<a id="result_%s" class="%s" href="%s" onClick="mkSearchClose()" target="main">%s' % - (name, ty, url, name)) - if display_site: - html.write(' (%s)' % site) - html.write('</a>\n') + if not (name, url) in unique: + html.write('<a id="result_%s" class="%s" href="%s" onClick="mkSearchClose()" target="main">%s' % + (name, ty, url, name)) + if display_site: + html.write(' (%s)' % site) + html.write('</a>\n') + unique.add((name, url)) def process_search(q): ty, q = parse_search_query(q) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index a574b9d..e2e5a9c 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -96,6 +96,7 @@ sidebar_snapins["search"] = { """ } +#. # .--Search Plugins------------------------------------------------------. # | ____ _ ____ _ _ | # | / ___| ___ __ _ _ __ ___| |__ | _ \| |_ _ __ _(_)_ __ ___ |

10 years, 11 months

Check_MK Git: check_mk: FIX: avoid need for apache restart when adding new service levels

by Mathias Kettner

Module: check_mk Branch: master Commit: 87ba19a7aa9a4b5e8f0eb60f8c8aab02d7f15c9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ba19a7aa9a4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 21:27:17 2013 -0400 FIX: avoid need for apache restart when adding new service levels --- .bugs/1051 | 6 ++++-- ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.bugs/1051 b/.bugs/1051 index 810b01a..05e9ee7 100644 --- a/.bugs/1051 +++ b/.bugs/1051 @@ -1,12 +1,14 @@ Title: cache problem after adding service levels Component: multisite -State: open +Class: nastiness +State: done Date: 2013-09-13 11:45:17 Targetversion: 1.2.3i2 -Class: nastiness after adding service levels, they are not displayed in configuration dialog of custom notification for a user restart of apache is required before using the service levels should work without restart cache invalidation required + +2013-10-18 21:26:32: changed state open -> done diff --git a/ChangeLog b/ChangeLog index e3c5d7b..694411f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * FIX: nailed down ".siteid" exception when added new site * FIX: fixed setting for locking mode from 'ait' to 'wait' * FIX: avoid removal of tags from rules when not yet acknowledged + * FIX: avoid need for apache restart when adding new service levels 1.2.3i4: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aabffb9..06e1ad8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8329,8 +8329,8 @@ def load_notification_table(): orientation = "horizontal", show_titles = False, elements = [ - DropdownChoice(label = _("from:"), choices = service_levels(), prefix_values = True), - DropdownChoice(label = _(" to:"), choices = service_levels(), prefix_values = True), + DropdownChoice(label = _("from:"), choices = service_levels, prefix_values = True), + DropdownChoice(label = _(" to:"), choices = service_levels, prefix_values = True), ], ), ),

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1048

by Mathias Kettner

Module: check_mk Branch: master Commit: ced4b7dc94497552c8e1e4ebf77ee6a492555fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ced4b7dc944975… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 11:17:03 2013 -0500 Updated bug entries #1048 --- .bugs/1048 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1048 b/.bugs/1048 index b7f59ff..9d3049c 100644 --- a/.bugs/1048 +++ b/.bugs/1048 @@ -1,9 +1,9 @@ Title: Bug in staleness on dual config (SNMP + Agent) Component: core -State: open +Class: bug +State: done Date: 2013-09-11 14:37:12 Targetversion: 1.2.3i2 -Class: bug Host is defined Dual (SNMP + Check-MK-Agent) check interval for SNMP Checks is increased to e. g. 5 min, while checks of Agent run @@ -11,3 +11,6 @@ default every minute The problem is: Services checked by SNMP get stale too early (in this case after 90 sec) should get stale after 900 sec + +2013-10-18 11:17:00: changed state open -> done +Fixed in both cores.

10 years, 11 months

Check_MK Git: check_mk: FIX: ps: do not output perfdata of CPU averaging

by Mathias Kettner

Module: check_mk Branch: master Commit: fdc2f7a305c3ec2d95d845672d21ed6d937450e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdc2f7a305c3ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 21:16:36 2013 -0400 FIX: ps: do not output perfdata of CPU averaging --- .bugs/1054 | 7 +++++-- .bugs/1063 | 6 ++++-- ChangeLog | 1 + checks/ps | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.bugs/1054 b/.bugs/1054 index f4bd6ce..dbb92a6 100644 --- a/.bugs/1054 +++ b/.bugs/1054 @@ -1,10 +1,13 @@ Title: ps check returns perfdata Component: checks -State: open +Class: nastiness +State: done Date: 2013-09-23 12:32:48 Targetversion: 1.2.3i2 -Class: nastiness ps check returns (some) perfdata: pcpuavg=0;90;98;0;15 but it should not. only ps.perf should! + +2013-10-18 21:16:27: changed state open -> done +Done. diff --git a/.bugs/1063 b/.bugs/1063 index 6293746..67e6d19 100644 --- a/.bugs/1063 +++ b/.bugs/1063 @@ -1,8 +1,10 @@ Title: manpage for check_form_submit is missing Component: checks -State: open +Class: nastiness +State: done Date: 2013-10-08 17:26:07 Targetversion: 1.2.3i3 -Class: nastiness manpage for check_form_submit needs to be written + +2013-10-18 21:12:07: changed state open -> done diff --git a/ChangeLog b/ChangeLog index 7be4f6c..e3c5d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * FIX: hp_proliant: Correct handling of missing snmp data * FIX: logwatch.ec: No longer forwards "I" lines to event console * FIX: check_dns: default to querying the host itself + * FIX: ps: do not output perfdata of CPU averaging (use ps.perf for that) WATO: * You can now have site-specific global settings when using diff --git a/checks/ps b/checks/ps index a18d1d2..c3c3cd0 100644 --- a/checks/ps +++ b/checks/ps @@ -384,7 +384,7 @@ def check_procs(item, params, info, with_perfdata): timedif, avg_cpu = get_average("ps.%s.cpu" % item, now, percent_cpu, params["cpu_average"], False) infotext += " (%d min average: %.1f%%)" % (params["cpu_average"], avg_cpu) percent_cpu = avg_cpu # use this for level comparison - if extended_perfdata: + if with_perfdata and extended_perfdata: perfdata.append(("pcpuavg", avg_cpu, warn_cpu, crit_cpu, 0, params["cpu_average"])) if "cpulevels" in params:

10 years, 11 months

Check_MK Git: check_mk: FIX: check_dns: default to querying the host itself

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e5d57d3d75fbabc58cdd6b6b9ba82f86a085207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e5d57d3d75fba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 13:22:35 2013 -0500 FIX: check_dns: default to querying the host itself --- .bugs/1042 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++---- .bugs/1043 | 6 ++++-- ChangeLog | 1 + checks/check_dns | 2 ++ 4 files changed, 60 insertions(+), 6 deletions(-) diff --git a/.bugs/1042 b/.bugs/1042 index 33a0e20..a0cc70d 100644 --- a/.bugs/1042 +++ b/.bugs/1042 @@ -5,7 +5,56 @@ Date: 2013-08-30 15:48:55 Targetversion: 1.2.3 Class: bug -Problems in Multisite GUI if apache is running with mpm -prefork works -so the package should depend on apache2-mpm -but at least the deb for ubuntu 13.04 64bit does not, maybe others too +Problems in Multisite GUI if apache is running with mpm prefork works so the +package should depend on apache2-mpm but at least the deb for ubuntu 13.04 +64bit does not, maybe others too + +Here is the fix. Important for the future: when supporting a new distribution +we must not copy the file from omdistro.org, but create one ourselves, since +we have several changes in that file. + + +diff --git a/distros/Makefile.UBUNTU_12.10 b/distros/Makefile.UBUNTU_12.10 +index af1cd7f..dc075b9 100644 +--- a/distros/Makefile.UBUNTU_12.10 ++++ b/distros/Makefile.UBUNTU_12.10 +@@ -33,8 +33,8 @@ BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python + BUILD_PACKAGES += apache2 # compiling mod_python + BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman + BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components +-BUILD_PACKAGES += libpcap-dev # needed for CMC +-BUILD_PACKAGES += gettext # needed for german l10n ++BUILD_PACKAGES += libpcap-dev # needed for CMC ++BUILD_PACKAGES += gettext # needed for german l10n + OS_PACKAGES = + OS_PACKAGES += time # needed for mk-job + OS_PACKAGES += traceroute # needed for Check_MK parent scan +diff --git a/distros/Makefile.UBUNTU_13.04 b/distros/Makefile.UBUNTU_13.04 +index 5895796..8cbe9b1 100644 +--- a/distros/Makefile.UBUNTU_13.04 ++++ b/distros/Makefile.UBUNTU_13.04 +@@ -1,5 +1,6 @@ + DISTRO_CODE = raring + BUILD_PACKAGES = ++BUILD_PACKAGES += smbclient + BUILD_PACKAGES += build-essential + BUILD_PACKAGES += dpatch + BUILD_PACKAGES += dnsutils +@@ -31,6 +32,9 @@ BUILD_PACKAGES += snmp + BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python + BUILD_PACKAGES += apache2 # compiling mod_python + BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman ++BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components ++BUILD_PACKAGES += libpcap-dev # needed for CMC ++BUILD_PACKAGES += gettext # needed for german l10n + OS_PACKAGES = + OS_PACKAGES += time # needed for mk-job + OS_PACKAGES += traceroute # needed for Check_MK parent scan +@@ -42,6 +46,7 @@ OS_PACKAGES += fping + OS_PACKAGES += graphviz + OS_PACKAGES += libapache2-mod-fcgid + OS_PACKAGES += libapache2-mod-proxy-html ++OS_PACKAGES += apache2-mpm-prefork # Multisite/mod_python crashes with mpm-worker! + OS_PACKAGES += libboost-program-options1.49.0 + OS_PACKAGES += libdbi1 + OS_PACKAGES += libevent-1.4-2 diff --git a/.bugs/1043 b/.bugs/1043 index 613075f..39992ea 100644 --- a/.bugs/1043 +++ b/.bugs/1043 @@ -1,9 +1,9 @@ Title: active check check_dns by default asks the wrong DNS server Component: checks -State: open +Class: bug +State: done Date: 2013-09-02 12:46:49 Targetversion: 1.2.3i2 -Class: bug if I add a check_dns active check to a server by a wato rule without any additional parameters, I expect it to check the DNS server on *this* machine @@ -13,3 +13,5 @@ to determine which DNS server to send the name query to the change would be the following: as long as -s is not entered separately in the rule, the -s parameter should be set to $HOSTADDRESS$ + +2013-10-18 13:22:41: changed state open -> done diff --git a/ChangeLog b/ChangeLog index c4159ec..afc198b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * FIX: local: tolerate invalid output lines * FIX: hp_proliant: Correct handling of missing snmp data * FIX: logwatch.ec: No longer forwards "I" lines to event console + * FIX: check_dns: default to querying the host itself WATO: * You can now have site-specific global settings when using diff --git a/checks/check_dns b/checks/check_dns index 1cf1c07..f655577 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -30,6 +30,8 @@ def check_dns_arguments(params): if "server" in settings: args += ' -s %s' % quote_shell_string(settings["server"]) + else: + args += " -s '$HOSTADDRESS$'" if "expected_address" in settings: args += ' -a %s' % quote_shell_string(settings["expected_address"])

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1028

by Mathias Kettner

Module: check_mk Branch: master Commit: 46c9f27a8dbfed48caedbfed2bef82537f0e781d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46c9f27a8dbfed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 13:34:16 2013 -0500 Updated bug entries #1028 --- .bugs/1028 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/1028 b/.bugs/1028 index 0c2b742..64b4823 100644 --- a/.bugs/1028 +++ b/.bugs/1028 @@ -1,9 +1,9 @@ Title: flexible Notification / plain Text Email: Problem with Umlaut in Hostalias Component: core -State: open +Class: bug +State: done Date: 2013-08-26 11:07:27 Targetversion: 1.2.3i2 -Class: bug auf meiner Installation, omd Paket von Euch Version 1.2.3i1 ist folgender Fehler: @@ -30,3 +30,7 @@ Da muss bestimmt in OMD etwas gefixt werden.... Möglicherweise ein falches Encode. Evtl. Kodierung falsch gesetzt. Wir sollen ein try: um das encode machen und mehrere Variante probieren. + +2013-10-18 13:34:10: changed state open -> done +Should be fixed meanwhile due to convert_context_to_unicode. +Also my tests are positive.

10 years, 11 months

Check_MK Git: check_mk: FIX: avoid removal of tags from rules when not yet acknowledged

by Mathias Kettner

Module: check_mk Branch: master Commit: 8aae6704f3daad5e02828ea125e625e4663463fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aae6704f3daad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 21:11:24 2013 -0400 FIX: avoid removal of tags from rules when not yet acknowledged Currently - when the user deleted a tag or tag group that was in use by rules - he was asked if he wanted to remove the tag, but it had already been removed! --- ChangeLog | 7 ++++--- web/htdocs/wato.py | 17 +++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b03421f..7be4f6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1.2.3i5: Core: + * Automatically remove duplicate checks when monitoring with Agent+SNMP + at the same time. TCP based ones have precedence. + * inventory check of SNMP devices now does scan per default (configurable) * FIX: inventory check now honors settings for exit code * FIX: avoid exception nodes of cluster have different agent type * FIX: continue inventory, if one check does not support it @@ -8,9 +11,6 @@ * FIX: fixed error handling in SNMP scan, inventory check fails now if SNMP agent is not responding * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) - * Automatically remove duplicate checks when monitoring with Agent+SNMP - at the same time. TCP based ones have precedence. - * inventory check of SNMP devices now does scan per default (configurable) Event Console: * check_mkevents now available as C binary: check_mkevents_c @@ -66,6 +66,7 @@ * FIX: correct display of number of hosts in bulk inventory * FIX: nailed down ".siteid" exception when added new site * FIX: fixed setting for locking mode from 'ait' to 'wait' + * FIX: avoid removal of tags from rules when not yet acknowledged 1.2.3i4: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1352af3..aabffb9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10156,15 +10156,16 @@ def change_host_tags_in_rules(folder, operations, mode): if type(operations) == list: # this list of tags to remove for tag in operations: if tag != None and (tag in tag_specs or "!"+tag in tag_specs): - modified = True if rulespec not in affected_rulespecs: affected_rulespecs.append(rulespec) - if tag in tag_specs and mode == "delete": - rules_to_delete.add(nr) - elif tag in tag_specs: - tag_specs.remove(tag) - elif "+"+tag in tag_specs: - tag_specs.remove("!"+tag) + if mode != "check": + modified = True + if tag in tag_specs and mode == "delete": + rules_to_delete.add(nr) + elif tag in tag_specs: + tag_specs.remove(tag) + elif "+"+tag in tag_specs: + tag_specs.remove("!"+tag) # Removal or renamal of single tag choices else: @@ -10176,10 +10177,10 @@ def change_host_tags_in_rules(folder, operations, mode): continue if old_tag in tag_specs or ("!" + old_tag) in tag_specs: - modified = True if rulespec not in affected_rulespecs: affected_rulespecs.append(rulespec) if mode != "check": + modified = True if old_tag in tag_specs: tag_specs.remove(old_tag) if new_tag:

10 years, 11 months

Check_MK Git: check_mk: FIX: use default values for unset variables in actions

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c26a2a8dd7f15d1d4037769ce2868f338b710ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c26a2a8dd7f15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 18 13:45:16 2013 -0500 FIX: use default values for unset variables in actions --- .bugs/1073 | 7 +++---- .bugs/1076 | 6 ++++-- ChangeLog | 1 + mkeventd/bin/mkeventd | 11 +++++++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.bugs/1073 b/.bugs/1073 index 2852c1d..281a051 100644 --- a/.bugs/1073 +++ b/.bugs/1073 @@ -5,7 +5,6 @@ Date: 2013-10-15 23:42:57 Targetversion: 1.2.3i3 Class: bug -The online help sometimes randomly switches on on Chrome. -Never seen this on Firefox. Seem like the help.mk in the -user profile correctly corresponds to the settings, so -there it is no javascript problem? +The online help sometimes randomly switches on on Chrome on Windows. +Never seen this on Firefox. Seems like the help.mk in the user profile +correctly corresponds to the settings, so there it is no javascript problem? diff --git a/.bugs/1076 b/.bugs/1076 index 8434893..b045584 100644 --- a/.bugs/1076 +++ b/.bugs/1076 @@ -1,11 +1,13 @@ Title: $COUNT$ empty in non-counting rule Component: ec -State: open +Class: bug +State: done Date: 2013-10-16 23:17:16 Targetversion: 1.4.0 -Class: bug If you use the placeholder $COUNT$ in actions or emails and have no counting rule, then the macro is not being replaced. Would should make a better macro replacement, that is not based on the actual fields of an event but on the declared fields, and apply default values for any missing field. + +2013-10-18 13:45:05: changed state open -> done diff --git a/ChangeLog b/ChangeLog index afc198b..b03421f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Event Console: * check_mkevents now available as C binary: check_mkevents_c + * FIX: use default values for unset variables in actions Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index e4065d0..97df06a 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2687,8 +2687,15 @@ def do_rule_action(action, event, user=""): log("Error during execution of action %s: %s" % (action["id"], format_exception())) def substitute_event_tags(text, event): - groups = [("match_group_%d" % (nr+1), g) for (nr, g) in enumerate(event.get("match_groups", ()))] - for key, value in event.items() + groups: + substs = [("match_group_%d" % (nr+1), g) + for (nr, g) + in enumerate(event.get("match_groups", ()))] + + for key, defaultvalue in event_columns: + varname = key[6:] + substs.append((varname, event.get(varname, defaultvalue))) + + for key, value in substs: if type(value) == tuple: value = " ".join(value) elif type(value) not in [ str, unicode ]:

10 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013