openstack/aodh
Code Issues Proposed changes

Change the sample_type from tuple to string

Browse Source 
The Collector can not persistence compute node CPU metrics when set
‘compute_monitors = ComputeDriverCPUMonitor’ in nova.
The root cause of that issue is the counter_type is the 'tuple',
In actually the type of the counter_type should be String,
so it can not persistence to DB success, please refer to the SQL,
the counter_type value is [u'cumulative'] that is a 'tuple'.

Change-Id: I8d1218f813d081e1031c331c59a17c227c9a8958
Closes-Bug: #1295004
This commit is contained in:
lijian 2014-03-20 15:51:56 +08:00
parent 8fb8d26ee6
commit bd522b1794
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ceilometer/compute/notifications/cpu.py
View File

@ -73,14 +73,14 @@ class ComputeMetricsNotificationBase(notifications.ComputeNotificationBase):
class CpuFrequency(ComputeMetricsNotificationBase):
"""Handle CPU current frequency message."""
metric = 'cpu.frequency'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE
unit = 'MHz'
class CpuUserTime(ComputeMetricsNotificationBase):
"""Handle CPU user mode time message."""
metric = 'cpu.user.time'
sample_type = sample.TYPE_CUMULATIVE,
sample_type = sample.TYPE_CUMULATIVE
unit = 'ns'
@ -88,53 +88,53 @@ class CpuKernelTime(ComputeMetricsNotificationBase):
"""Handle CPU kernel time message."""
metric = 'cpu.kernel.time'
unit = 'ns'
sample_type = sample.TYPE_CUMULATIVE,
sample_type = sample.TYPE_CUMULATIVE
class CpuIdleTime(ComputeMetricsNotificationBase):
"""Handle CPU idle time message."""
metric = 'cpu.idle.time'
unit = 'ns'
sample_type = sample.TYPE_CUMULATIVE,
sample_type = sample.TYPE_CUMULATIVE
class CpuIowaitTime(ComputeMetricsNotificationBase):
"""Handle CPU I/O wait time message."""
metric = 'cpu.iowait.time'
unit = 'ns'
sample_type = sample.TYPE_CUMULATIVE,
sample_type = sample.TYPE_CUMULATIVE
class CpuKernelPercent(ComputeMetricsNotificationBase):
"""Handle CPU kernel percentage message."""
metric = 'cpu.kernel.percent'
unit = '%'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE
class CpuIdlePercent(ComputeMetricsNotificationBase):
"""Handle CPU idle percentage message."""
metric = 'cpu.idle.percent'
unit = '%'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE
class CpuUserPercent(ComputeMetricsNotificationBase):
"""Handle CPU user mode percentage message."""
metric = 'cpu.user.percent'
unit = '%'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE
class CpuIowaitPercent(ComputeMetricsNotificationBase):
"""Handle CPU I/O wait percentage message."""
metric = 'cpu.iowait.percent'
unit = '%'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE
class CpuPercent(ComputeMetricsNotificationBase):
"""Handle generic CPU utilization message."""
metric = 'cpu.percent'
unit = '%'
sample_type = sample.TYPE_GAUGE,
sample_type = sample.TYPE_GAUGE