Skip to content

Commit

Permalink
Add missing eventType criteria on several REST services
Browse files Browse the repository at this point in the history
  • Loading branch information
@jshaughn @lucasponce
jshaughn authored and lucasponce committed Oct 19, 2017
1 parent c98e07e commit 8666b9f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 15 deletions.
5 changes: 3 additions & 2 deletions hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/EventsCriteria.java
View file
Expand Up @@ -42,10 +42,11 @@ public EventsCriteria() {
super();
}

public EventsCriteria(Long startTime, Long endTime, String eventIds, String triggerIds, String categories,
String tagQuery, Boolean thin) {
public EventsCriteria(Long startTime, Long endTime, String eventIds, String eventType, String triggerIds,
String categories, String tagQuery, Boolean thin) {
setStartTime(startTime);
setEndTime(endTime);
setEventType(eventType);
if (!isEmpty(eventIds)) {
setEventIds(Arrays.asList(eventIds.split(",")));
}
Expand Down
22 changes: 16 additions & 6 deletions ...t/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/CrossTenantHandler.java
View file
Expand Up @@ -255,7 +255,12 @@ public Response findEvents(
final Long endTime,
@ApiParam(required = false, value = "Filter out events for unspecified eventIds.",
allowableValues = "Comma separated list of event IDs.")
@QueryParam("eventIds") final String eventIds,
@QueryParam("eventIds")
final String eventIds,
@ApiParam(required = false, value = "Filter out events for unspecified eventType.",
allowableValues = "Valid EventType.")
@QueryParam("eventType")
final String eventType,
@ApiParam(required = false, value = "Filter out events for unspecified triggers.",
allowableValues = "Comma separated list of trigger IDs.")
@QueryParam("triggerIds")
Expand Down Expand Up @@ -293,8 +298,8 @@ We maintain old tags criteria as deprecated (it can be removed in a next major v
} else {
unifiedTagQuery = tagQuery;
}
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, triggerIds, categories,
unifiedTagQuery, thin);
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, eventType, triggerIds,
categories, unifiedTagQuery, thin);
Page<Event> eventPage = alertsService.getEvents(tenantIds, criteria, pager);
log.debugf("Events: %s", eventPage);
if (isEmpty(eventPage)) {
Expand Down Expand Up @@ -490,7 +495,12 @@ public Response watchEvents(
final Long endTime,
@ApiParam(required = false, value = "Filter out events for unspecified eventIds.",
allowableValues = "Comma separated list of event IDs.")
@QueryParam("eventIds") final String eventIds,
@QueryParam("eventIds")
final String eventIds,
@ApiParam(required = false, value = "Filter out events for unspecified eventType.",
allowableValues = "Valid EventType.")
@QueryParam("eventType")
final String eventType,
@ApiParam(required = false, value = "Filter out events for unspecified triggers.",
allowableValues = "Comma separated list of trigger IDs.")
@QueryParam("triggerIds")
Expand Down Expand Up @@ -527,8 +537,8 @@ public Response watchEvents(
} else {
unifiedTagQuery = tagQuery;
}
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, triggerIds, categories,
unifiedTagQuery, thin);
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, eventType, triggerIds,
categories, unifiedTagQuery, thin);
return Response.ok(streamWatcher.watchEvents(tenantIds, criteria, watchInterval)).build();

} catch (Exception e) {
Expand Down
27 changes: 20 additions & 7 deletions ...s-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/EventsHandler.java
View file
Expand Up @@ -282,6 +282,10 @@ public Response findEvents(
allowableValues = "Comma separated list of event IDs.")
@QueryParam("eventIds")
final String eventIds,
@ApiParam(required = false, value = "Filter out events for unspecified eventType.",
allowableValues = "Valid EventType.")
@QueryParam("eventType")
final String eventType,
@ApiParam(required = false, value = "Filter out events for unspecified triggers.",
allowableValues = "Comma separated list of trigger IDs.")
@QueryParam("triggerIds")
Expand Down Expand Up @@ -318,8 +322,8 @@ We maintain old tags criteria as deprecated (it can be removed in a next major v
} else {
unifiedTagQuery = tagQuery;
}
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, triggerIds, categories,
unifiedTagQuery, thin);
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, eventType, triggerIds,
categories, unifiedTagQuery, thin);
Page<Event> eventPage = alertsService.getEvents(tenantId, criteria, pager);
log.debugf("Events: %s", eventPage);
if (isEmpty(eventPage)) {
Expand Down Expand Up @@ -380,7 +384,12 @@ public Response watchEvents(
final Long endTime,
@ApiParam(required = false, value = "Filter out events for unspecified eventIds.",
allowableValues = "Comma separated list of event IDs.")
@QueryParam("eventIds") final String eventIds,
@QueryParam("eventIds")
final String eventIds,
@ApiParam(required = false, value = "Filter out events for unspecified eventType.",
allowableValues = "Valid EventType.")
@QueryParam("eventType")
final String eventType,
@ApiParam(required = false, value = "Filter out events for unspecified triggers.",
allowableValues = "Comma separated list of trigger IDs.")
@QueryParam("triggerIds")
Expand Down Expand Up @@ -416,8 +425,8 @@ public Response watchEvents(
} else {
unifiedTagQuery = tagQuery;
}
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, triggerIds, categories,
unifiedTagQuery, thin);
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, eventType, triggerIds,
categories, unifiedTagQuery, thin);
return Response.ok(streamWatcher.watchEvents(Collections.singleton(tenantId), criteria, watchInterval))
.build();

Expand Down Expand Up @@ -503,6 +512,10 @@ public Response deleteEvents(
allowableValues = "Comma separated list of event IDs.")
@QueryParam("eventIds")
final String eventIds,
@ApiParam(required = false, value = "Filter out events for unspecified eventType.",
allowableValues = "Valid EventType.")
@QueryParam("eventType")
final String eventType,
@ApiParam(required = false, value = "Filter out events for unspecified triggers. ",
allowableValues = "Comma separated list of trigger IDs.")
@QueryParam("triggerIds")
Expand Down Expand Up @@ -536,8 +549,8 @@ We maintain old tags criteria as deprecated (it can be removed in a next major v
} else {
unifiedTagQuery = tagQuery;
}
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, triggerIds, categories,
unifiedTagQuery, null);
EventsCriteria criteria = new EventsCriteria(startTime, endTime, eventIds, eventType, triggerIds,
categories, unifiedTagQuery, null);
int numDeleted = alertsService.deleteEvents(tenantId, criteria);
log.debugf("Events deleted: %d", numDeleted);
return ResponseUtil.ok(new ApiDeleted(numDeleted));
Expand Down

0 comments on commit 8666b9f

Please sign in to comment.