Module: check_mk
Branch: master
Commit: 39c1d17468af295161ef8f6bc411308fa8b53d38
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39c1d17468af29…
Author: Lutz Helwing <lh(a)mathias-kettner.de>
Date: Thu Feb 5 12:13:10 2015 +0100
#1961 akcp_exp_humidity, akcp_exp_smoke, akcp_exp_temp, akcp_exp_water: New checks to monitor AKCP securityProbe and expansion boards
Until now Check MK was only able to monitor sensors on the securityProbe monitoring board
which were directly connected to it. Albeit the number of sensors can be increased by daisy
chaining expansion boards to the securityProbe base board.
The new akcp_exp_* checks are designed for this setup.
AKCP sensorProbe boards or securityProbes with no expansion boards connected to them
are still handled by the akcp_sensor_* checks.
---
.werks/1961 | 16 ++++++++++++++++
ChangeLog | 1 +
2 files changed, 17 insertions(+)
diff --git a/.werks/1961 b/.werks/1961
new file mode 100644
index 0000000..c86d4fa
--- /dev/null
+++ b/.werks/1961
@@ -0,0 +1,16 @@
+Title: akcp_exp_humidity, akcp_exp_smoke, akcp_exp_temp, akcp_exp_water: New checks to monitor AKCP securityProbe and expansion boards
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i1
+Date: 1423134463
+Class: feature
+
+
+Until now Check MK was only able to monitor sensors on the securityProbe monitoring board
+which were directly connected to it. Albeit the number of sensors can be increased by daisy
+chaining expansion boards to the securityProbe base board.
+The new akcp_exp_* checks are designed for this setup.
+
+AKCP sensorProbe boards or securityProbes with no expansion boards connected to them
+are still handled by the akcp_sensor_* checks.
diff --git a/ChangeLog b/ChangeLog
index 1413523..9776c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,7 @@
* 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)...
* 1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown'...
* 1860 df and other filesystem checks: process total fs size as perfdata...
+ * 1961 akcp_exp_humidity, akcp_exp_smoke, akcp_exp_temp, akcp_exp_water: New checks to monitor AKCP securityProbe and expansion boards...
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
Module: check_mk
Branch: master
Commit: 0d8b18ebc9d1a0ae265f350c9a4f6efc8833f8a9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d8b18ebc9d1a0…
Author: Lutz Helwing <lh(a)mathias-kettner.de>
Date: Thu Feb 5 11:58:17 2015 +0100
changed humidity default_values to defaultvalues to maintain compatibilty
---
checks/akcp_exp_humidity | 2 +-
checks/akcp_sensor.include | 6 ++++--
checks/akcp_sensor_humidity | 5 -----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/checks/akcp_exp_humidity b/checks/akcp_exp_humidity
index 37730aa..f6a6463 100644
--- a/checks/akcp_exp_humidity
+++ b/checks/akcp_exp_humidity
@@ -32,7 +32,7 @@
check_info["akcp_exp_humidity"] = {
"check_function" : check_akcp_sensor_humidity,
"inventory_function" : lambda info: inventory_akcp_sensor(info, \
- "akcp_humidity_default_levels"),
+ "akcp_humidity_defaultlevels"),
"service_description" : "Humidity %s",
"has_perfdata" : True,
"snmp_scan_function" : snmp_scan_akcp_exp,
diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include
index 5fff713..eee5fd4 100644
--- a/checks/akcp_sensor.include
+++ b/checks/akcp_sensor.include
@@ -25,8 +25,10 @@
# Boston, MA 02110-1301 USA.
-# These values were specified in the original check
-akcp_humidity_default_levels = (35, 40, 60, 65)
+# These values were determined by the author of the original check
+# akcp_sensor_humidity
+# This variable does not compy to the check guidelines. This has to be fixed one day.
+akcp_humidity_defaultlevels = (35, 40, 60, 65)
factory_settings["akcp_temp_default_levels"] = {
diff --git a/checks/akcp_sensor_humidity b/checks/akcp_sensor_humidity
index 17c6d14..50d6928 100644
--- a/checks/akcp_sensor_humidity
+++ b/checks/akcp_sensor_humidity
@@ -25,11 +25,6 @@
# Boston, MA 02110-1301 USA.
-# This variable exists to maintain compatibility with already installed checks.
-# When this check gets reworked some day we shall use the guideline-compliant
-# akcp_humidity_default_levels variable from akcp_sensor.include instead.
-akcp_sensor_humidity_defaultlevels = (35, 40, 60, 65)
-
# Example for contents of info
# description percent status online
# ["Humdity1 Description", "0", "0", "2"]
Service description prefix changed from "Device" to "Dry Contact"
Message-ID: <54d350ad.oJgMoRsqXs678dQ1%lh(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: 0c13780d805f49c57c359265749b5d8f075eeadd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c13780d805f49…
Author: Lutz Helwing <lh(a)mathias-kettner.de>
Date: Thu Feb 5 12:07:32 2015 +0100
#1960 FIX akcp_sensor_drycontact: Service description prefix changed from "Device" to "Dry Contact"
The service description of the akcp_sensor_drycontact check has changed from "Device" to
"Dry Contact" which describes more accurately what the service is.
Beware! This is an incompatible change which means that the check has to be re-inventoried.
---
.werks/1960 | 11 +++++++++++
ChangeLog | 2 ++
2 files changed, 13 insertions(+)
diff --git a/.werks/1960 b/.werks/1960
new file mode 100644
index 0000000..943ddf1
--- /dev/null
+++ b/.werks/1960
@@ -0,0 +1,11 @@
+Title: akcp_sensor_drycontact: Service description prefix changed from "Device" to "Dry Contact"
+Level: 1
+Component: checks
+Compatible: incomp
+Version: 1.2.7i1
+Date: 1423134033
+Class: fix
+
+The service description of the akcp_sensor_drycontact check has changed from "Device" to
+"Dry Contact" which describes more accurately what the service is.
+Beware! This is an incompatible change which means that the check has to be re-inventoried.
diff --git a/ChangeLog b/ChangeLog
index 47cb51b..1413523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -142,6 +142,8 @@
* 1931 FIX: agent_vsphere: no longer crashes when host has no license information
* 1932 FIX: check_http: Check SSL Certificate: did not work when SNI Option was set...
* 1975 FIX: check_bi_aggr: Ignoring proxy settings from environment now
+ * 1960 FIX: akcp_sensor_drycontact: Service description prefix changed from "Device" to "Dry Contact"...
+ NOTE: Please refer to the migration notes!
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
Module: check_mk
Branch: master
Commit: 2e9195f2143b7d21262963d57b28e18516caaeac
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e9195f2143b7d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 5 10:26:31 2015 +0100
Fixed some english texts
Conflicts:
web/plugins/wato/check_parameters.py
---
web/htdocs/wato.py | 2 +-
web/plugins/wato/check_parameters.py | 6 +++---
web/plugins/wato/datasource_programs.py | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index dd4eae3..858ec79 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -18706,7 +18706,7 @@ def load_plugins():
config.declare_permission("wato.notifications",
_("Notification configuration"),
- _("This permission is needed for the new rule based notification configuration via the WATO module <i>Notifications</i>.</b>"),
+ _("This permission is needed for the new rule based notification configuration via the WATO module <i>Notifications</i>."),
[ "admin", ])
config.declare_permission("wato.snapshots",
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index aa8223f..bff87cf 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -4943,8 +4943,8 @@ register_rule(
"description. The UUID will be displayed in the pluging output."))
),
],
- help = _("This rule controls if the UUID or alias is used in the service description during "
- "inventory of Multipath devices on Linux."),
+ help = _("This rule controls wether the UUID or the alias is used in the service description during "
+ "discovery of Multipath devices on Linux."),
),
match = 'dict',
)
@@ -5879,7 +5879,7 @@ register_check_parameters(
title = _("Temperature Trend Analysis"),
help = _("This rule enables and configures a trend analysis and corresponding limits for devices, "
"which have their own limits configured on the device. It will only work for supported "
- "checks, right now the adva_fsp_temp check"),
+ "checks, right now the <tt>adva_fsp_temp</tt> check"),
elements = [
( "trend_range",
Optional(
diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py
index 79ba744..4da6710 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -197,12 +197,12 @@ register_rule(group,
optional_keys = False
),
title = _("Check NetApp via WebAPI"),
- help = _("This rule selects the NetApp agent instead of the normal Check_MK Agent "
+ help = _("This rule selects the NetApp special agent instead of the normal Check_MK Agent "
"and allows monitoring via the NetApp API. Right now only <i>7-Mode</i> is supported, "
- "<i>Cluster Mode</i> is following soon. Important: To make this special agent NetApp work "
- "you will have to provide two additional python files (NaServer.py, NaElement.py) "
+ "<i>Cluster Mode</i> will follow soon. Important: To make this special agent NetApp work "
+ "you will have to provide two additional python files (<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) "
"from the NetApp Manageability SDK. They need to be put into the site directory "
- "<tt>~/local/lib/python</tt>. The user requires a number of permissions for specific API classes. "
+ "into <tt>~/local/lib/python</tt>. The user requires a number of permissions for specific API classes. "
"They are displayed if you call the agent with <tt>agent_netapp --help</tt>. The agent itself "
"is located in the site directory under <tt>~/share/check_mk/agents/special</tt>."),
match = 'first')