Modified sensors variables for Dell platforms according to latest master output (sonic-net#901)

chitra-raghavan · Stepan Blyschak · commit 92236ddc42a7 · 2019-05-10T17:14:18.000+03:00
diff --git a/ansible/group_vars/sonic/sku-sensors-data.yml b/ansible/group_vars/sonic/sku-sensors-data.yml
@@ -49,14 +49,14 @@ sensors_checks:
     compares:
       fan: []
       power:
-      - - SMF_S6100_ON-isa-0000/Psu1 Input/power1_input
-        - SMF_S6100_ON-isa-0000/Psu1 Input/power1_max
-      - - SMF_S6100_ON-isa-0000/Psu1 Output/power2_input
-        - SMF_S6100_ON-isa-0000/Psu1 Output/power2_max
-      - - SMF_S6100_ON-isa-0000/Psu2 Input/power3_input
-        - SMF_S6100_ON-isa-0000/Psu2 Input/power3_max
-      - - SMF_S6100_ON-isa-0000/Psu2 Output/power4_input
-        - SMF_S6100_ON-isa-0000/Psu2 Output/power4_max
+      - - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_max
       temp:
       - - coretemp-isa-0000/Core 0/temp2_input
         - coretemp-isa-0000/Core 0/temp2_crit
@@ -78,10 +78,10 @@ sensors_checks:
         - SMF_S6100_ON-isa-0000/Front GE/temp10_crit
       - - SMF_S6100_ON-isa-0000/Front SFP+/temp11_input
         - SMF_S6100_ON-isa-0000/Front SFP+/temp11_crit
-      - - SMF_S6100_ON-isa-0000/PSU 1/temp14_input
-        - SMF_S6100_ON-isa-0000/PSU 1/temp14_crit
-      - - SMF_S6100_ON-isa-0000/PSU 2/temp15_input
-        - SMF_S6100_ON-isa-0000/PSU 2/temp15_crit
+      - - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_input
+        - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_input
+        - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_max
     non_zero:
       fan:
       - SMF_S6100_ON-isa-0000/Tray1 Fan1/fan1_input
@@ -121,12 +121,17 @@ sensors_checks:
        - SMF_S6100_ON-isa-0000/PSU1 VOUT/in30_input
        - SMF_S6100_ON-isa-0000/PSU2 VIN/in31_input
        - SMF_S6100_ON-isa-0000/PSU2 VOUT/in32_input
-       - SMF_S6100_ON-isa-0000/Psu1 Input/power1_input
-       - SMF_S6100_ON-isa-0000/Psu1 Output/power2_input
-       - SMF_S6100_ON-isa-0000/Psu2 Input/power3_input
-       - SMF_S6100_ON-isa-0000/Psu2 Output/power4_input
+       - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_input
+       - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_input
+       - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_input
+       - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_input
        - SMF_S6100_ON-isa-0000/XP1R0V/curr21_input
        - SMF_S6100_ON-isa-0000/XP1R0V_ROV/curr22_input
+       - SMF_S6100_ON-isa-0000/PSU1 Input  Current/curr601_input
+       - SMF_S6100_ON-isa-0000/PSU1 Output Current/curr602_input
+       - SMF_S6100_ON-isa-0000/PSU2 Input  Current/curr701_input
+       - SMF_S6100_ON-isa-0000/PSU2 Output Current/curr702_input
+
       temp:
        - SMF_S6100_ON-isa-0000/CPU On-board (U2900)/temp1_input
        - "SMF_S6100_ON-isa-0000/BCM On-Board #1 (U44)/temp2_input"
@@ -139,14 +144,12 @@ sensors_checks:
        - SMF_S6100_ON-isa-0000/U2 Switch board?/temp9_input
        - SMF_S6100_ON-isa-0000/Front GE/temp10_input
        - SMF_S6100_ON-isa-0000/Front SFP+/temp11_input
-       - SMF_S6100_ON-isa-0000/BCM Internal/temp12_input
-       - SMF_S6100_ON-isa-0000/CPU Internal/temp13_input
-       - SMF_S6100_ON-isa-0000/PSU 1/temp14_input
-       - SMF_S6100_ON-isa-0000/PSU 2/temp15_input
+       - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_input
+       - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_input
 
     psu_skips: {}
 
-  Force10-Z9100:
+  Force10-Z9100-C32:
     alarms:
       fan:
       - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_alarm
@@ -206,6 +209,7 @@ sensors_checks:
       - SMF_Z9100_ON-isa-0000/SW XP1R8V_FPGA_MON/in26_alarm
       - SMF_Z9100_ON-isa-0000/SW XP3R3V_FPGA_MON/in27_alarm
       - SMF_Z9100_ON-isa-0000/SW XP3R3V_EARLY_MON/in28_alarm
+
     compares:
       temp:
       - - coretemp-isa-0000/Core 0/temp2_input
@@ -217,14 +221,14 @@ sensors_checks:
       - - coretemp-isa-0000/Core 3/temp5_input
         - coretemp-isa-0000/Core 3/temp5_crit
       power:
-      - - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_input
-        - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_max
-      - - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_input
-        - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_max
-      - - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_input
-        - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_max
-      - - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_input
-        - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_max
       fan: []
     non_zero:
       fan:
@@ -241,16 +245,21 @@ sensors_checks:
       - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_input
       - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_input
       power:
-      - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_input
-      - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_input
-      - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_input
-      - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
       - SMF_Z9100_ON-isa-0000/PSU1 VIN/in29_input
       - SMF_Z9100_ON-isa-0000/PSU1 VOUT/in30_input
       - SMF_Z9100_ON-isa-0000/PSU2 VIN/in31_input
       - SMF_Z9100_ON-isa-0000/PSU2 VOUT/in32_input
       - SMF_Z9100_ON-isa-0000/XP1R0V/curr21_input
       - SMF_Z9100_ON-isa-0000/XP1R0V_ROV/curr22_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Current/curr601_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Current/curr602_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Current/curr701_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Current/curr702_input
+
       temp:
       - coretemp-isa-0000/Core 0/temp2_input
       - coretemp-isa-0000/Core 1/temp3_input
@@ -262,11 +271,142 @@ sensors_checks:
       - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U2)/temp4_input
       - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U38)/temp6_input"
       - SMF_Z9100_ON-isa-0000/Rear (U2900)/temp9_input
