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.
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.
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"])
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.
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:
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 ]:
Module: check_mk
Branch: master
Commit: 596d77a18883abf5427a6defd9fab253af81b2e8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=596d77a18883ab…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 18 21:36:56 2013 -0400
Updated bug entries #1021, #0798
---
.bugs/1021 | 9 +++++++--
.bugs/798 | 16 ++++++++++------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/.bugs/1021 b/.bugs/1021
index 43ccfc4..6b399e0 100644
--- a/.bugs/1021
+++ b/.bugs/1021
@@ -1,10 +1,15 @@
Title: Multisite title shows only site-name (should show site alias)
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2013-09-17 16:39:20
Targetversion: 1.4.0
-Class: nastiness
It would be more user friendly if the title of the window / tab would show
the alias of the site instead of the site-id. The normal user does not
see the site-id in many situations. In most cases the site-alias is used.
+
+2013-10-18 21:33:26: changed state open -> done
+A site has no alias. There is just an alias for a Multisite connectin
+in the central site. But the site has a global option "HTML-Title of HTML Multisite GUI".
+There you can add an arbitrary text.
diff --git a/.bugs/798 b/.bugs/798
index 4bea830..0cb41b1 100644
--- a/.bugs/798
+++ b/.bugs/798
@@ -1,16 +1,20 @@
Title: PNP graphs and localtime
Component: multisite
-State: open
+Class: nastiness
+State: wontfix
Date: 2012-08-22 11:23:13
Targetversion: future
-Class: nastiness
If the user and the monitoring server exist in different timezones, multisite
-has enough smarts to handle this. the problem is with PNP graphs - if the
-user views them, he ends up with time information recorded on the nagios
-server This breaks the UI logic, and worse, he can't even tell what timezone
-the server is running in.
+is not smart enough in order to handle this. the problem is with PNP graphs
+- if the user views them, he ends up with time information recorded on the
+nagios server. This breaks the UI logic, and worse, he can't even tell what
+timezone the server is running in.
It might be possible to fudge with the numbers when calling PNP. Otherwise we
could at least add timezone info to the output, but this would only work if
there's just a single monitoring host (thus useless)
+
+2013-10-18 21:35:26: changed state open -> wontfix
+Probably hard to fix in PNP. We'll wait for some solution in the
+future.