diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-21 16:21:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-21 16:21:24 +0000 |
| commit | 24ae1e94233cf577a382a4883df989bb7d8e03a2 (patch) | |
| tree | d519aaf21afd46ab38497f19b0e9e1c3d89870f7 /setup.cfg | |
| parent | 2874c2af120a16fbaa69c495d7e6f50d114a923c (diff) | |
| parent | 3304cf26421d77b40225a886782d46c73439c0e9 (diff) | |
| download | ceilometer-24ae1e94233cf577a382a4883df989bb7d8e03a2.tar.gz | |
Merge "compute: create one pollster to rule them all"
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -98,9 +98,9 @@ ceilometer.poll.compute = disk.device.latency = ceilometer.compute.pollsters.disk:PerDeviceDiskLatencyPollster disk.iops = ceilometer.compute.pollsters.disk:DiskIOPSPollster disk.device.iops = ceilometer.compute.pollsters.disk:PerDeviceDiskIOPSPollster - cpu = ceilometer.compute.pollsters.cpu:CPUPollster - cpu_util = ceilometer.compute.pollsters.cpu:CPUUtilPollster - cpu_l3_cache = ceilometer.compute.pollsters.cpu:CPUL3CachePollster + cpu = ceilometer.compute.pollsters.instance_stats:CPUPollster + cpu_util = ceilometer.compute.pollsters.instance_stats:CPUUtilPollster + cpu_l3_cache = ceilometer.compute.pollsters.instance_stats:CPUL3CachePollster network.incoming.bytes = ceilometer.compute.pollsters.net:IncomingBytesPollster network.incoming.packets = ceilometer.compute.pollsters.net:IncomingPacketsPollster network.outgoing.bytes = ceilometer.compute.pollsters.net:OutgoingBytesPollster @@ -111,20 +111,20 @@ ceilometer.poll.compute = network.outgoing.packets.drop = ceilometer.compute.pollsters.net:OutgoingDropPollster network.incoming.packets.error = ceilometer.compute.pollsters.net:IncomingErrorsPollster network.outgoing.packets.error = ceilometer.compute.pollsters.net:OutgoingErrorsPollster - memory.usage = ceilometer.compute.pollsters.memory:MemoryUsagePollster - memory.resident = ceilometer.compute.pollsters.memory:MemoryResidentPollster - memory.bandwidth.total = ceilometer.compute.pollsters.memory:MemoryBandwidthTotalPollster - memory.bandwidth.local = ceilometer.compute.pollsters.memory:MemoryBandwidthLocalPollster + memory.usage = ceilometer.compute.pollsters.instance_stats:MemoryUsagePollster + memory.resident = ceilometer.compute.pollsters.instance_stats:MemoryResidentPollster + memory.bandwidth.total = ceilometer.compute.pollsters.instance_stats:MemoryBandwidthTotalPollster + memory.bandwidth.local = ceilometer.compute.pollsters.instance_stats:MemoryBandwidthLocalPollster disk.capacity = ceilometer.compute.pollsters.disk:CapacityPollster disk.allocation = ceilometer.compute.pollsters.disk:AllocationPollster disk.usage = ceilometer.compute.pollsters.disk:PhysicalPollster disk.device.capacity = ceilometer.compute.pollsters.disk:PerDeviceCapacityPollster disk.device.allocation = ceilometer.compute.pollsters.disk:PerDeviceAllocationPollster disk.device.usage = ceilometer.compute.pollsters.disk:PerDevicePhysicalPollster - perf.cpu.cycles = ceilometer.compute.pollsters.perf:PerfEventsCPUCyclesPollster - perf.instructions = ceilometer.compute.pollsters.perf:PerfEventsInstructionsPollster - perf.cache.references = ceilometer.compute.pollsters.perf:PerfEventsCacheReferencesPollster - perf.cache.misses = ceilometer.compute.pollsters.perf:PerfEventsCacheMissesPollster + perf.cpu.cycles = ceilometer.compute.pollsters.instance_stats:PerfCPUCyclesPollster + perf.instructions = ceilometer.compute.pollsters.instance_stats:PerfInstructionsPollster + perf.cache.references = ceilometer.compute.pollsters.instance_stats:PerfCacheReferencesPollster + perf.cache.misses = ceilometer.compute.pollsters.instance_stats:PerfCacheMissesPollster ceilometer.poll.ipmi = hardware.ipmi.node.power = ceilometer.ipmi.pollsters.node:PowerPollster |