Module: check_mk
Branch: master
Commit: 3fe6708e81c5410c2f185b60d273472ee449e137
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fe6708e81c541…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Feb 27 16:35:00 2017 +0100
4427 FIX Fixed temporal spreading of pnp4nagios' XML file updates.
If you use the old pnp4nagios format with one metric per RRD, the core needs
to create/update an XML description for each RRD from time to time. To
avoid creation/update storms after e.g. reloads or mass imports of new
hosts, this work should be spread over several (currently 10) minutes. Due
to a bug this spreading didn't work, which has been fixed.
Change-Id: I1b7dbb36af8f9bdf470e2193a2d27d3bb91af689
---
.werks/4427 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.werks/4427 b/.werks/4427
new file mode 100644
index 0000000..7816693
--- /dev/null
+++ b/.werks/4427
@@ -0,0 +1,14 @@
+Title: Fixed temporal spreading of pnp4nagios' XML file updates.
+Level: 1
+Component: core
+Compatible: compat
+Edition: cee
+Version: 1.5.0i1
+Date: 1488209173
+Class: fix
+
+If you use the old pnp4nagios format with one metric per RRD, the core needs
+to create/update an XML description for each RRD from time to time. To
+avoid creation/update storms after e.g. reloads or mass imports of new
+hosts, this work should be spread over several (currently 10) minutes. Due
+to a bug this spreading didn't work, which has been fixed.
Module: check_mk
Branch: master
Commit: f2b39581a7b68f2130c97d87a42391b288f25ce1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2b39581a7b68f…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Feb 27 15:55:08 2017 +0100
Moved file system #include to separate header, shielding from future changes.
Change-Id: I5cc8aa21147952438fecef78e7e13cb7f383e6dc
---
livestatus/src/FileSystem.h | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/livestatus/src/FileSystem.h b/livestatus/src/FileSystem.h
new file mode 100644
index 0000000..079b7c5
--- /dev/null
+++ b/livestatus/src/FileSystem.h
@@ -0,0 +1,34 @@
+// +------------------------------------------------------------------+
+// | ____ _ _ __ __ _ __ |
+// | / ___| |__ ___ ___| | __ | \/ | |/ / |
+// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+// | | |___| | | | __/ (__| < | | | | . \ |
+// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+// | |
+// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de |
+// +------------------------------------------------------------------+
+//
+// This file is part of Check_MK.
+// The official homepage is at http://mathias-kettner.de/check_mk.
+//
+// check_mk is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation in version 2. check_mk is distributed
+// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+// PARTICULAR PURPOSE. See the GNU General Public License for more de-
+// tails. You should have received a copy of the GNU General Public
+// License along with GNU Make; see the file COPYING. If not, write
+// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA 02110-1301 USA.
+
+#ifndef FileSystem_h
+#define FileSystem_h
+
+// IWYU pragma: begin_exports
+#include <experimental/filesystem>
+// IWYU pragma: end_exports
+
+namespace fs = std::experimental::filesystem;
+
+#endif // FileSystem_h
Module: check_mk
Branch: master
Commit: 3914084b81e990903423ad781956d85b05140785
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3914084b81e990…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 27 09:41:31 2017 +0100
4401 FIX Improved error handling in case of invalid autocheck entries
Change-Id: Ic2d4a69b1e1e9f3d8a3f77d4d8c840edccbfc87a
---
.werks/4401 | 11 +++++++++++
modules/discovery.py | 6 ++++++
2 files changed, 17 insertions(+)
diff --git a/.werks/4401 b/.werks/4401
new file mode 100644
index 0000000..b5966d5
--- /dev/null
+++ b/.werks/4401
@@ -0,0 +1,11 @@
+Title: Improved error handling in case of invalid autocheck entries
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1488184872
+
+
diff --git a/modules/discovery.py b/modules/discovery.py
index 9bad839..5af117b 100644
--- a/modules/discovery.py
+++ b/modules/discovery.py
@@ -1251,10 +1251,16 @@ def read_autochecks_of(hostname, world="config"):
if len(entry) == 4: # old format where hostname is at the first place
entry = entry[1:]
check_type, item, parameters = entry
+
# With Check_MK 1.2.7i3 items are now defined to be unicode strings. Convert
# items from existing autocheck files for compatibility. TODO remove this one day
if type(item) == str:
item = decode_incoming_string(item)
+
+ if type(check_type) not in (str, unicode):
+ raise MKGeneralException("Invalid entry '%r' in check table of host '%s': "
+ "The check type must be a string." % (entry, hostname))
+
autochecks.append((check_type, item, compute_check_parameters(hostname, check_type, item, parameters)))
return autochecks