Module: check_mk
Branch: master
Commit: b689fde9a7a0b9f9c405024df566b7be05149d0f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b689fde9a7a0b9…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Mar 21 15:17:52 2014 +0100
removed unused var
---
web/htdocs/wato.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 97cac3e..f27ac12 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -13146,7 +13146,6 @@ def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list,
if not hostname_match:
reasons.append(_("The host name does not match."))
- tags_match = True
for tag in tag_specs:
if tag[0] != '/' and tag[0] != '!' and tag not in host[".tags"]:
reasons.append(_("The host is missing the tag %s" % tag))
Module: check_mk
Branch: master
Commit: b993f5f39a744a123d7abd9f7f963af9622f4b48
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b993f5f39a744a…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Mar 21 14:33:34 2014 +0100
apc_symmetra: Changed naming of Batterie Temperature to System Temerature
Corse of a wrong naming in the APC MIB, the value AdvBatteryTemperature shows not the Battery Temperature but the System Temperature.
Cause of the renaming also the name of the Performance value changed from battemp to systemp. If you don't want to loose that graph, you have to migrate
the file to ne new name.
---
.werks/145 | 13 +++++++++++++
ChangeLog | 2 ++
checkman/enterasys_cpu_util | 2 +-
checks/apc_symmetra | 11 ++++++-----
web/plugins/wato/check_parameters.py | 6 +++---
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/.werks/145 b/.werks/145
new file mode 100644
index 0000000..45ffff0
--- /dev/null
+++ b/.werks/145
@@ -0,0 +1,13 @@
+Title: apc_symmetra: Changed naming of Batterie Temperature to System Temerature
+Level: 1
+Component: checks
+Version: 1.2.5i1
+Date: 1395408589
+Class: incomp
+
+Corse of a wrong naming in the APC MIB, the value AdvBatteryTemperature shows not the Battery Temperature but the System Temperature.
+Cause of the renaming also the name of the Performance value changed from battemp to systemp. If you don't want to loose that graph, you have to migrate
+the file to ne new name.
+
+
+
diff --git a/ChangeLog b/ChangeLog
index 56ced6a..a7e81a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,6 +121,8 @@
* 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption...
* 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC
* 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers
+ * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature...
+ NOTE: Please refer to the migration notes!
* 0103 FIX: services: Fixed bug with service inventory defined in main.mk...
* 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
diff --git a/checkman/enterasys_cpu_util b/checkman/enterasys_cpu_util
index 184d140..b8c19fe 100644
--- a/checkman/enterasys_cpu_util
+++ b/checkman/enterasys_cpu_util
@@ -4,7 +4,7 @@ catalog: hw/network/enterasys
license: GPL
distribution: check_mk
description:
- This check shows the current cpu utilization of a casa module
+ This check shows the current average cpu utilization of all plugged-in CPU modules.
inventory:
diff --git a/checks/apc_symmetra b/checks/apc_symmetra
index aa56584..7570ef5 100644
--- a/checks/apc_symmetra
+++ b/checks/apc_symmetra
@@ -91,7 +91,7 @@ def check_apc(item, params, info):
params = { "levels": params }
# new format with up to 6 params in dict
- crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params['levels']
+ crit_capacity, crit_sys_temp, crit_batt_curr, crit_voltage = params['levels']
if params.get("post_calibration_levels"):
delay_after_test = params['post_calibration_levels']['additional_time_span']
alt_crit_capacity = params['post_calibration_levels']['altcapacity']
@@ -146,14 +146,15 @@ def check_apc(item, params, info):
single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) )
- # 4. Check battery temperature
- infotxt = "bat. temp. %dC" % AdvBatteryTemperature
- if AdvBatteryTemperature >= crit_batt_temp:
+ # 4. Check System temperature
+ # The Name AdvBatteryTemperature is a wrong naming in the vendor mib.
+ infotxt = "sys. temp. %dC" % AdvBatteryTemperature
+ if AdvBatteryTemperature >= crit_sys_temp:
state = 2
infotxt += "(!!)"
else:
state = 0
- single_states.append( (state, infotxt, ("battemp", AdvBatteryTemperature, "", crit_batt_temp) ) )
+ single_states.append( (state, infotxt, ("systemp", AdvBatteryTemperature, "", crit_sys_temp) ) )
# 5. Check battery current
infotxt = "bat. curr. %dA" % AdvBatteryCurrent
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index ce53f00..672927d 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -3899,10 +3899,10 @@ register_check_parameters(
unit = "%", default_value = 95,
),
Integer(
- title = _("Critical Battery Temperature"),
- help = _("The critical temperature of the battery"),
+ title = _("Critical System Temperature"),
+ help = _("The critical temperature of the System"),
unit = _("C"),
- default_value = 40,
+ default_value = 55,
),
Integer(
title = _("Critical Battery Current"),