openstack/monasca-common
Code Issues Proposed changes

Merge pull request #3 from hpcloud-mon/feature/addComplexDimension

Browse Source 
changed name to reflect the type being parsed
This commit is contained in:
Derrick Johnson 2014-07-11 19:22:55 -07:00
commit b36867cd4f
3 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.project *.project
*.target/ *.target/
*.settings/ *.settings/
.idea
target/ target/
test-output/ test-output/
test-config.yml test-config.yml

5
java/mon-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4
View File

@ -111,6 +111,7 @@ ext_identifier
| EXT_IDENTIFIER | EXT_IDENTIFIER
| INTEGER | INTEGER
| keyword | keyword
| STRING
; ;
keyword keyword
@ -219,6 +220,10 @@ EXT_IDENTIFIER
: (LETTER|DIGIT|UNDERSCORE|DASH|PERIOD)+ : (LETTER|DIGIT|UNDERSCORE|DASH|PERIOD)+
; ;
STRING
: '"' .*? '"'
;
fragment fragment
LETTER LETTER
: '\u0041'..'\u005a' // A-Z : '\u0041'..'\u005a' // A-Z

62
java/mon-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java
View File

@ -14,26 +14,52 @@ import com.hpcloud.mon.common.model.metric.MetricDefinition;
@Test @Test
public class AlarmExpressionTest { public class AlarmExpressionTest {
public void shouldParseExpression() { public void shouldParseExpression() {
AlarmExpression expr = new AlarmExpression( AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3"); "avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
List<AlarmSubExpression> alarms = expr.getSubExpressions(); List<AlarmSubExpression> alarms = expr.getSubExpressions();
AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG, AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder() new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5") .put("instance_id", "5")
.put("metric_name", "cpu") .put("metric_name", "cpu")
.put("device", "1") .put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3); .build()), AlarmOperator.GT, 5, 1, 3);
AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG, AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder() new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3") .put("flavor_id", "3")
.put("metric_name", "mem") .put("metric_name", "mem")
.build()), AlarmOperator.LT, 4, 2, 3); .build()), AlarmOperator.LT, 4, 2, 3);
assertEquals(alarms.get(0), expected1); assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2); assertEquals(alarms.get(1), expected2);
} }
public void shouldParseString() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1, url=\"https://www.google.com/?startpage=3&happygoing\"}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem, specialchars=\"!@#$%^&*()~<>{}[],.\"}, 2) < 4 times 3");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("url","\"https://www.google.com/?startpage=3&happygoing\"" )
.put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3);
AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.put("specialchars","\"!@#$%^&*()~<>{}[],.\"")
.build()), AlarmOperator.LT, 4, 2, 3);
assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2);
}
public void shouldParseExpressionWithoutType() { public void shouldParseExpressionWithoutType() {
AlarmExpression expr = new AlarmExpression( AlarmExpression expr = new AlarmExpression(