Merge "aodh/gnocchi: remove constraints on aggregation methods"
This commit is contained in:
commit
8d3ba5ea37
|
@ -13,7 +13,6 @@
|
||||||
|
|
||||||
|
|
||||||
from heat.common.i18n import _
|
from heat.common.i18n import _
|
||||||
from heat.engine import constraints
|
|
||||||
from heat.engine import properties
|
from heat.engine import properties
|
||||||
from heat.engine.resources import alarm_base
|
from heat.engine.resources import alarm_base
|
||||||
from heat.engine import support
|
from heat.engine import support
|
||||||
|
@ -27,7 +26,6 @@ COMMON_GNOCCHI_PROPERTIES = (
|
||||||
'aggregation_method', 'threshold',
|
'aggregation_method', 'threshold',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
common_gnocchi_properties_schema = {
|
common_gnocchi_properties_schema = {
|
||||||
COMPARISON_OPERATOR: properties.Schema(
|
COMPARISON_OPERATOR: properties.Schema(
|
||||||
properties.Schema.STRING,
|
properties.Schema.STRING,
|
||||||
|
@ -43,10 +41,6 @@ common_gnocchi_properties_schema = {
|
||||||
AGGREGATION_METHOD: properties.Schema(
|
AGGREGATION_METHOD: properties.Schema(
|
||||||
properties.Schema.STRING,
|
properties.Schema.STRING,
|
||||||
_('The aggregation method to compare to the threshold.'),
|
_('The aggregation method to compare to the threshold.'),
|
||||||
constraints=[
|
|
||||||
constraints.AllowedValues(['mean', 'sum', 'last', 'max', 'min',
|
|
||||||
'std', 'median', 'first', 'count']),
|
|
||||||
],
|
|
||||||
update_allowed=True
|
update_allowed=True
|
||||||
),
|
),
|
||||||
GRANULARITY: properties.Schema(
|
GRANULARITY: properties.Schema(
|
||||||
|
|
Loading…
Reference in New Issue