summaryrefslogtreecommitdiff
path: root/ceilometer/energy
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2013-07-04 16:31:04 -0400
committerJulien Danjou <julien@danjou.info>2013-07-12 14:20:01 +0200
commitbf2d4609882b20e6fb3ab223a48d7ebfbe3950c2 (patch)
treec63a98f9c583b6ebc4aea1b2b6b4ce9376d091fa /ceilometer/energy
parentfa7354464540ed3d2c89093459c5c3f3b74f1541 (diff)
downloadceilometer-bf2d4609882b20e6fb3ab223a48d7ebfbe3950c2.tar.gz
Remove get_counter_names from the pollster plugins
Now that there is only one meter-type coming out of each plugin, we can use the plugin name instead of asking the plugin which counters it produces. blueprint one-meter-per-plugin Change-Id: I63328b1bb2a2440771d9f1f007ff69e717d3090f Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Diffstat (limited to 'ceilometer/energy')
-rw-r--r--ceilometer/energy/kwapi.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/ceilometer/energy/kwapi.py b/ceilometer/energy/kwapi.py
index 576437a5..e664f3d1 100644
--- a/ceilometer/energy/kwapi.py
+++ b/ceilometer/energy/kwapi.py
@@ -81,10 +81,6 @@ class _Base(plugin.CentralPollster):
class EnergyPollster(_Base):
"""Measures energy consumption."""
- @staticmethod
- def get_counter_names():
- return ['energy']
-
def get_counters(self, manager, cache):
"""Returns all counters."""
for probe in self._iter_probes(manager.keystone, cache):
@@ -105,10 +101,6 @@ class EnergyPollster(_Base):
class PowerPollster(_Base):
"""Measures power consumption."""
- @staticmethod
- def get_counter_names():
- return ['power']
-
def get_counters(self, manager, cache):
"""Returns all counters."""
for probe in self._iter_probes(manager.keystone, cache):