Module: check_mk
Branch: master
Commit: 8ef5ba2b3a69aabcd1f76740e9990d6720dce1ae
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ef5ba2b3a69aa…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 23 16:22:22 2016 +0100
3343 FIX MKP: Verifying minimal version of packages during installation
The minimal required version of MKPs was only an informational field before
this change. Now the version is checked during installation of the MKPs. When
the package requires a newer version than you are currently using it refuses
the installation.
---
.werks/3343 | 13 +++++++++++++
ChangeLog | 1 +
2 files changed, 14 insertions(+)
diff --git a/.werks/3343 b/.werks/3343
new file mode 100644
index 0000000..03834f9
--- /dev/null
+++ b/.werks/3343
@@ -0,0 +1,13 @@
+Title: MKP: Verifying minimal version of packages during installation
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1458746476
+
+The minimal required version of MKPs was only an informational field before
+this change. Now the version is checked during installation of the MKPs. When
+the package requires a newer version than you are currently using it refuses
+the installation.
diff --git a/ChangeLog b/ChangeLog
index f8a3cc0..a5b987b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* 3286 FIX: Fixing possible logging issues when using datasource programs for monitoring...
* 3008 FIX: Fixed exception in logwatch config generation when using Nagios...
* 3105 FIX: fixed crash in cmk --dump for services containing non-ascii characters
+ * 3343 FIX: MKP: Verifying minimal version of packages during installation...
Checks & Agents:
* 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller
Module: check_mk
Branch: master
Commit: ff9267621ffd978e24f974e1a9fba3017d8071db
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff9267621ffd97…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 23 16:20:26 2016 +0100
3342 MKP: local/lib and local/bin of sites can now be packed
The MKP packages can now pack files located below local/lib and local/bin
of Check_MK sites.
When you are using a manual installation of Check_MK (setup.sh), the lib and
bin files shipped with MKP packages are not installed. You can also not pack
such files into MKPs.
---
.werks/3342 | 15 ++++++++
ChangeLog | 1 +
modules/check_mk.py | 4 ++
modules/check_mk_base.py | 19 ++++++++--
modules/packaging.py | 93 ++++++++++++++++++++++++++++++++++++++--------
web/htdocs/valuespec.py | 2 +-
6 files changed, 113 insertions(+), 21 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ff9267621f…
Module: check_mk
Branch: master
Commit: 69a2261629f1e474f954dca54d143521986d7587
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69a2261629f1e4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 22 16:03:03 2016 +0100
Updated a few labels to the correct new spelling
Conflicts:
web/htdocs/wato.py
---
web/htdocs/wato.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index cf18b05..e036031 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -367,12 +367,12 @@ def mode_folder(phase):
if not folder.locked_hosts() and config.may("wato.manage_hosts") and folder.may("write"):
html.context_button(_("New host"), folder.url([("mode", "newhost")]), "new")
html.context_button(_("New cluster"), folder.url([("mode", "newcluster")]), "new_cluster")
- html.context_button(_("Bulk Import"), folder.url([("mode", "bulk_import")]), "bulk_import")
+ html.context_button(_("Bulk import"), folder.url([("mode", "bulk_import")]), "bulk_import")
if config.may("wato.services"):
- html.context_button(_("Bulk Discovery"), folder.url([("mode", "bulkinventory"), ("all", "1")]),
+ html.context_button(_("Bulk discovery"), folder.url([("mode", "bulkinventory"), ("all", "1")]),
"inventory")
if config.may("wato.rename_hosts"):
- html.context_button(_("Bulk Renaming"), folder.url([("mode", "bulk_rename_host")]), "rename_host")
+ html.context_button(_("Bulk renaming"), folder.url([("mode", "bulk_rename_host")]), "rename_host")
if not folder.locked_hosts() and config.may("wato.parentscan") and folder.may("write"):
html.context_button(_("Parent scan"), folder.url([("mode", "parentscan"), ("all", "1")]),
"parentscan")
@@ -1222,9 +1222,9 @@ def mode_edit_host(phase, new, is_cluster):
if not Folder.current().locked_hosts():
if config.may("wato.rename_hosts"):
- html.context_button(is_cluster and _("Rename Cluster") or _("Rename Host"),
+ html.context_button(is_cluster and _("Rename cluster") or _("Rename host"),
folder_preserving_link([("mode", "rename_host"), ("host", hostname)]), "rename_host")
- html.context_button(is_cluster and _("Delete Cluster") or _("Delete Host"),
+ html.context_button(is_cluster and _("Delete cluster") or _("Delete host"),
html.makeactionuri([("delete", "1")]), "delete")
if not is_cluster:
@@ -1584,7 +1584,7 @@ def HostnameRenamingConfig():
ListOf(
HostnameRenaming(),
title = _("Renaming Operations"),
- add_label = _("Add Renaming"),
+ add_label = _("Add renaming"),
allow_empty = False,
)),
],
@@ -1996,8 +1996,7 @@ def render_renaming_actions(action_counts):
if what.startswith("dnsfail-"):
text = _("<b>WARNING: </b> the IP address lookup of <b>%s</b> has failed. The core has been "
"started by using the address <tt>0.0.0.0</tt> for the while. "
- "You will not be able to activate any changes until you have either updated your "
- "DNS or configure an explicit address for.") % what.split("-", 1)[1]
+ "Please update your DNS or configure an IP address for the affected host.") % what.split("-", 1)[1]
else:
text = action_titles.get(what, what)
if count > 1:
Module: check_mk
Branch: master
Commit: 907779d962448107deccb1e8f7aee09ebd5a5fc8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=907779d9624481…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Tue Mar 22 15:07:38 2016 +0100
3107 FIX heartbeat_crm: fixed incorrect timezone handling
The service "Heartbeat CRM General" calculated the status output age incorrectly, using comparing a
time in UTC to one in the local timezone of the server.
The fix required the addition of a conversion function to the check api.
---
.werks/3107 | 12 ++++++++++++
ChangeLog | 1 +
checks/heartbeat_crm | 2 +-
modules/check_mk_base.py | 5 +++++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/.werks/3107 b/.werks/3107
new file mode 100644
index 0000000..a0e50b3
--- /dev/null
+++ b/.werks/3107
@@ -0,0 +1,12 @@
+Title: heartbeat_crm: fixed incorrect timezone handling
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1458655464
+
+The service "Heartbeat CRM General" calculated the status output age incorrectly, using comparing a
+time in UTC to one in the local timezone of the server.
+The fix required the addition of a conversion function to the check api.
diff --git a/ChangeLog b/ChangeLog
index 6939861..6fb8537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,7 @@
* 3333 FIX: Predictive levels: Improved error handling in case no RRDs have been created yet
* 3317 FIX: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd
* 3305 FIX: cmciii.phase: fixed wrong datatype handling
+ * 3107 FIX: heartbeat_crm: fixed incorrect timezone handling...
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm
index 6ec009c..a12380e 100644
--- a/checks/heartbeat_crm
+++ b/checks/heartbeat_crm
@@ -152,7 +152,7 @@ def check_heartbeat_crm(item, params, info):
# Check the freshness of the crm_mon output and terminate with CRITICAL
# when too old information are found
- dt = time.mktime(time.strptime(last_updated, '%a %b %d %H:%M:%S %Y'))
+ dt = utc_mktime(time.strptime(last_updated, '%a %b %d %H:%M:%S %Y'))
now = time.time()
delta = now - dt
if delta > params['max_age']:
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 991338f..d6de68b 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -2053,6 +2053,11 @@ def ensure_directory(path):
return
raise
+# like time.mktime but assumes the time_struct to be in utc, not in local time.
+def utc_mktime(time_struct):
+ import calendar
+ return calendar.timegm(time_struct)
+
#.
# .--Check helpers-------------------------------------------------------.
# | ____ _ _ _ _ |