diff --git a/ceilometer/gnocchi_client.py b/ceilometer/gnocchi_client.py index d9193dd716..563db64df5 100644 --- a/ceilometer/gnocchi_client.py +++ b/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 diff --git a/ceilometer/publisher/data/gnocchi_resources.yaml b/ceilometer/publisher/data/gnocchi_resources.yaml index 364292d825..1a5f06b635 100644 --- a/ceilometer/publisher/data/gnocchi_resources.yaml +++ b/ceilometer/publisher/data/gnocchi_resources.yaml @@ -145,6 +145,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' diff --git a/releasenotes/notes/add-ipmi-sensor-data-gnocchi-70573728499abe86.yaml b/releasenotes/notes/add-ipmi-sensor-data-gnocchi-70573728499abe86.yaml new file mode 100644 index 0000000000..bf030ec1e8 --- /dev/null +++ b/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.