openstack
/
ceilometer
Code Issues Proposed changes

Merge "Fix share.size meter"

This commit is contained in:
Jenkins 2017-08-02 19:47:42 +00:00 committed by Gerrit Code Review
parent 092a8d7ada 04d77e1d9e
commit 69ea11652d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/data/meters.d/meters.yaml
View File

@ -355,5 +355,6 @@ metric:
metadata:
name: $.payload.name
host: $.payload.host
availability_zone: $.payload.availability_zone
status: $.payload.status
availability_zone: $.payload.availability_zone
protocol: $.payload.proto

3
ceilometer/dispatcher/data/gnocchi_resources.yaml
View File

@ -244,8 +244,9 @@ resources:
attributes:
name: resource_metadata.name
host: resource_metadata.host
availability_zone: resource_metadata.availability_zone
status: resource_metadata.status
availability_zone: resource_metadata.availability_zone
protocol: resource_metadata.protocol
- resource_type: switch
metrics:

6
ceilometer/gnocchi_client.py
View File

@ -132,13 +132,15 @@ resources_update_operations = [
"resource_type": "manila_share",
"data": [{
"attributes": {"name": {"type": "string", "min_length": 0,
"max_length": 255, "required": True},
"max_length": 255, "required": False},
"host": {"type": "string", "min_length": 0,
"max_length": 255, "required": True},
"protocol": {"type": "string", "min_length": 0,
"max_length": 255, "required": False},
"availability_zone": {"type": "string",
"min_length": 0,
"max_length": 255,
"required": True},
"required": False},
"status": {"type": "string", "min_length": 0,
"max_length": 255,
"required": True}}