summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-11-28 13:23:26 +0000
committerGerrit Code Review <review@openstack.org>2019-11-28 13:23:26 +0000
commita9a472c19ead99e614c2d23e58c79e572589ec5b (patch)
tree67e6159c7b7043b64a4ae0a90f6f89003b38e802
parenta8b514f1deef9e8ab511e152d0f0b1f45f46c753 (diff)
parent6f77f2d53e5bcd51da4c46c2d1bec3d708ccaef6 (diff)
downloadceilometer-a9a472c19ead99e614c2d23e58c79e572589ec5b.tar.gz
Merge "Add loadbalancer resource type." into stable/train
-rw-r--r--ceilometer/gnocchi_client.py6
-rw-r--r--ceilometer/publisher/data/gnocchi_resources.yaml12
2 files changed, 18 insertions, 0 deletions
diff --git a/ceilometer/gnocchi_client.py b/ceilometer/gnocchi_client.py
index e471b1a2..a07eddb1 100644
--- a/ceilometer/gnocchi_client.py
+++ b/ceilometer/gnocchi_client.py
@@ -240,6 +240,12 @@ resources_update_operations = [
"value": {"type": "string", "min_length": 0, "max_length": 255,
"required": False}
}]},
+ {"desc": "add loadbalancer resource type",
+ "type": "create_resource_type",
+ "resource_type": "loadbalancer",
+ "data": [{
+ "attributes": {}
+ }]},
]
# 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 e9e9ef5a..656e0c82 100644
--- a/ceilometer/publisher/data/gnocchi_resources.yaml
+++ b/ceilometer/publisher/data/gnocchi_resources.yaml
@@ -395,3 +395,15 @@ resources:
attributes:
controller: resource_metadata.controller
switch: resource_metadata.switch
+
+ - resource_type: loadbalancer
+ metrics:
+ network.services.lb.outgoing.bytes:
+ network.services.lb.incoming.bytes:
+ network.services.lb.pool:
+ network.services.lb.listener:
+ network.services.lb.member:
+ network.services.lb.health_monitor:
+ network.services.lb.loadbalancer:
+ network.services.lb.total.connections:
+ network.services.lb.active.connections: \ No newline at end of file