Witherspoon processor overtemp path changes

Make these changes in the phosphor-dbus-monitor rules that
run when 3 processor cores reach 115C, resulting in a system
shutdown:

* Create the same CriticalHigh error, but now store the sensor
  paths and values of the cores that went over 115 in the metadata.

* Remove the callback that makes journal entries, as the above
  change will now log which sensors/values went too high in the
  error log metadata which also shows up in the journal anyway.

* Make this condition be a oneshot, meaning it will only do the
  callbacks once as long as 3 processors are over threshold, not
  on every properties changed call by any processor.

Resolves openbmc/openbmc#2560

Change-Id: Iaa5207a80ca251c927ecb96b98c41adcb173175e
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
index 81f93d1..1dd2306 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
@@ -140,6 +140,7 @@
   countbound: 3
   op: '>='
   bound: 115000
+  oneshot: true
 
 - name: log and shutdown
   description: >
@@ -148,7 +149,6 @@
   callback: group
   members:
     - shutdown
-    - log
     - create criticalhigh error
     - create shutdown error
 
@@ -167,28 +167,15 @@
     - value: replace
       type: string
 
-- name: log
-  description: >
-    'Log a shutdown event to the systemd journal.'
-  class: callback
-  callback: journal
-  paths: core sensors
-  properties: core temp
-  severity: ERR
-  message: The system is too hot.  Shutting down.
-
 - name: create criticalhigh error
   description: >
     'Create a CriticalHigh Error log.'
   class: callback
-  callback: elog
+  callback: elog_with_metadata
   paths: core sensors
   properties: core temp
   error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh
-  metadata:
-    - name: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_TYPE
-      value: temperature
-      type: string
+  metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA
 
 - name: create shutdown error
   description: >