Merge "add volume provider resource types to gnocchi"

ceilometer/gnocchi_client.py

@@ -184,6 +184,19 @@ resources_update_operations = [
                         "controller": {"type": "string", "min_length": 0,
                                        "max_length": 255, "required": True}}
      }]},
+    {"desc": "add volume provider resource type",
+     "type": "create_resource_type",
+     "resource_type": "volume_provider",
+     "data": [{
+         "attributes": {}
+     }]},
+    {"desc": "add volume provider pool resource type",
+     "type": "create_resource_type",
+     "resource_type": "volume_provider_pool",
+     "data": [{
+         "attributes": {"provider": {"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

@@ -186,6 +186,24 @@ resources:
     event_attributes:
       id: resource_id
 
+  - resource_type: volume_provider
+    metrics:
+      - 'volume.provider.capacity.total'
+      - 'volume.provider.capacity.free'
+      - 'volume.provider.capacity.allocated'
+      - 'volume.provider.capacity.provisioned'
+      - 'volume.provider.capacity.virtual_free'
+
+  - resource_type: volume_provider_pool
+    metrics:
+      - 'volume.provider.pool.capacity.total'
+      - 'volume.provider.pool.capacity.free'
+      - 'volume.provider.pool.capacity.allocated'
+      - 'volume.provider.pool.capacity.provisioned'
+      - 'volume.provider.pool.capacity.virtual_free'
+    attributes:
+      provider: resource_metadata.provider
+
   - resource_type: host
     metrics:
       - 'hardware.cpu.load.1min'