openstack/ceilometer
Code Issues Proposed changes

Merge "Avoid recording whole instance info in log"

Browse Source
This commit is contained in:
Jenkins
2015-08-21 19:45:04 +00:00
committed by Gerrit Code Review
parent c3a60490f9 8220558072
commit f2eb905188
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/compute/pollsters/cpu.py
View File

@@ -34,7 +34,7 @@ class CPUPollster(pollsters.BaseComputePollster):
try:
cpu_info = self.inspector.inspect_cpus(instance)
LOG.debug("CPUTIME USAGE: %(instance)s %(time)d",
{'instance': instance.__dict__,
{'instance': instance,
'time': cpu_info.time})
cpu_num = {'cpu_number': cpu_info.number}
yield util.make_sample_from_instance(
@@ -67,7 +67,7 @@ class CPUUtilPollster(pollsters.BaseComputePollster):
cpu_info = self.inspector.inspect_cpu_util(
instance, self._inspection_duration)
LOG.debug("CPU UTIL: %(instance)s %(util)d",
{'instance': instance.__dict__,
{'instance': instance,
'util': cpu_info.util})
yield util.make_sample_from_instance(
instance,

4
ceilometer/compute/pollsters/memory.py
View File

@@ -35,7 +35,7 @@ class MemoryUsagePollster(pollsters.BaseComputePollster):
memory_info = self.inspector.inspect_memory_usage(
instance, self._inspection_duration)
LOG.debug("MEMORY USAGE: %(instance)s %(usage)f",
{'instance': instance.__dict__,
{'instance': instance,
'usage': memory_info.usage})
yield util.make_sample_from_instance(
instance,
@@ -78,7 +78,7 @@ class MemoryResidentPollster(pollsters.BaseComputePollster):
memory_info = self.inspector.inspect_memory_resident(
instance, self._inspection_duration)
LOG.debug("RESIDENT MEMORY: %(instance)s %(resident)f",
{'instance': instance.__dict__,
{'instance': instance,
'resident': memory_info.resident})
yield util.make_sample_from_instance(
instance,