[checkmk-commits] Check_MK Git: check_mk: Renamed all temperature services to Termperature %s

git version control git at mathias-kettner.de
Tue Aug 23 12:24:22 CEST 2011


Module: check_mk
Branch: master
Commit: 3811511ba880ccf0b2bb3c7e4726f8c949444f55
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3811511ba880ccf0b2bb3c7e4726f8c949444f55

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Tue Aug 23 12:24:17 2011 +0200

Renamed all temperature services to Termperature %s

Please carefully read the migration notes!

---

 .bugs/261                    |   11 ++++++++---
 ChangeLog                    |    2 ++
 checks/akcp_sensor_temp      |    2 +-
 checks/apc_symmetra_ext_temp |    2 +-
 checks/apc_symmetra_temp     |    2 +-
 checks/decru_temps           |    5 +++--
 checks/f5_bigip_temp         |    4 +---
 checks/fsc_temp              |    2 +-
 checks/hp_proliant_temp      |    2 +-
 checks/nvidia                |    2 +-
 checks/smart                 |    2 +-
 11 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.bugs/261 b/.bugs/261
index 28f9bb1..c98bab6 100644
--- a/.bugs/261
+++ b/.bugs/261
@@ -1,10 +1,11 @@
 Title: unifiy all temperature checks
 Component: checks
+State: done
+Class: cleanup
+Date: 2011-04-20 10:48:22
 Benefit: 2
-State: open
 Cost: 2
-Date: 2011-04-20 10:48:22
-Class: cleanup
+Fun: 0
 
 There are already a lot of temperature checks. *Each* of them
 uses a different scheme for the service description. Make
@@ -35,3 +36,7 @@ service_descriptions.update({
 
 That way people can decide what to do and new users get
 a clean environment.
+
+2011-08-23 12:23:53: changed state open -> done
+All checks have been renamed (except the generic sensor checks).
+Migration notes have been created.
diff --git a/ChangeLog b/ChangeLog
index e19caca..d7046cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@
       "Resttonerbehälter". You need to define snmp_character_encodings in main.mk
     * mem.win: new dedicated memory check for Windows (see Migration notes)
     * hr_mem: added Perf-O-Meter
+    * Renamed all temperature checks to "Temperature %s". Please
+      read the migration notes!
 
     MK Livestatus:
     * WaitObject: allow to separate host name and service with a semicolon.
diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp
index 0fdfa7c..3660f93 100644
--- a/checks/akcp_sensor_temp
+++ b/checks/akcp_sensor_temp
@@ -73,7 +73,7 @@ def check_akcp_sensor_temp(item, params, info):
     return (3, "UNKNOWN - Sensor not found")
 
 
-check_info['akcp_sensor_temp'] = ( check_akcp_sensor_temp, "Temperature Sensor - %s", 1, inventory_akcp_sensor_temp)
+check_info['akcp_sensor_temp'] = ( check_akcp_sensor_temp, "Temperature %s", 1, inventory_akcp_sensor_temp)
 
 snmp_info['akcp_sensor_temp'] = (
     ".1.3.6.1.4.1.3854.1.2.2.1.16.1", [
diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp
index 39e1ef6..0c86631 100644
--- a/checks/apc_symmetra_ext_temp
+++ b/checks/apc_symmetra_ext_temp
@@ -47,7 +47,7 @@ def check_temp(item, params, info):
 
 
 
-check_info['apc_symmetra_ext_temp'] = (check_temp, "APC External Temp %s", 1, inventory_temp)
+check_info['apc_symmetra_ext_temp'] = (check_temp, "Temperature External %s", 1, inventory_temp)
 snmp_info['apc_symmetra_ext_temp'] = (
   ".1.3.6.1.4.1.318.1.1.10.2.3.2.1",
   [ 1, 3, 4 ] )
diff --git a/checks/apc_symmetra_temp b/checks/apc_symmetra_temp
index 5365ec0..c56e3ac 100644
--- a/checks/apc_symmetra_temp
+++ b/checks/apc_symmetra_temp
@@ -67,6 +67,6 @@ def check_apc_temp(item, params, info):
 
     return (3, "UNKNOWN - sensor not found in SNMP data")
 
-check_info['apc_symmetra_temp'] = ( check_apc_temp, "%s", 1, inventory_apc_temp )
+check_info['apc_symmetra_temp'] = ( check_apc_temp, "Temperature %s", 1, inventory_apc_temp )
 snmp_info['apc_symmetra_temp'] = ( ".1.3.6.1.4.1.318.1.1.10.4.2.3.1", [ "3", "5" ] )
 snmp_scan_functions['apc_symmetra_temp'] = lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3")
diff --git a/checks/decru_temps b/checks/decru_temps
index ef81bf5..9b1a7d1 100644
--- a/checks/decru_temps
+++ b/checks/decru_temps
@@ -25,7 +25,8 @@
 # Boston, MA 02110-1301 USA.
 
 def inventory_decru_temps(info):
-    return [ (l[0], (int(to_celsius(int(l[1]))) + 4.0, int(to_celsius(int(l[1]))) + 8.0 ) ) for l in info ]
+    return [ (l[0], (int(to_celsius(int(l[1]))) + 4.0, 
+    int(to_celsius(int(l[1]))) + 8.0 ) ) for l in info ]
 
 def check_decru_temps(item, params, info):
     for temp in info:
@@ -43,7 +44,7 @@ def check_decru_temps(item, params, info):
 
     return (3, "UNKNOWN - sensor not found")
 
-check_info['decru_temps'] = (check_decru_temps, "TEMP %s", 1, inventory_decru_temps)
+check_info['decru_temps'] = (check_decru_temps, "Temperature %s", 1, inventory_decru_temps)
 
 snmp_info['decru_temps'] = ( ".1.3.6.1.4.1.12962.1.2.4.1", [ 2, 3 ] )
 snmp_scan_functions['decru_temps'] = \
diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp
index c2ab53b..50b4c68 100644
--- a/checks/f5_bigip_temp
+++ b/checks/f5_bigip_temp
@@ -36,8 +36,6 @@
 # 1.3.6.1.4.1.3375.2.1.3.1.2.1.2.1  54
 
 
-
-
 def f5_bigip_temp_genitem(info):
     sensors = []
     # parse all detected sensors and name them according to the mib section they came from.
@@ -91,7 +89,7 @@ snmp_info["f5_bigip_temp"] = \
       (  ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ]
 
 
-check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 0, inventory_f5_bigip_temp )
+check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "Temperature %s", 0, inventory_f5_bigip_temp )
 
 
 # Get ID and Speed from the CPU and chassis fan tables
diff --git a/checks/fsc_temp b/checks/fsc_temp
index 81fc622..bbcebc7 100644
--- a/checks/fsc_temp
+++ b/checks/fsc_temp
@@ -46,5 +46,5 @@ def check_fsc_temp(item, no_params, info):
 
     return (3, "UNKNOWN - Sensor %s not found in SNMP data" % item)
 
-check_info['fsc_temp'] = (check_fsc_temp, "FSC TEMP %s", 1,  inventory_fsc_temp)
+check_info['fsc_temp'] = (check_fsc_temp, "Temperature %s", 1,  inventory_fsc_temp)
 snmp_info['fsc_temp'] = ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] )
diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp
index a037701..8a30dcb 100644
--- a/checks/hp_proliant_temp
+++ b/checks/hp_proliant_temp
@@ -66,7 +66,7 @@ def check_hp_proliant_temp(item, params, info):
     return (3, "UNKNOWN - item not found in snmp data")
 
 
-check_info['hp_proliant_temp'] = (check_hp_proliant_temp, "HW Temp%s", 1,  inventory_hp_proliant_temp)
+check_info['hp_proliant_temp'] = (check_hp_proliant_temp, "Temperature %s", 1,  inventory_hp_proliant_temp)
 snmp_info['hp_proliant_temp']  = ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ "1", # cpqHeTemperatureChassis
                                                                    "2", # cpqHeTemperatureIndex
                                                                    "3", # cpqHeTemperatureLocale
diff --git a/checks/nvidia b/checks/nvidia
index c15da85..5b252ed 100644
--- a/checks/nvidia
+++ b/checks/nvidia
@@ -49,7 +49,7 @@ def check_nvidia_temp(item, params, info):
                 return (0, "OK" + infotext, perfdata)
     return (3, 'UNKNOWN - sensor not found in agent output')
 
-check_info['nvidia.temp'] =   ( check_nvidia_temp, "NVIDIA Temperature %s", 1, inventory_nvidia_temp )
+check_info['nvidia.temp'] =   ( check_nvidia_temp, "Temperature NVIDIA %s", 1, inventory_nvidia_temp )
 
 
 
diff --git a/checks/smart b/checks/smart
index bde2d6e..5c2a73a 100644
--- a/checks/smart
+++ b/checks/smart
@@ -138,4 +138,4 @@ def check_smart_temp(item, params, info):
 
 
 check_info['smart.stats'] = (check_smart_stats, "SMART %s Stats",       1, lambda info: inventory_smart("smart.stats", info))
-check_info['smart.temp']  = (check_smart_temp,  "SMART %s Temperature", 1, lambda info: inventory_smart("smart.temp", info))
+check_info['smart.temp']  = (check_smart_temp,  "Temperature SMART %s", 1, lambda info: inventory_smart("smart.temp", info))



More information about the checkmk-commits mailing list