Module: check_mk
Branch: master
Commit: 4a575885df2589edc2720dc291e80efe3283a2a2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a575885df2589…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Apr 17 15:05:39 2012 +0200
Updated bug entries #0669
---
.bugs/669 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/669 b/.bugs/669
index 4488b77..f35b899 100644
--- a/.bugs/669
+++ b/.bugs/669
@@ -1,12 +1,15 @@
Title: Legacy checks prevent auto full scan in inventory
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-03-08 16:00:40
Targetversion: 1.2.0
-Class: bug
If you have configured legacy checks via rules then the
inventory of a new host will only work if you click on
"Full Scan" since the list of services of the host is
not empty. The condition for this should rather be "if the
host has no inventorized services".
+
+2012-04-17 15:05:37: changed state open -> done
+Has already been fixed.
Module: check_mk
Branch: master
Commit: 1ad380edac05a7b7f6fd515d81d33a083d75dcc4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ad380edac05a7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 17 14:43:04 2012 +0200
FIX: reset counter in case of (broken) future time
---
.bugs/630 | 7 +++++--
ChangeLog | 1 +
modules/check_mk_base.py | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.bugs/630 b/.bugs/630
index be89306..c2b4827 100644
--- a/.bugs/630
+++ b/.bugs/630
@@ -1,9 +1,9 @@
Title: Reset counter in case of time step
Component: core
-State: open
+Class: bug
+State: done
Date: 2012-02-02 15:08:44
Targetversion: 1.2.0
-Class: bug
If get_counter detects a future timestamp then it
should reset the counter to the current time so
@@ -11,3 +11,6 @@ that at least the next time the counter will work.
This happens e.g. in at Windows, because the agent
was sending invalid timestamps in older versions
that are lying in the future and are now repaired.
+
+2012-04-17 14:42:52: changed state open -> done
+fixed.
diff --git a/ChangeLog b/ChangeLog
index 5143458..53b2dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.2.0b2:
Core:
* FIX: Cluster host checks were UNKNOWN all the time
+ * FIX: reset counter in case of (broken) future time
WATO:
* Added new permission "move hosts" to allow/deny moving of hosts in WATO
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 86cb88e..2054205 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -599,6 +599,8 @@ def get_counter(countername, this_time, this_val, allow_negative=False):
last_time, last_val = g_counters.get(countername)
timedif = this_time - last_time
if timedif <= 0: # do not update counter
+ # Reset counter to a (hopefully) reasonable value
+ g_counters[countername] = (this_time, this_val)
# Do not suppress this check on check_mk -nv
if opt_dont_submit:
return 1.0, 0.0
Module: check_mk
Branch: master
Commit: c231f5e1f86736cee0dec405c0147db1604d1abf
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c231f5e1f86736…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 17 14:53:20 2012 +0200
Updated bug entries #0676
---
.bugs/676 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/676 b/.bugs/676
index d1efc8b..ef3be82 100644
--- a/.bugs/676
+++ b/.bugs/676
@@ -1,9 +1,12 @@
Title: Rule-Icon missing for df check in WATO services list
Component: wato
-State: open
+Class: bug
+State: works4me
Date: 2012-04-10 17:04:16
Targetversion: 1.2.0
-Class: bug
In the inventory list you have usually a rule icon for each
check the can be parameterized. At df this is missing latetly.
+
+2012-04-17 14:53:17: changed state open -> works4me
+Cannot see any problem here (anymore).
Module: check_mk
Branch: master
Commit: ed7f35ce80758ef6563791ec45053a14daf74290
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed7f35ce80758e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Apr 17 14:51:55 2012 +0200
Updated bug entries #0668
---
.bugs/668 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/668 b/.bugs/668
index f860c9d..d675923 100644
--- a/.bugs/668
+++ b/.bugs/668
@@ -1,9 +1,9 @@
Title: Reschedule does not work anymore
Component: multisite
-State: open
+Class: bug
+State: works4me
Date: 2012-02-26 11:18:29
Targetversion: 1.2.0
-Class: bug
When clicking on the rotating arrows only the error
message ERROR cannot reschedule check: time out
@@ -13,3 +13,6 @@ LM: Works for me.
MK: Most time for me as well. But sometimes it
immediately fails....
+
+2012-04-17 14:51:32: changed state open -> works4me
+I can not reproduce the problem. So I close this bug now. Please analyze+fix it next time it occurs.
Module: check_mk
Branch: master
Commit: b0dae8649ddf20d313a22c3838376d758818b57e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0dae8649ddf20…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 16 15:19:57 2012 +0200
WATO: Added new internal hook pre-activate-changes to execute custom
code BEFORE Check_MK is called to restart Nagios
---
ChangeLog | 2 ++
web/htdocs/wato.py | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75d6c9a..599a486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
of userids to hide the listed users from the WATO user management GUI.
* WATO API: Added new method rewrite_configuration to trigger a rewrite of
all host related wato configuration files to distribute changed tags
+ * WATO: Added new internal hook pre-activate-changes to execute custom
+ code BEFORE Check_MK is called to restart Nagios
Multisite
* Added config option default_ts_format to configure default timestamp
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index b0de0e2..73f9f7c 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3379,6 +3379,9 @@ def check_mk_local_automation(command, args=[], indata=""):
"<li>Retry this operation</li></ol>\n" %
(html.apache_user(), sudoline))
+ if command == 'restart':
+ call_hook_pre_activate_changes()
+
if config.debug:
log_audit(None, "automation", "Automation: %s" % " ".join(cmd))
try:
@@ -10360,6 +10363,20 @@ def call_hook_folder_deleted(folder):
if 'folder-deleted' in g_hooks:
call_hooks("folder-deleted", folder)
+def call_hook_pre_activate_changes():
+ """
+ This hook is executed when one applies the pending configuration changes
+ from wato but BEFORE the nagios restart is executed.
+
+ It can be used to create custom input files for nagios/Check_MK.
+
+ The registered hooks are called with a dictionary as parameter which
+ holds all available with the hostnames as keys and the attributes of
+ the hosts as values.
+ """
+ if hook_registered('pre-activate-changes'):
+ call_hooks("pre-activate-changes", collect_hosts(g_root_folder))
+
def call_hook_activate_changes():
"""
This hook is executed when one applies the pending configuration changes