-      - SMF_Z9100_ON-isa-0000/PSU 1/temp14_input
-      - SMF_Z9100_ON-isa-0000/PSU 2/temp15_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Temp/temp14_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Temp/temp15_input
 
     psu_skips: {}
 
+  Force10-Z9100-C8D48:
+    alarms:
+      fan:
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_alarm
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_fault
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_alarm
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_fault
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_alarm
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_fault
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_alarm
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_fault
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_alarm
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_fault
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_alarm
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_fault
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_alarm
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_fault
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_alarm
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_fault
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_alarm
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_fault
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_alarm
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_fault
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_alarm
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_fault
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_alarm
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_fault
+      temp:
+      - coretemp-isa-0000/Core 0/temp2_crit_alarm
+      - coretemp-isa-0000/Core 1/temp3_crit_alarm
+      - coretemp-isa-0000/Core 2/temp4_crit_alarm
+      - coretemp-isa-0000/Core 3/temp5_crit_alarm
+      power:
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_EARLY/in1_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP5R0V_CP/in2_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_STD/in3_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_CP /in4_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_STD/in3_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_CP /in4_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP0R75V_VTT_A/in5_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP0R75V_VTT_B/in6_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R07V_CPU/in7_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU/in8_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP12R0V/in9_alarm
+      - SMF_Z9100_ON-isa-0000/CPU VDDR_CPU_2/in10_alarm
+      - SMF_Z9100_ON-isa-0000/CPU VDDR_CPU_1/in11_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R5V_CLK/in12_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R35V_CPU/in13_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R8V_CPU/in14_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU_VNN/in15_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU_VCC/in16_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R5V_EARLY/in17_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_MON/in19_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R8V_MON/in20_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R25V_MON/in21_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R2V_MON/in22_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R0V_SW_MON/in23_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R0V_ROV_SW_MON/in24_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP5V_MB_MON/in25_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R8V_FPGA_MON/in26_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_FPGA_MON/in27_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_EARLY_MON/in28_alarm
+    compares:
+      temp:
+      - - coretemp-isa-0000/Core 0/temp2_input
+        - coretemp-isa-0000/Core 0/temp2_crit
+      - - coretemp-isa-0000/Core 1/temp3_input
+        - coretemp-isa-0000/Core 1/temp3_crit
+      - - coretemp-isa-0000/Core 2/temp4_input
+        - coretemp-isa-0000/Core 2/temp4_crit
+      - - coretemp-isa-0000/Core 3/temp5_input
+        - coretemp-isa-0000/Core 3/temp5_crit
+      power:
+      - - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_max
+      fan: []
+    non_zero:
+      fan:
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_input
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_input
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_input
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_input
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_input
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_input
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_input
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_input
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_input
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_input
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_input
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_input
+      power:
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+      - SMF_Z9100_ON-isa-0000/PSU1 VIN/in29_input
+      - SMF_Z9100_ON-isa-0000/PSU1 VOUT/in30_input
+      - SMF_Z9100_ON-isa-0000/PSU2 VIN/in31_input
+      - SMF_Z9100_ON-isa-0000/PSU2 VOUT/in32_input
+      - SMF_Z9100_ON-isa-0000/XP1R0V/curr21_input
+      - SMF_Z9100_ON-isa-0000/XP1R0V_ROV/curr22_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Current/curr601_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Current/curr602_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Current/curr701_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Current/curr702_input
+
+      temp:
+      - coretemp-isa-0000/Core 0/temp2_input
+      - coretemp-isa-0000/Core 1/temp3_input
+      - coretemp-isa-0000/Core 2/temp4_input
+      - coretemp-isa-0000/Core 3/temp5_input
+      - SMF_Z9100_ON-isa-0000/CPU On-board (U2900)/temp1_input
+      - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U44)/temp2_input"
+      - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U4)/temp3_input
+      - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U2)/temp4_input
+      - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U38)/temp6_input"
+      - SMF_Z9100_ON-isa-0000/Rear (U2900)/temp9_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Temp/temp14_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Temp/temp15_input
+
+    psu_skips: {}
+
+
 
   Force10-S6000:
     alarms:
