Module: check_mk
Branch: master
Commit: c4b5f09d8b6f3bec97b453aa29f5fe9100c3f5a7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b5f09d8b6f3b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 14:50:14 2014 +0100
The RPM and DEB package of the Check_MK agent are now shipped with the regular package
of Check_MK. For example in OMD environments, they are located in <tt>share/check_mk/agents</tt>.
---
.werks/1759 | 11 +++++++++++
ChangeLog | 3 +++
2 files changed, 14 insertions(+)
diff --git a/.werks/1759 b/.werks/1759
new file mode 100644
index 0000000..0161274
--- /dev/null
+++ b/.werks/1759
@@ -0,0 +1,11 @@
+Title: Packed RPM and DEB agent packages are now shipped with normal Check_MK package
+Level: 1
+Component: core
+Class: feature
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1418305715
+
+The RPM and DEB package of the Check_MK agent are now shipped with the regular package
+of Check_MK. For example in OMD environments, they are located in <tt>share/check_mk/agents</tt>.
diff --git a/ChangeLog b/ChangeLog
index 77b0a5e..556b3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.2.7i1:
+ Core & Setup:
+ * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package...
+
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
Module: check_mk
Branch: master
Commit: 85a87c41a05e1c441210e116a159c9800978f7b6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85a87c41a05e1c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 11 12:33:01 2014 +0100
New generic temperature ruleset, not yet in use
---
web/plugins/wato/check_parameters.py | 75 +++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 1 deletion(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 95d3b0c..1ee4798 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -4918,6 +4918,79 @@ register_check_parameters(
None
)
+
+# New temperature rule for modern temperature checks that have the
+# sensor type (e.g. "CPU", "Chassis", etc.) as the beginning of their
+# item (e.g. "CPU 1", "Chassis 17/11"). This will replace all other
+# temperature rulesets in future. Note: those few temperature checks
+# that do *not* use an item, need to be converted to use one single
+# item (other than None).
+register_check_parameters(
+ subgroup_environment,
+ "temperature",
+ _("Temperature"),
+ Transform(
+ Dictionary(
+ elements = [
+ ( "levels",
+ Tuple(
+ title = _("Upper Temperature Levels"),
+ elements = [
+ Integer(title = _("warning at"), unit = u"°C", default_value = 26),
+ Integer(title = _("critical at"), unit = u"°C", default_value = 30),
+ ]
+ )),
+ ( "levels_lower",
+ Tuple(
+ title = _("Lower Temperature Levels"),
+ elements = [
+ Integer(title = _("warning at"), unit = u"°C", default_value = 0),
+ Integer(title = _("critical at"), unit = u"°C", default_value = -10),
+ ]
+ )),
+ ( "output_unit",
+ DropdownChoice(
+ title = _("Display values in "),
+ choices = [
+ ( "c", _("Celsius") ),
+ ( "f", _("Fahrenheit") ),
+ ( "k", _("Kelvin") ),
+ ]
+ )),
+ ## ( "input_unit",
+ ## DropdownChoice(
+ ## title = _("Override unit of sensor"),
+ ## help = _("In some rare cases the unit that is signalled by the sensor "
+ ## "is wrong and e.g. the sensor sends values in Fahrenheit while "
+ ## "they are misinterpreted as Celsius. With this setting you can "
+ ## "force the reading of the sensor to be interpreted as customized. "),
+ ## choices = [
+ ## ( "c", _("Celsius") ),
+ ## ( "f", _("Fahrenheit") ),
+ ## ( "k", _("Kelvin") ),
+ ## ]
+ ## )),
+ ## ( "sensor_levels",
+ ## DropdownChoice(
+ ## title = _("Interpretation of Sensor's own temperature status"),
+ ## choices = [
+ ## ( "ignore", _("Ignore sensor's own levels") ),
+ ## ( "sensor", _("Only use sensor's levels, ignore yours" ) ),
+ ## ( "best", _("Use least critical of your and sensor's levels") ),
+ ## ( "worst", _("Use most critical of your and sensor's levels") ),
+ ## ]
+ ## )),
+
+ ]
+ ),
+ forth = lambda v: type(v) == tuple and { "levels" : v } or v,
+ ),
+ TextAscii(
+ title = _("Sensor ID"),
+ help = _("The identifier of the thermal sensor.")),
+ "dict",
+)
+
register_check_parameters(
subgroup_environment,
"room_temperature",
@@ -4932,7 +5005,7 @@ register_check_parameters(
]),
TextAscii(
title = _("Sensor ID"),
- help = _("The identifier of the themal sensor.")),
+ help = _("The identifier of the thermal sensor.")),
"first"
)