move non-threshold events into sensor namespace

Move the non-threshold events into the sensor namespace so they don't
include threshold in their interface name. These events are generic
sensor events and have no relation to threshold monitoring. I verified
in the openBMC code and there has been no user of these events for now,
hence they are safe to move.

Change-Id: I5aa6a5bdda04f520f842107c2e7a3537e04f821a
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>
diff --git a/yaml/xyz/openbmc_project/Sensor.events.yaml b/yaml/xyz/openbmc_project/Sensor.events.yaml
new file mode 100644
index 0000000..44e6560
--- /dev/null
+++ b/yaml/xyz/openbmc_project/Sensor.events.yaml
@@ -0,0 +1,31 @@
+version: 1.0.0
+
+errors:
+    - name: InvalidSensorReading
+      severity: warning
+      errno: EIO
+      metadata:
+          - name: SensorName
+            description: The name or identifier of the sensor.
+            type: object_path
+            primary: true
+      redfish-mapping: SensorEvent.InvalidSensorReading
+
+    - name: SensorFailure
+      severity: critical
+      errno: EIO
+      metadata:
+          - name: SensorName
+            description: The name or identifier of the sensor.
+            type: object_path
+            primary: true
+      redfish-mapping: SensorEvent.SensorFailure
+
+events:
+    - name: SensorRestored
+      metadata:
+          - name: SensorName
+            description: The name or identifier of the sensor.
+            type: object_path
+            primary: true
+      redfish-mapping: SensorEvent.SensorRestored
diff --git a/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml b/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
index db930d6..85d24ee 100644
--- a/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
+++ b/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
@@ -1,16 +1,6 @@
-version: 1.1.0
+version: 1.2.0
 
 errors:
-    - name: InvalidSensorReading
-      severity: warning
-      errno: EIO
-      metadata:
-          - name: SensorName
-            description: The name or identifier of the sensor.
-            type: object_path
-            primary: true
-      redfish-mapping: SensorEvent.InvalidSensorReading
-
     - name: ReadingAboveLowerCriticalThreshold
       severity: warning
       errno: ERANGE
@@ -417,16 +407,6 @@
             primary: true
       redfish-mapping: SensorEvent.ReadingNoLongerCritical
 
-    - name: SensorFailure
-      severity: critical
-      errno: EIO
-      metadata:
-          - name: SensorName
-            description: The name or identifier of the sensor.
-            type: object_path
-            primary: true
-      redfish-mapping: SensorEvent.SensorFailure
-
 events:
     - name: SensorReadingNormalRange
       metadata:
@@ -443,11 +423,3 @@
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
       redfish-mapping: SensorEvent.SensorReadingNormalRange
-
-    - name: SensorRestored
-      metadata:
-          - name: SensorName
-            description: The name or identifier of the sensor.
-            type: object_path
-            primary: true
-      redfish-mapping: SensorEvent.SensorRestored