From b1862f43726cc9dae95d968093b1a1f19a82f9e2 Mon Sep 17 00:00:00 2001
From: paavaanan <paavaanan_t_n@dell.com>
Date: Thu, 9 May 2019 12:52:18 +0530
Subject: [PATCH] [devices]: DellEMC S6100/Z9100 sensor.conf update (#2861)

---
 .../x86_64-dell_s6100_c2538-r0/sensors.conf   | 22 ++++++++++++++++++-
 .../x86_64-dell_z9100_c2538-r0/sensors.conf   | 22 ++++++++++++++++++-
 .../s6100/scripts/sensors                     |  4 ----
 .../z9100/scripts/sensors                     |  4 ----
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/sensors.conf b/device/dell/x86_64-dell_s6100_c2538-r0/sensors.conf
index 43fa7357c1..dfb1aa7c92 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/sensors.conf
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/sensors.conf
@@ -4,6 +4,26 @@ label power2 "PSU1 Output Power"
 label power3 "PSU2 Input  Power"
 label power4 "PSU2 Output Power"
 label temp14 "PSU1 Temp"
-label temp15 "PSU1 Temp"
+label temp15 "PSU2 Temp"
+label curr601 "PSU1 Input  Current"
+label curr602 "PSU1 Output Current"
+label curr701 "PSU2 Input  Current"
+label curr702 "PSU2 Output Current"
 ignore temp12
 ignore temp13
+ignore in101
+ignore in102
+ignore in103
+ignore in104
+ignore in201
+ignore in202
+ignore in203
+ignore in204
+ignore in301
+ignore in302
+ignore in303
+ignore in304
+ignore in401
+ignore in402
+ignore in403
+ignore in404
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/sensors.conf b/device/dell/x86_64-dell_z9100_c2538-r0/sensors.conf
index 31a656fcf0..e23891de6b 100644
--- a/device/dell/x86_64-dell_z9100_c2538-r0/sensors.conf
+++ b/device/dell/x86_64-dell_z9100_c2538-r0/sensors.conf
@@ -4,9 +4,29 @@ label power2 "PSU1 Output Power"
 label power3 "PSU2 Input  Power"
 label power4 "PSU2 Output Power"
 label temp14 "PSU1 Temp"
-label temp15 "PSU1 Temp"
+label temp15 "PSU2 Temp"
+label curr601 "PSU1 Input  Current"
+label curr602 "PSU1 Output Current"
+label curr701 "PSU2 Input  Current"
+label curr702 "PSU2 Output Current"
 ignore temp12
 ignore temp13
 ignore temp5
 ignore temp7
 ignore temp8
+ignore in101
+ignore in102
+ignore in103
+ignore in104
+ignore in201
+ignore in202
+ignore in203
+ignore in204
+ignore in301
+ignore in302
+ignore in303
+ignore in304
+ignore in401
+ignore in402
+ignore in403
+ignore in404
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/sensors b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/sensors
index 030d636a15..958cbdcb7b 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/sensors
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/sensors
@@ -1,7 +1,3 @@
 #!/bin/bash
 docker exec -i pmon sensors "$@"
 
-#To probe sensors not part of lm-sensors
-if [ -r /usr/local/bin/platform_sensors.py ]; then
-        python /usr/local/bin/platform_sensors.py
-fi
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/sensors b/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/sensors
index 030d636a15..958cbdcb7b 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/sensors
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/sensors
@@ -1,7 +1,3 @@
 #!/bin/bash
 docker exec -i pmon sensors "$@"
 
-#To probe sensors not part of lm-sensors
-if [ -r /usr/local/bin/platform_sensors.py ]; then
-        python /usr/local/bin/platform_sensors.py
-fi