Module: check_mk
Branch: master
Commit: 5c0723f794ac87199d21b61b6712083248bee84b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0723f794ac87…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Jun 24 14:54:59 2015 +0200
#2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes
These new checks provide information for
<ul>
<li>Director disks IO throughput and latency</li>
<li>Directors frontend and backend interface statistics</li>
<li>Directors CPU utilization</li>
<li>Volume IO throughput and latency</li>
</ul>
Note: The EMC VPLEX devices currently do not provide a SysDescr OID, which is
considered as a bug. If you want to discover these checks you need to configure
these hosts with the rule <i>"Hosts without system description OID"</i> (snmp_without_sys_descr).
Otherwise these hosts will fail at the start of the service discovery.
---
.werks/2312 | 26 +++++++++
ChangeLog | 3 +
checkman/emc_vplex_cpu | 20 +++++++
checkman/emc_vplex_director_stats | 48 ++++++++++++++++
checkman/emc_vplex_if | 29 ++++++++++
checkman/emc_vplex_volumes | 42 ++++++++++++++
checks/emc_vplex_cpu | 51 +++++++++++++++++
checks/emc_vplex_director_stats | 95 +++++++++++++++++++++++++++++++
checks/emc_vplex_if | 104 ++++++++++++++++++++++++++++++++++
checks/emc_vplex_volumes | 94 ++++++++++++++++++++++++++++++
web/plugins/metrics/check_mk.py | 17 ++++++
web/plugins/wato/check_parameters.py | 14 +++++
12 files changed, 543 insertions(+)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c0723f794…
Module: check_mk
Branch: master
Commit: 56ffe9fadc695f79a92abcadd7a449360fb2b88d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56ffe9fadc695f…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Jun 23 16:13:56 2015 +0200
added documentation about new colors for metric_info in metrics/check_mk.py and edited function parse_color_into_hexrgb in htdocs/metrics.py
---
web/htdocs/metrics.py | 22 ++++++++++++++--------
web/plugins/metrics/check_mk.py | 19 +++++++++++++++----
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py
index e6ba3e7..fce0a6a 100644
--- a/web/htdocs/metrics.py
+++ b/web/htdocs/metrics.py
@@ -201,14 +201,20 @@ def parse_color_into_hexrgb(color_string):
elif "/" in color_string:
cmk_color_index, color_shading = color_string.split("/")
hsv = list(cmk_color_palette[cmk_color_index])
- if color_shading == 'a':
- hsv[2] *= 0.6
- elif color_shading == 'b':
- hsv[2] *= 0.8
- elif color_shading == 'd':
- hsv[1] *= 0.8
- elif color_shading == 'e':
- hsv[1] *= 0.6
+
+ # Colors of the yellow ("2") and green ("3") area need to be darkened (in third place of the hsv tuple),
+ # colors of the red and blue area need to be brightened (in second place of the hsv tuple).
+ # For both shadings we need different factors.
+ cmk_color_nuance_index = 1
+ cmk_color_nuance_factor = 0.6
+
+ if cmk_color_index[0] in ["2", "3"]:
+ cmk_color_nuance_index = 2
+ cmk_color_nuance_factor = 0.8
+
+ if color_shading == 'b':
+ hsv[cmk_color_nuance_index] *= cmk_color_nuance_factor
+
color_hexrgb = hsv_to_hexrgb(hsv)
return color_hexrgb
else:
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index 444e321..c9a0f55 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -178,7 +178,7 @@ unit_info["db"] = {
# Title are always lower case - except the first character!
-# colors:
+# Colors:
#
# red
# magenta orange
@@ -190,11 +190,22 @@ unit_info["db"] = {
# 42 25
# 41 26
# 36 35 34 33 32 31
-# cyan chartreuse
+# cyan yellow-green
# green
#
-# "color" : "23/a" basic color
-# "color" : "23/b" nuance of color
+# Special colors:
+# 51 gray
+# 52 brown 1
+# 53 brown 2
+#
+# For a new metric_info you have to choose a color. No more hex-codes are needed!
+# Instead you can choose a number of the above color ring and a letter 'a' or 'b
+# where 'a' represents the basic color and 'b' is a nuance/shading of the basic color.
+# Both number and letter must be declared!
+#
+# Example:
+# "color" : "23/a" (basic color yellow)
+# "color" : "23/b" (nuance of color yellow)
metric_info["rta"] = {
"title" : _("Round trip average"),
added support for missing files
Message-ID: <55895641.8IkelepYFp3b4AyN%mk(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: fe994888ca658df8bc8326d776202d0d04ce30eb
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe994888ca658d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 23 14:50:59 2015 +0200
#1906: FIX: oracle_recovery_status: added support for missing files
---
.werks/1906 | 11 +++++++++++
ChangeLog | 1 +
checkman/oracle_recovery_status | 4 ++++
checks/oracle_recovery_status | 22 ++++++++++++++++------
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/.werks/1906 b/.werks/1906
new file mode 100644
index 0000000..da8eadb
--- /dev/null
+++ b/.werks/1906
@@ -0,0 +1,11 @@
+Title: oracle_recovery_status: added support for missing files
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i2
+Date: 1434707027
+Class: fix
+
+The check results in UNKNOWN state when a database has a missing
+datafile. The Check creates a CRIT with '1 missing datafiles(!!)'.
+
diff --git a/ChangeLog b/ChangeLog
index a39e018..aa4b993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
* 2221 FIX: cisco_temperature: Fixed order of device levels for some devices...
* 2329 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device
* 2355 FIX: docsis_channels_upstream: Fix graph definitions
+ * 1906 FIX: oracle_recovery_status: added support for missing files...
* 2311 FIX: windows agent: now replaces BOM (byte order marks) from local and plugin scripts...
* 2357 FIX: livestatus_status: no not alarm switched off host freshness nor event handlers on CMC <= 1.2.6...
diff --git a/checkman/oracle_recovery_status b/checkman/oracle_recovery_status
index bc2ffbc..7e7b26b 100644
--- a/checkman/oracle_recovery_status
+++ b/checkman/oracle_recovery_status
@@ -14,6 +14,10 @@ description:
Primary and Standby Database. Primary will only create WARNINGs, when
the level of levels is exceeded. A value for CRITICAL is only usable
when the Database is in Physical Standby Mode.
+ The check for 'missing files' detects missing files in the control file
+ of the database. The Check results in a CRIT state when more the 0
+ files are missing. This is possible in physical stanbdy Environments
+ after an error while creating a new datafile.
The 2nd function is the monitoring of datafiles in manual backup mode.
This is important for database which are backed up with 'alter database
diff --git a/checks/oracle_recovery_status b/checks/oracle_recovery_status
index b1482e2..30a2d4b 100644
--- a/checks/oracle_recovery_status
+++ b/checks/oracle_recovery_status
@@ -41,6 +41,7 @@ def inventory_oracle_recovery_status(info):
def check_oracle_recovery_status(item, params, info):
state = 0
offlinecount = 0
+ filemissingcount = 0
oldest_checkpoint_age = None
oldest_backup_age = -1
@@ -73,12 +74,16 @@ def check_oracle_recovery_status(item, params, info):
oldest_backup_age = max(int(backup_age), oldest_backup_age)
if datafilestatus == 'ONLINE':
- checkpoint_age = int(checkpoint_age)
-
- if oldest_checkpoint_age is None:
- oldest_checkpoint_age = checkpoint_age
+ if backup_state == 'FILE MISSING':
+ filemissingcount += 1
else:
- oldest_checkpoint_age = max(oldest_checkpoint_age, checkpoint_age)
+ checkpoint_age = int(checkpoint_age)
+
+ if oldest_checkpoint_age is None:
+ oldest_checkpoint_age = checkpoint_age
+ else:
+ oldest_checkpoint_age = max(oldest_checkpoint_age, checkpoint_age)
+
else:
offlinecount += 1
@@ -93,7 +98,7 @@ def check_oracle_recovery_status(item, params, info):
# we found a negative time for last checkpoint
infotext += ", oldest checkpoint is in the future %s(!), check the time on the server" \
% get_age_human_readable(int(oldest_checkpoint_age)*-1)
- state = 1
+ state = max(state, 1)
else:
infotext += ", oldest Checkpoint %s ago" \
@@ -133,6 +138,11 @@ def check_oracle_recovery_status(item, params, info):
% (offlinecount)
state = 2
+ if filemissingcount > 0:
+ infotext += " %i missing datafiles(!!)" \
+ % (filemissingcount)
+ state = 2
+
if oldest_backup_age > 0:
infotext += " %i datafiles in backup mode oldest is %s" % ( \
backup_count, get_age_human_readable(oldest_backup_age))
Module: check_mk
Branch: master
Commit: fa40880161ca8615e3fd07bbeb4f66c828de33c7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa40880161ca86…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 23 13:35:45 2015 +0200
#2357 FIX livestatus_status: no not alarm switched off host freshness nor event handlers on CMC <= 1.2.6
CMC version 1.2.6 did not have event handlers. So they are always switched
off. The check will no longer warn about this. Host freshness checking is
turned off per default in OMD based installations for the Nagios core. Per
default alerting this also has been disabled.
---
.werks/2357 | 12 ++++++++++++
ChangeLog | 1 +
checks/livestatus_status | 9 +++++++--
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/.werks/2357 b/.werks/2357
new file mode 100644
index 0000000..7dca19e
--- /dev/null
+++ b/.werks/2357
@@ -0,0 +1,12 @@
+Title: livestatus_status: no not alarm switched off host freshness nor event handlers on CMC <= 1.2.6
+Level: 2
+Component: checks
+Compatible: compat
+Version: 1.2.7i2
+Date: 1435059274
+Class: fix
+
+CMC version 1.2.6 did not have event handlers. So they are always switched
+off. The check will no longer warn about this. Host freshness checking is
+turned off per default in OMD based installations for the Nagios core. Per
+default alerting this also has been disabled.
diff --git a/ChangeLog b/ChangeLog
index c68a070..041dc6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
* 2221 FIX: cisco_temperature: Fixed order of device levels for some devices...
* 2329 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device
* 2355 FIX: docsis_channels_upstream: Fix graph definitions
+ * 2357 FIX: livestatus_status: no not alarm switched off host freshness nor event handlers on CMC <= 1.2.6...
Multisite:
* 2260 Improved load time of Check_MK GUI...
diff --git a/checks/livestatus_status b/checks/livestatus_status
index 50d5d5f..624e41c 100644
--- a/checks/livestatus_status
+++ b/checks/livestatus_status
@@ -37,8 +37,8 @@ factory_settings["livestatus_status_default_levels"] = {
"execute_service_checks" : 2,
"accept_passive_host_checks" : 2,
"accept_passive_service_checks" : 2,
- "check_host_freshness" : 2,
- "check_service_freshness" : 2,
+ "check_host_freshness" : 0, # Was in OMD the default up to now, better not warn
+ "check_service_freshness" : 1,
"enable_event_handlers" : 1,
"enable_flap_detection" : 1,
"enable_notifications" : 2,
@@ -100,6 +100,11 @@ def check_livestatus_status(item, params, parsed):
yield 0, "Core version: %s" % status["program_version"]
yield 0, "Livestatus version: %s" % status["livestatus_version"]
+ # In CMC <= 1.2.6 event handlers cannot be enabled. So never
+ # warn.
+ if status["program_version"].startswith("Check_MK 1.2.6"):
+ params["enable_event_handlers"] = 0
+
settings = [
("execute_host_checks", "Active host checks are disabled"),
("execute_service_checks", "Active service checks are disabled"),
Module: check_mk
Branch: master
Commit: 5c485bc31b00f2be385d6c96117cdb30a7814c92
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c485bc31b00f2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jun 23 10:25:04 2015 +0200
When a plugin produces output containing latin-1 encoded characters, these are transparently
handled by the core and forwarded to the notification engine. The notifications are already
sent out correctly, but the RBN configuration dialog was not able to display these notifications
when using the <i>Analyse</i> function. This lead to exceptions.
The GUI has now been fixed to also support latin-1 encoded notification information.
However, better write your plugins to output UTF-8 encoded characters.
Conflicts:
ChangeLog
modules/notify.py
web/htdocs/wato.py
---
.werks/2343 | 17 +++++++++
ChangeLog | 3 ++
modules/notify.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++-
web/htdocs/wato.py | 49 ++++++++++++++++----------
4 files changed, 148 insertions(+), 19 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c485bc31b…