openstack/aodh
Code Issues Proposed changes

Merge "glance/cinder/quantum counter units are not accurate/consistent"

Browse Source
This commit is contained in:
Jenkins 2013-05-06 08:39:00 +00:00 committed by Gerrit Code Review
commit c6694e7efd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/image/notifications.py
View File

@ -89,7 +89,7 @@ class ImageCRUD(ImageCRUDBase):
counter.Counter(
name=message['event_type'],
type=counter.TYPE_DELTA,
unit='event',
unit='image',
volume=1,
resource_id=message['payload']['id'],
user_id=None,

8
ceilometer/network/notifications.py
View File

@ -70,11 +70,12 @@ class NetworkNotificationBase(plugin.NotificationBase):
LOG.info('network notification %r', message)
message['payload'] = message['payload'][self.resource_name]
metadata = self.notification_to_metadata(message)
counter_name = getattr(self, "counter_name", self.resource_name)
counter_name = getattr(self, 'counter_name', self.resource_name)
unit_value = getattr(self, 'unit', self.resource_name)
yield counter.Counter(name=counter_name,
type=counter.TYPE_GAUGE,
unit=self.resource_name,
unit=unit_value,
volume=1,
user_id=message['_context_user_id'],
project_id=message['payload']['tenant_id'],
@ -88,7 +89,7 @@ class NetworkNotificationBase(plugin.NotificationBase):
yield counter.Counter(name=counter_name
+ "." + event_type_split[1],
type=counter.TYPE_DELTA,
unit=self.resource_name,
unit=unit_value,
volume=1,
user_id=message['_context_user_id'],
project_id=message['payload']['tenant_id'],
@ -189,3 +190,4 @@ class FloatingIP(NetworkNotificationBase):
resource_name = 'floatingip'
counter_name = 'ip.floating'
unit = 'ip'

2
ceilometer/volume/notifications.py
View File

@ -88,7 +88,7 @@ class VolumeSize(_Base):
return [
counter.Counter(name='volume.size',
type=counter.TYPE_GAUGE,
unit='B',
unit='GB',
volume=message['payload']['size'],
user_id=message['payload']['user_id'],
project_id=message['payload']['tenant_id'],