Skip to content

Commit

Permalink
- Fix AutoResolve bug such that the trigger gets reloaded (in firing …
Browse files Browse the repository at this point in the history 
…mode).

- Fix associated lifecycle tests
  - fix bug in autoResolveWithThresholdTest() where incorrect data value
    was being sent to cause autoResolve, and also fix some mistaken
    validation code.
  - fix bug in json format issue in data sent to alerts via bus RestClient.
  - make sure we have the proper number of returned alerts (or none) for
    200 responses (especially now that 204 is not returned for none found)
  • Loading branch information
@jshaughn
jshaughn committed Jul 16, 2015
1 parent ea3db1e commit 1095eb7
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 29 deletions.
5 changes: 5 additions & 0 deletions hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ private void handleAutoResolvedTriggers() {
} catch (Exception e) {
log.errorf("Failed to resolve Alerts. Could not AutoResolve alerts for trigger %s", t);
}
try {
reloadTrigger(t.getTenantId(), t.getId());
} catch (Exception e) {
log.errorf("Failed to reload AutoResolved Trigger: %s", t);
}
}
} finally {
autoResolvedTriggers.clear();
Expand Down
71 changes: 42 additions & 29 deletions hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class LifecycleITest extends AbstractITestBase {

@Test
void t01_disableTest() {
println( "Running t01_disableTest")
String start = t01Start;

// CREATE the trigger
Expand Down Expand Up @@ -97,11 +98,11 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)

// Send in avail data to fire the trigger
// Note, the groovyx rest c;lient seems incapable of allowing a JSON payload and a TEXT response (which is what
// Note, the groovyx rest client seems incapable of allowing a JSON payload and a TEXT response (which is what
// we get back from the activemq rest client used by the bus), so use the bus' java rest client to do this.
RestClient busClient = new RestClient(host, port);
String json = "{\"data\":[{\"id\":\"test-autodisable-avail\",\"timestamp\":" + System.currentTimeMillis() +
",\"value\"=\"DOWN\",\"type\"=\"availability\"}]}";
",\"value\":\"DOWN\",\"type\":\"availability\"}]}";
busClient.postTopicMessage("HawkularAlertData", json, null);
//assertEquals(200, resp.status)

Expand All @@ -118,6 +119,7 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())

String alertId = resp.data[0].alertId;

Expand Down Expand Up @@ -147,6 +149,7 @@ class LifecycleITest extends AbstractITestBase {

@Test
void t02_autoResolveTest() {
println( "Running t02_autoResolveTest")
String start = t02Start = String.valueOf(System.currentTimeMillis());

// CREATE the trigger
Expand Down Expand Up @@ -226,6 +229,7 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)

Expand Down Expand Up @@ -269,12 +273,14 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("RESOLVED", resp.data[0].status)
assertEquals("AUTO", resp.data[0].resolvedBy)
}

@Test
void t03_manualResolutionTest() {
println( "Running t03_manualResolutionTest")
String start = String.valueOf(System.currentTimeMillis());

// CREATE the trigger
Expand Down Expand Up @@ -343,6 +349,7 @@ class LifecycleITest extends AbstractITestBase {
}
}
assertEquals(200, resp.status)
assertFalse(resp.data.isEmpty())
assertEquals(5, resp.data.size())
assertEquals("OPEN", resp.data[0].status)

Expand All @@ -364,6 +371,7 @@ class LifecycleITest extends AbstractITestBase {
// to test alert queries and updates.
@Test
void t04_fetchTest() {
println( "Running t04_fetchTest")
// queries will look for alerts generated in this test tun
String start = t01Start;

Expand Down Expand Up @@ -429,6 +437,16 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(5, resp.data.size())

// 4 OPEN and 1 RESOLVED
resp = client.get(path: "",
query: [startTime:start,triggerIds:"test-manual-trigger",statuses:"OPEN"] )
assertEquals(200, resp.status)
assertEquals(4, resp.data.size())

resp = client.get(path: "",
query: [startTime:start,triggerIds:"test-manual-trigger",statuses:"RESOLVED"] )
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())

resp = client.get(path: "",
query: [startTime:start,triggerIds:"test-manual-trigger",statuses:"OPEN,RESOLVED"] )
assertEquals(200, resp.status)
Expand Down Expand Up @@ -490,6 +508,7 @@ class LifecycleITest extends AbstractITestBase {

@Test
void t05_paging() {
println( "Running t05_paging")
// queries will look for alerts generated in this test tun
String start = t01Start;

Expand All @@ -499,18 +518,19 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
assertEquals(3, resp.data.size())

println(resp.headers)
// println(resp.headers)

resp = client.get(path: "",
query: [startTime:start,triggerIds:"test-manual-trigger",statuses:"OPEN,RESOLVED", page: "1", per_page: "3"] )
assertEquals(200, resp.status)
assertEquals(2, resp.data.size())

println(resp.headers)
// println(resp.headers)
}

@Test
void t06_manualAckAndResolutionTest() {
println( "Running t06_manualAckAndResolutionTest")
String start = String.valueOf(System.currentTimeMillis());

// CREATE the trigger
Expand Down Expand Up @@ -608,6 +628,7 @@ class LifecycleITest extends AbstractITestBase {

@Test
void t07_autoResolveWithThresholdTest() {
println( "Running t07_autoResolveWithThresholdTest")
String start = String.valueOf(System.currentTimeMillis());

/*
Expand Down Expand Up @@ -684,6 +705,7 @@ class LifecycleITest extends AbstractITestBase {
*/
resp = client.get(path: "", query: [startTime:start,triggerIds:"test-autoresolve-threshold-trigger"] )
assertEquals(200, resp.status)
assertTrue(resp.data.isEmpty())

/*
Step 8: Sending "bad" data to fire the trigger
Expand All @@ -710,11 +732,12 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)

/*
Step 10: Sending "bad" data to fire the trigger
Step 10: Sending "bad" data to fire the trigger, should not fire, trigger now in AutoResolve mode
*/
responseTime = new NumericData("test-autoresolve-threshold", System.currentTimeMillis(), 102);
mixedData = new MixedData();
Expand All @@ -723,28 +746,20 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)

/*
Step 11: Wait until the engine detects the data
Step 11: Wait for engine to process data
It should retrieve only 1 data not 2 as previous data shouldn't generate a new alert
*/
for ( int i=0; i < 10; ++i ) {
Thread.sleep(500);
resp = client.get(path: "", query: [startTime:start,triggerIds:"test-autoresolve-threshold-trigger"] )
/*
We should have only 1 alert
*/
if ( resp.status == 200 && resp.data.size() == 1 ) {
break;
}
assertEquals(200, resp.status)
}
Thread.sleep(2500);
resp = client.get(path: "", query: [startTime:start,triggerIds:"test-autoresolve-threshold-trigger"] )
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)

/*
Step 12: Sending "good" data to change trigger from FIRING to AUTORESOLVE
*/
responseTime = new NumericData("test-autoresolve-threshold", System.currentTimeMillis(), 102);
responseTime = new NumericData("test-autoresolve-threshold", System.currentTimeMillis(), 95);
mixedData = new MixedData();
mixedData.getNumericData().add(responseTime);
resp = client.post(path: "data", body: mixedData);
Expand All @@ -754,18 +769,10 @@ class LifecycleITest extends AbstractITestBase {
Step 13: Wait until the engine detects the data
It should retrieve only 1 data not 2 as previous data shouldn't generate a new alert
*/
for ( int i=0; i < 10; ++i ) {
Thread.sleep(500);
resp = client.get(path: "", query: [startTime:start,triggerIds:"test-autoresolve-threshold-trigger"] )
/*
We should have only 1 alert
*/
if ( resp.status == 200 && resp.data.size() == 1 ) {
break;
}
assertEquals(200, resp.status)
}
Thread.sleep(2500);
resp = client.get(path: "", query: [startTime:start,triggerIds:"test-autoresolve-threshold-trigger"] )
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)

Expand Down Expand Up @@ -794,12 +801,14 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(2, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)
}

@Test
void t08_autoEnableTest() {
println("Running t08_autoEnableTest")
String start = String.valueOf(System.currentTimeMillis());

// CREATE the trigger
Expand Down Expand Up @@ -912,6 +921,7 @@ class LifecycleITest extends AbstractITestBase {

@Test
void t09_manualAutoResolveTest() {
println("Running t09_manualAutoResolveTest")
String start = String.valueOf(System.currentTimeMillis());

// CREATE the trigger
Expand Down Expand Up @@ -990,6 +1000,7 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
assertEquals("HIGH", resp.data[0].severity)

Expand Down Expand Up @@ -1033,11 +1044,13 @@ class LifecycleITest extends AbstractITestBase {
assertEquals(200, resp.status)
}
assertEquals(200, resp.status)
assertEquals(1, resp.data.size())
assertEquals("OPEN", resp.data[0].status)
}

@Test
void t100_cleanup() {
println("Running t100_cleanup")
// clean up triggers
def resp = client.delete(path: "triggers/test-autodisable-trigger")
assert(200 == resp.status || 404 == resp.status)
Expand Down

0 comments on commit 1095eb7

Please sign in to comment.