[arista]: Unify labels for Arista sensors (sonic-net#1216)

stcheng · Dec 8, 2017 · 5ca798d · 5ca798d
1 parent 6feff95
commit 5ca798d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/device/arista/x86_64-arista_7050_qx32/sensors.conf b/device/arista/x86_64-arista_7050_qx32/sensors.conf
@@ -12,38 +12,38 @@ chip "k10temp-pci-00c3"
     label temp1 "Cpu temp sensor"
 
 chip "lm73-i2c-3-48"
-    label temp1 "Rear Temp Sensor"
+    label temp1 "Back panel temp sensor"
     set temp1_max 65
     #set temp1_max_alarm 75 # read-only
 
 chip "max6658-i2c-2-4c"
-    label temp1 "Board Temp Sensor"
+    label temp1 "Board temp sensor"
     set temp1_max 65
     set temp1_crit 75
 
-    label temp2 "Front-panel Temp Sensor"
+    label temp2 "Front panel temp sensor"
     set temp2_max 65
     set temp2_crit 75
 
 # disabled because of some eeprom corruption risks
 #chip "pmbus-i2c-3-4e"
-#    label temp1 "Power Controller Sensor 1"
+#    label temp1 "Power controller sensor 1"
 #    set temp1_max 60
 #    set temp1_crit 70
 
-#    label temp2 "Power Controller Sensor 2"
+#    label temp2 "Power controller sensor 2"
 #    set temp2_max 60
 #    set temp2_crit 70
 
 #    ignore curr1
 
 chip "dps460-i2c-5-58"
-    label temp1 "Power Supply 1 Sensor 1"
+    label temp1 "Power supply 1 inlet temp sensor"
     # maximum and critical thresholds are not supported for this psu
     set temp1_max 60
     set temp1_crit 70
 
-    label temp2 "Power Supply 1 Sensor 2"
+    label temp2 "Power supply 1 internal sensor"
     set temp2_max 60
     set temp2_crit 70
 
@@ -60,12 +60,12 @@ chip "dps460-i2c-5-58"
     set curr2_crit 37
 
 chip "dps460-i2c-6-58"
-    label temp1 "Power Supply 2 Sensor 1"
+    label temp1 "Power supply 2 inlet temp sensor"
     # maximum and critical thresholds are not supported for this psu
     set temp1_max 60
     set temp1_crit 70
 
-    label temp2 "Power Supply 2 Sensor 2"
+    label temp2 "Power supply 2 internal sensor"
     set temp2_max 60
     set temp2_crit 70
 

diff --git a/device/arista/x86_64-arista_7060_cx32s/sensors.conf b/device/arista/x86_64-arista_7060_cx32s/sensors.conf
@@ -51,9 +51,9 @@ chip "pmbus-i2c-7-4e"
 chip "pmbus-i2c-6-58"
     label temp1 "Power supply 1 hotspot sensor"
     label temp2 "Power supply 1 inlet temp sensor"
-    label temp3 "Power supply 1 sensor"
+    label temp3 "Power supply 1 exhaust temp sensor"
 
 chip "pmbus-i2c-5-58"
     label temp1 "Power supply 2 hotspot sensor"
     label temp2 "Power supply 2 inlet temp sensor"
-    label temp3 "Power supply 2 sensor"
+    label temp3 "Power supply 2 exhaust temp sensor"
diff --git a/device/arista/x86_64-arista_7260cx3_64/sensors.conf b/device/arista/x86_64-arista_7260cx3_64/sensors.conf
@@ -8,17 +8,17 @@ bus "i2c-73" "SCD 0000:ff:0b.3 SMBus master 0 bus 0"
 bus "i2c-88" "SCD 0000:ff:0b.3 SMBus master 3 bus 3"
 
 chip "max6658-i2c-1-4c"
-    label temp1 "Temp sensor near TH2"
+    label temp1 "Asic temp sensor"
 
     set temp1_max 65
     set temp1_crit 75
 
     ignore temp2
 
 chip "pmbus-i2c-3-58"
-    label temp1 "PSU1 primary hotspot temp"
-    label temp2 "PSU1 inlet temp"
-    label temp3 "PSU1 exhaust temp"
+    label temp1 "Power supply 1 hotspot sensor"
+    label temp2 "Power supply 1 inlet temp sensor"
+    label temp3 "Power supply 1 exhaust temp sensor"
 
     # setting maximum and critical thresholds is not supported for this psu
     # fault and warning limits defined internally by hardware
@@ -27,9 +27,9 @@ chip "pmbus-i2c-3-58"
     ignore fan3
 
 chip "pmbus-i2c-4-58"
-    label temp1 "PSU2 primary hotspot temp"
-    label temp2 "PSU2 inlet temp"
-    label temp3 "PSU2 exhaust temp"
+    label temp1 "Power supply 2 hotspot sensor"
+    label temp2 "Power supply 2 inlet temp sensor"
+    label temp3 "Power supply 2 exhaust temp sensor"
 
     # setting maximum and critical thresholds is not supported for this psu
     # fault and warning limits defined internally by hardware
@@ -38,16 +38,16 @@ chip "pmbus-i2c-4-58"
     ignore fan3
 
 chip "max6658-i2c-73-4c"
-    label temp1 "Rear air temp1"
-    label temp2 "Rear air temp2"
+    label temp1 "Back panel temp sensor 1"
+    label temp2 "Back panel temp sensor 2"
 
     set temp1_max 65
     set temp1_crit 75
     set temp2_max 65
     set temp2_crit 75
 
 chip "lm73-i2c-88-48"
-    label temp1 "Front air temp"
+    label temp1 "Front panel temp sensor"
 
     set temp1_max 65
     set temp1_crit 75