drop image pollster
this doesn't measure anything and the equivalent functionality can be done against image.size meter. Change-Id: I79d47ac253a8dd4d8d5e927bedeb21bd407edf93
This commit is contained in:
@@ -106,7 +106,6 @@ resources:
|
||||
|
||||
- resource_type: image
|
||||
metrics:
|
||||
- 'image'
|
||||
- 'image.size'
|
||||
- 'image.download'
|
||||
- 'image.serve'
|
||||
|
@@ -46,21 +46,6 @@ class _Base(plugin_base.PollsterBase):
|
||||
"virtual_size"])
|
||||
|
||||
|
||||
class ImagePollster(_Base):
|
||||
def get_samples(self, manager, cache, resources):
|
||||
for image in resources:
|
||||
yield sample.Sample(
|
||||
name='image',
|
||||
type=sample.TYPE_GAUGE,
|
||||
unit='image',
|
||||
volume=1,
|
||||
user_id=None,
|
||||
project_id=image.owner,
|
||||
resource_id=image.id,
|
||||
resource_metadata=self.extract_image_metadata(image),
|
||||
)
|
||||
|
||||
|
||||
class ImageSizePollster(_Base):
|
||||
def get_samples(self, manager, cache, resources):
|
||||
for image in resources:
|
||||
|
@@ -101,23 +101,3 @@ class TestImagePollsterPageSize(base.BaseTestCase):
|
||||
image_samples[0].project_id)
|
||||
self.assertEqual('fda54a44-3f96-40bf-ab07-0a4ce9e1761d',
|
||||
image_samples[0].resource_id)
|
||||
|
||||
|
||||
class TestImagePageSize(base.BaseTestCase):
|
||||
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
||||
def setUp(self):
|
||||
super(TestImagePageSize, self).setUp()
|
||||
self.CONF = self.useFixture(fixture_config.Config()).conf
|
||||
self.manager = manager.AgentManager(0, self.CONF)
|
||||
self.pollster = glance.ImagePollster(self.CONF)
|
||||
|
||||
def test_image_pollster(self):
|
||||
image_samples = list(
|
||||
self.pollster.get_samples(self.manager, {}, resources=IMAGE_LIST))
|
||||
self.assertEqual(3, len(image_samples))
|
||||
self.assertEqual('image', image_samples[0].name)
|
||||
self.assertEqual(1, image_samples[0].volume)
|
||||
self.assertEqual('6824974c08974d4db864bbaa6bc08303',
|
||||
image_samples[0].project_id)
|
||||
self.assertEqual('fda54a44-3f96-40bf-ab07-0a4ce9e1761d',
|
||||
image_samples[0].resource_id)
|
||||
|
11
releasenotes/notes/drop-image-meter-9c9b6cebd546dae7.yaml
Normal file
11
releasenotes/notes/drop-image-meter-9c9b6cebd546dae7.yaml
Normal file
@@ -0,0 +1,11 @@
|
||||
---
|
||||
prelude: >
|
||||
In an effort to minimise the noise, Ceilometer will no longer produce
|
||||
meters which have no measureable data associated with it. Image meter
|
||||
only captures state information which is already captured in events and
|
||||
other meters.
|
||||
upgrade:
|
||||
- Any existing commands utilising `image` meter should be switched to
|
||||
`image.size` meter which will provide equivalent functionality
|
||||
deprecations:
|
||||
- The `image` meter is dropped in favour of `image.size` meter.
|
@@ -144,7 +144,6 @@ ceilometer.poll.ipmi =
|
||||
|
||||
ceilometer.poll.central =
|
||||
ip.floating = ceilometer.network.floatingip:FloatingIPPollster
|
||||
image = ceilometer.image.glance:ImagePollster
|
||||
image.size = ceilometer.image.glance:ImageSizePollster
|
||||
rgw.containers.objects = ceilometer.objectstore.rgw:ContainersObjectsPollster
|
||||
rgw.containers.objects.size = ceilometer.objectstore.rgw:ContainersSizePollster
|
||||
|
Reference in New Issue
Block a user