Skip to content
This repository has been archived by the owner. It is now read-only.

Feature: Alarmcallback History #1537

Merged
merged 22 commits into from Jul 30, 2015
Merged

Feature: Alarmcallback History #1537

merged 22 commits into from Jul 30, 2015

Conversation

@dennisoelkers
Copy link
Contributor

@dennisoelkers dennisoelkers commented Jul 23, 2015

This feature shows recorded histories of alarm callbacks for triggered alerts inline in the alert page for a stream.

@dennisoelkers dennisoelkers force-pushed the feature-alarmcallback-history branch from f7577c3 to c409a57 Jul 27, 2015
@edmundoa edmundoa self-assigned this Jul 27, 2015
@edmundoa edmundoa added this to the 1.2.0 milestone Jul 27, 2015
}

public Result list(String streamId, String alertId) throws APIException, IOException {
return ok(Json.toJson(alarmCallbackHistoryService.list(streamId, alertId)));
Copy link
Member

@edmundoa edmundoa Jul 27, 2015

As of #1535, we should use .toJsonString from lib.json.Json to avoid weird serialization issues.

@edmundoa
Copy link
Member

@edmundoa edmundoa commented Jul 27, 2015

I already looked into these changes to work on the UI, so apart from the use of the toJson method the PR looks good to me.

dennisoelkers and others added 21 commits Jul 29, 2015
@dennisoelkers dennisoelkers force-pushed the feature-alarmcallback-history branch from 68ee864 to d3696cb Jul 29, 2015
@edmundoa
Copy link
Member

@edmundoa edmundoa commented Jul 30, 2015

I fixed that linting error and it looks ready to be merged! :shipit:

edmundoa added a commit that referenced this issue Jul 30, 2015
@edmundoa edmundoa merged commit 44a1533 into master Jul 30, 2015
0 of 2 checks passed
@edmundoa edmundoa deleted the feature-alarmcallback-history branch Jul 30, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants