Module: check_mk
Branch: master
Commit: cfae83a8abdda6c552ba180a0e38d8daa7c89267
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfae83a8abdda6…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Aug 5 14:01:18 2016 +0200
added condition in case of dismounted dg in oracle_asm_diskgroup check
---
checks/oracle_asm_diskgroup | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup
index 9518b3d..c2516ab 100644
--- a/checks/oracle_asm_diskgroup
+++ b/checks/oracle_asm_diskgroup
@@ -28,6 +28,7 @@
# State Type Rebal Sector Block AU Total_MB Free_MB Req_mir_free_MB Usable_file_MB Offline_disks Voting_files Name
# MOUNTED NORMAL N 512 4096 1048576 512000 92888 0 46444 0 N DATA/
# MOUNTED NORMAL N 512 4096 1048576 3072 2146 309 918 0 Y OCR_VOTE/
+# DISMOUNTED N 0 0 0 0 0 0 0 0 N DB_DG1/
# The agent section <<<oracle_asm_diskgroup>>> does not output the header line
factory_settings["asm_diskgroup_default_levels"] = {
@@ -62,7 +63,8 @@ def check_oracle_asm_diskgroup(item, params, info):
if dg_name == item:
- if state == "DISMOUNTED":
+ # Indices are wrong: TYPE missing, only critical if block==0 (T.Bruhns)
+ if state == "DISMOUNTED" and line[3] == "0":
return 2, "Disk dismounted"
add_text = ""
Module: check_mk
Branch: master
Commit: 25ab24eb296e0beda63d6bbdb798b77acbaa7c46
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25ab24eb296e0b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 5 09:40:30 2016 +0200
3760 FIX Cluster nodes can not be nodes of their own anymore
---
.werks/3760 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 3 +++
3 files changed, 13 insertions(+)
diff --git a/.werks/3760 b/.werks/3760
new file mode 100644
index 0000000..92f1b23
--- /dev/null
+++ b/.werks/3760
@@ -0,0 +1,9 @@
+Title: Cluster nodes can not be nodes of their own anymore
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.4.0i1
+Date: 1470382816
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index e446c47..7dd4a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -530,6 +530,7 @@
* 3755 FIX: Preventing to insert non ASCII characters in host addresses now
* 3756 FIX: Bulk import: Fixed exception when host name contained special characters
* 3757 FIX: Bulk import: Ensuring non ASCII characters are not imported into regular attributes
+ * 3760 FIX: Cluster nodes can not be nodes of their own anymore
Notifications:
* 3263 Notifications: allow users to restrict by their contact groups...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ca8bb11..6e3277d 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1341,6 +1341,9 @@ def action_edit_host(mode, hostname, is_cluster):
if len(cluster_nodes) < 1:
raise MKUserError("nodes_0", _("The cluster must have at least one node"))
for nr, cluster_node in enumerate(cluster_nodes):
+ if cluster_node == hostname:
+ raise MKUserError("nodes_%d" % nr, _("The cluster can not be a node of it's own"))
+
if not Host.host_exists(cluster_node):
raise MKUserError("nodes_%d" % nr, _("The node <b>%s</b> does not exist "
" (must be a host that is configured with WATO)") % cluster_node)
Module: check_mk
Branch: master
Commit: c5c20cc1fa6159bc1af77e98854cadfef2b0fe75
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5c20cc1fa6159…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 5 09:21:07 2016 +0200
3759 FIX cpu.loads: Fixed possible crash on missing data
---
.werks/3759 | 10 ++++++++++
ChangeLog | 1 +
checks/cpu | 3 +++
3 files changed, 14 insertions(+)
diff --git a/.werks/3759 b/.werks/3759
new file mode 100644
index 0000000..e7a6505
--- /dev/null
+++ b/.werks/3759
@@ -0,0 +1,10 @@
+Title: cpu.loads: Fixed possible crash on missing data
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i1
+Date: 1470381652
+
+
diff --git a/ChangeLog b/ChangeLog
index 39c6194..e446c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -325,6 +325,7 @@
* 3742 FIX: ps: Fixed broken averaging...
* 3711 FIX: ipmi: fixed wrong status handling if sensor status is ok but failures detected
* 3734 FIX: esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing
+ * 3759 FIX: cpu.loads: Fixed possible crash on missing data
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/cpu b/checks/cpu
index a72a7d3..fbdd07b 100644
--- a/checks/cpu
+++ b/checks/cpu
@@ -46,6 +46,9 @@ def inventory_cpu_load(info):
def check_cpu_load(item, params, info):
+ if not info:
+ return
+
if len(info[0]) >= 6:
# There have been broken AIX agents for a long time which produced data like follows.
# Newer agents deal with this, but to be nice to old agents: deal with it.
