New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Alarmcallback History #1537

Merged
merged 22 commits into from Jul 30, 2015

Conversation

Projects
None yet
2 participants
@dennisoelkers
Contributor

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)));

This comment has been minimized.

@edmundoa

edmundoa Jul 27, 2015

Member

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

@@ -73,4 +76,8 @@ public Result allAllowedSince(Integer since) {
return internalServerError("api exception " + e);
}
}
public Result list(String streamId, Integer skip, Integer limit) throws APIException, IOException {
return ok(Json.toJson(streamAlertService.listPaginated(streamId, skip, limit)));

This comment has been minimized.

@edmundoa

edmundoa Jul 27, 2015

Member

See above :)

<div class="col-md-12">
@views.html.partials.alerts.list_triggered_alerts.render(alerts, totalAlerts, stream, node)
</div>
<div class="react-alerts-component" data-stream-id="@stream.getId" data-permissions='@Json.toJson(currentUser.getPermissions)'>

This comment has been minimized.

@edmundoa

edmundoa Jul 27, 2015

Member

See above.

@edmundoa

This comment has been minimized.

Member

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 some commits May 26, 2015

@dennisoelkers dennisoelkers force-pushed the feature-alarmcallback-history branch from 68ee864 to d3696cb Jul 29, 2015

@edmundoa

This comment has been minimized.

Member

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 pull request Jul 30, 2015

@edmundoa edmundoa merged commit 44a1533 into master Jul 30, 2015

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details

@edmundoa edmundoa deleted the feature-alarmcallback-history branch Jul 30, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment