Merge "add ipmi sensor data to gnocchi"

ceilometer/gnocchi_client.py

@@ -197,6 +197,13 @@ resources_update_operations = [
          "attributes": {"provider": {"type": "string", "min_length": 0,
                                      "max_length": 255, "required": True}}
      }]},
+    {"desc": "add ipmi sensor resource type",
+     "type": "create_resource_type",
+     "resource_type": "ipmi_sensor",
+     "data": [{
+         "attributes": {"node": {"type": "string", "min_length": 0,
+                                 "max_length": 255, "required": True}}
+     }]},
 ]
 
 # NOTE(sileht): We use LooseVersion because pbr can generate invalid

ceilometer/publisher/data/gnocchi_resources.yaml

@@ -147,6 +147,15 @@ resources:
       - 'hardware.ipmi.node.mem_util'
       - 'hardware.ipmi.node.io_util'
 
+  - resource_type: ipmi_sensor
+    metrics:
+      - 'hardware.ipmi.power'
+      - 'hardware.ipmi.temperature'
+      - 'hardware.ipmi.current'
+      - 'hardware.ipmi.voltage'
+    attributes:
+      node: resource_metadata.node
+
   - resource_type: network
     metrics:
       - 'bandwidth'

releasenotes/notes/add-ipmi-sensor-data-gnocchi-70573728499abe86.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    `ceilometer-upgrade` must be run to build IPMI sensor resource in Gnocchi.
+fixes:
+  - |
+    Ceilometer previously did not create IPMI sensor data from IPMI agent or
+    Ironic in Gnocchi. This data is now pushed to Gnocchi.