Module: check_mk
Branch: master
Commit: fef7a22dce083f69d032d327ec87f1dd5d2ed776
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fef7a22dce083f…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Thu Feb 23 15:53:36 2017 +0100
4438 FIX statgrab_mem: Fixed wrong calculation of swap
In the past there has been a bug in statgrab which led into a wrong calculation
of swap. This bug is solved in statgrab since version 0.14. If you have
problems consider updating your statgrab.
Change-Id: Ieb5525de62276e363b8baf240c5adcd8cc39bc9d
---
.werks/4438 | 12 ++++++++++++
checks/statgrab_mem | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/4438 b/.werks/4438
new file mode 100644
index 0000000..4b60ceb
--- /dev/null
+++ b/.werks/4438
@@ -0,0 +1,12 @@
+Title: statgrab_mem: Fixed wrong calculation of swap
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1487861468
+Class: fix
+
+In the past there has been a bug in statgrab which led into a wrong calculation
+of swap. This bug is solved in statgrab since version 0.14. If you have
+problems consider updating your statgrab.
diff --git a/checks/statgrab_mem b/checks/statgrab_mem
index 6526812..e171359 100644
--- a/checks/statgrab_mem
+++ b/checks/statgrab_mem
@@ -30,8 +30,8 @@ def parse_statgrab_mem(info):
for var, value in info:
if var == 'mem.used': memused_kb = int(value) / 1024
elif var == 'mem.total': totalmem_kb = int(value) / 1024
- elif var == 'swap.used': swapused_kb = int(value) / 1024 / 4 # BUG in statgrab und Solaris?
- elif var == 'swap.total': totalswap_kb = int(value) / 1024 / 4
+ elif var == 'swap.used': swapused_kb = int(value) / 1024
+ elif var == 'swap.total': totalswap_kb = int(value) / 1024
elif var == 'mem.cache': caches_kb = int(value) / 1024
return {
Module: check_mk
Branch: master
Commit: 6d1b67706953b19f1f053ab55d287a2bedff0c47
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d1b67706953b1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 1 09:22:10 2017 +0100
4421 FIX Host rename created a "parent rename" change for each existing host
When renaming a host via WATO, this created a change for each existing host. In
large installations this lead to a performance issue.
Change-Id: Ifa07bb44f65ba93e47230b9aa1cbf233770f283d
---
.werks/4421 | 12 ++++++++++++
web/htdocs/watolib.py | 19 ++++++++++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/.werks/4421 b/.werks/4421
new file mode 100644
index 0000000..0c849a0
--- /dev/null
+++ b/.werks/4421
@@ -0,0 +1,12 @@
+Title: Host rename created a "parent rename" change for each existing host
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1488356473
+
+When renaming a host via WATO, this created a change for each existing host. In
+large installations this lead to a performance issue.
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index 06ae353..ce332ed 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -1867,12 +1867,15 @@ class Folder(BaseFolder):
# Must not fail because of auth problems. Auth is check at the
# actually renamed host.
changed = rename_host_in_list(self._attributes["parents"], oldname, newname)
- add_change("rename-parent",
- _("Renamed parent (set in folder) from %s to %s") % (self.path(), oldname, newname),
+ if not changed:
+ return False
+
+ add_change("rename-parent", _("Renamed parent (set in folder) from %s to %s") %
+ (self.path(), oldname, newname),
obj=self, sites=self.all_site_ids())
self.save_hosts()
self.save()
- return changed
+ return True
def rewrite_hosts_files(self):
@@ -2433,19 +2436,25 @@ class Host(WithPermissionsAndAttributes):
# on the renamed host must be sufficient. If we would
# fail here we would leave an inconsistent state
changed = rename_host_in_list(self._cluster_nodes, oldname, newname)
+ if not changed:
+ return False
+
add_change("rename-node", _("Renamed cluster node from %s into %s.") % (oldname, newname),
obj=self, sites=[self.site_id()])
self.folder().save_hosts()
- return changed
+ return True
def rename_parent(self, oldname, newname):
# Same is with rename_cluster_node()
changed = rename_host_in_list(self._attributes["parents"], oldname, newname)
+ if not changed:
+ return False
+
add_change("rename-parent", _("Renamed parent from %s into %s.") % (oldname, newname),
obj=self, sites=[self.site_id()])
self.folder().save_hosts()
- return changed
+ return True
def rename(self, new_name):
Module: check_mk
Branch: master
Commit: f5069bf77faa3e52e59a29050efbafbd10ae7e03
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5069bf77faa3e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 28 17:36:35 2017 +0100
Updated bug entries #2510
Change-Id: I2f927dafd76f2a3c5fcee1c4b66adc953812bbbf
---
.bugs/2510 | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/.bugs/2510 b/.bugs/2510
index 5b10165..c9772a2 100644
--- a/.bugs/2510
+++ b/.bugs/2510
@@ -5,4 +5,19 @@ Date: 2017-02-23 13:11:32
Targetversion: 1.4.0
Class: bug
-The GUI is only using the active checks under ~/lib/nagios/plugins and not local ones (~/local/lib/nagios/plugins).
+The GUI is only using the active checks under ~/lib/nagios/plugins and
+not local ones (~/local/lib/nagios/plugins).
+
+-------------------------
+
+The active checks shown on the WATO service page is executed by the
+automation "active-check" in modules/automation.py which simply uses
+the argument_function defined in checks_check_*.
+
+This seems also affect the regular checks. At least when configuring
+active checks with the "active_checks" rule which is used by default
+when configuring a formalized active check with WATO. The
+checks/check_* files hard code a $USER1$ path to the configuration
+which tells Check_MK to use the file found in ~/lib/nagios/plugins.
+
+This affects the CMC. Nagios has not been checked.
