openstack
/
ceilometer
Code Issues Proposed changes

Merge "Unlist non existent storage.api.request"

This commit is contained in:
Zuul 2018-04-23 02:36:09 +00:00 committed by Gerrit Code Review
parent ef7ce2847a 3e6c6a1444
commit 3d9045eb9c
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/publisher/data/gnocchi_resources.yaml
View File

@ -215,7 +215,6 @@ resources:
metrics:
storage.objects.incoming.bytes:
storage.objects.outgoing.bytes:
storage.api.request:
storage.objects.size:
storage.objects:
storage.objects.containers:

2
ceilometer/tests/unit/publisher/test_gnocchi.py
View File

@ -271,7 +271,7 @@ class PublisherTest(base.BaseTestCase):
'filter_project option')
def test_activity_filter_match_swift_event(self):
self.samples[0].name = 'storage.api.request'
self.samples[0].name = 'storage.objects.outgoing.bytes'
self.samples[0].resource_id = 'a2d42c23-d518-46b6-96ab-3fba2e146859'
self._do_test_activity_filter(1)

5
doc/source/admin/telemetry-measurements.rst
View File

@ -756,11 +756,6 @@ The following meters are collected for OpenStack Object Storage:
| storage.objects.ou\| Delta | B | storage ID | Notific\| Number of outgo\|
| tgoing.bytes | | | | ation | ing bytes |
+--------------------+-------+-------+------------+---------+-----------------+
| storage.api.request| Delta | requ\ | storage ID | Notific\| Number of API r\|
| | | est | | ation | equests against |
| | | | | | OpenStack Obje\ |
| | | | | | ct Storage |
+--------------------+-------+-------+------------+---------+-----------------+
| storage.containers\| Gauge | object| storage ID\| Pollster| Number of objec\|
| .objects | | | /container | | ts in container |
+--------------------+-------+-------+------------+---------+-----------------+