openstack
/
monasca-api
Code Issues Proposed changes

Metric Namespace -> name

This commit is contained in:
Jonathan Halterman 2014-03-06 15:37:02 -08:00
parent 0cf0d09d00
commit ded841f713
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/hpcloud/mon/app/validation/AlarmValidation.java
View File

@ -35,12 +35,12 @@ public final class AlarmValidation {
MetricDefinition metricDef = subExpression.getMetricDefinition();
// Normalize and validate namespace
metricDef.namespace = NamespaceValidation.normalize(metricDef.namespace);
NamespaceValidation.validate(metricDef.namespace);
metricDef.name = NamespaceValidation.normalize(metricDef.name);
NamespaceValidation.validate(metricDef.name);
// Normalize and validate dimensions
metricDef.setDimensions(DimensionValidation.normalize(metricDef.dimensions));
DimensionValidation.validate(metricDef.namespace, metricDef.dimensions);
DimensionValidation.validate(metricDef.name, metricDef.dimensions);
// Validate period
if (subExpression.getPeriod() == 0)

2
src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmRepositoryImpl.java
View File

@ -56,7 +56,7 @@ public class AlarmRepositoryImpl implements AlarmRepository {
h.insert(
"insert into sub_alarm (id, alarm_id, function, namespace, operator, threshold, period, periods, state, created_at, updated_at) "
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())", subAlarmId, id,
subExpr.getFunction().name(), metricDef.namespace, subExpr.getOperator().name(),
subExpr.getFunction().name(), metricDef.name, subExpr.getOperator().name(),
subExpr.getThreshold(), subExpr.getPeriod(), subExpr.getPeriods(),
AlarmState.UNDETERMINED.toString());

2
src/main/java/com/hpcloud/mon/resource/AlarmResource.java
View File

@ -59,7 +59,7 @@ public class AlarmResource {
AlarmExpression alarmExpression = AlarmValidation.validateNormalizeAndGet(command.expression);
for (AlarmSubExpression alarmSubExpr : alarmExpression.getSubExpressions()) {
MetricDefinition metricDef = alarmSubExpr.getMetricDefinition();
Validation.verifyOwnership(tenantId, metricDef.namespace, metricDef.dimensions, authToken);
Validation.verifyOwnership(tenantId, metricDef.name, metricDef.dimensions, authToken);
}
AlarmDetail alarm = Links.hydrate(service.create(tenantId, command.name, command.expression,