diff options
| author | Julien Danjou <julien@danjou.info> | 2013-07-17 15:53:07 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2013-07-29 15:03:26 +0200 |
| commit | c2cfd732b5576f1b263f9506dc4d238c7c7ca8ae (patch) | |
| tree | e734b9e5f54b42e7c865cd19b11a901655316cf5 /ceilometer/image | |
| parent | 207f52bd8aa5f0af21ef281b09d8bda6bd0d73fd (diff) | |
| download | ceilometer-c2cfd732b5576f1b263f9506dc4d238c7c7ca8ae.tar.gz | |
Rename ceilometer.counter to ceilometer.sample
Change-Id: Id5e943cffd59bd439c235630ca040035128a919f
Blueprint: remove-counter
Diffstat (limited to 'ceilometer/image')
| -rw-r--r-- | ceilometer/image/glance.py | 10 | ||||
| -rw-r--r-- | ceilometer/image/notifications.py | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 19f47ef8..8cf48648 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -23,7 +23,7 @@ from __future__ import absolute_import import itertools import glanceclient -from ceilometer import counter +from ceilometer import sample from ceilometer.openstack.common import timeutils from ceilometer import plugin @@ -102,9 +102,9 @@ class ImagePollster(_Base): def get_counters(self, manager, cache): for image in self._iter_images(manager.keystone, cache): - yield counter.Counter( + yield sample.Sample( name='image', - type=counter.TYPE_GAUGE, + type=sample.TYPE_GAUGE, unit='image', volume=1, user_id=None, @@ -119,9 +119,9 @@ class ImageSizePollster(_Base): def get_counters(self, manager, cache): for image in self._iter_images(manager.keystone, cache): - yield counter.Counter( + yield sample.Sample( name='image.size', - type=counter.TYPE_GAUGE, + type=sample.TYPE_GAUGE, unit='B', volume=image.size, user_id=None, diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py index a601bd27..35bd755c 100644 --- a/ceilometer/image/notifications.py +++ b/ceilometer/image/notifications.py @@ -21,7 +21,7 @@ from oslo.config import cfg -from ceilometer import counter +from ceilometer import sample from ceilometer import plugin OPTS = [ @@ -62,9 +62,9 @@ class ImageCRUDBase(ImageBase): class ImageCRUD(ImageCRUDBase): def process_notification(self, message): - yield counter.Counter.from_notification( + yield sample.Sample.from_notification( name=message['event_type'], - type=counter.TYPE_DELTA, + type=sample.TYPE_DELTA, unit='image', volume=1, resource_id=message['payload']['id'], @@ -75,9 +75,9 @@ class ImageCRUD(ImageCRUDBase): class Image(ImageCRUDBase): def process_notification(self, message): - yield counter.Counter.from_notification( + yield sample.Sample.from_notification( name='image', - type=counter.TYPE_GAUGE, + type=sample.TYPE_GAUGE, unit='image', volume=1, resource_id=message['payload']['id'], @@ -88,9 +88,9 @@ class Image(ImageCRUDBase): class ImageSize(ImageCRUDBase): def process_notification(self, message): - yield counter.Counter.from_notification( + yield sample.Sample.from_notification( name='image.size', - type=counter.TYPE_GAUGE, + type=sample.TYPE_GAUGE, unit='B', volume=message['payload']['size'], resource_id=message['payload']['id'], @@ -108,9 +108,9 @@ class ImageDownload(ImageBase): ] def process_notification(self, message): - yield counter.Counter.from_notification( + yield sample.Sample.from_notification( name='image.download', - type=counter.TYPE_DELTA, + type=sample.TYPE_DELTA, unit='B', volume=message['payload']['bytes_sent'], resource_id=message['payload']['image_id'], @@ -128,9 +128,9 @@ class ImageServe(ImageBase): ] def process_notification(self, message): - yield counter.Counter.from_notification( + yield sample.Sample.from_notification( name='image.serve', - type=counter.TYPE_DELTA, + type=sample.TYPE_DELTA, unit='B', volume=message['payload']['bytes_sent'], resource_id=message['payload']['image_id'], |