Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix cloning alert conditions with identical id when cloning stream. #3615

Merged
merged 2 commits into from Mar 16, 2017
Merged

Fix cloning alert conditions with identical id when cloning stream. #3615

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a9f75b
Fix cloning alert conditions with identical id when cloning stream.
dennisoelkers Mar 15, 2017
d802cee
Fixing typo.
dennisoelkers Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 18 additions & 2 deletions graylog2-server/src/main/java/org/graylog2/rest/resources/streams/StreamResource.java
View file
Open in desktop
Expand Up @@ -43,13 +43,15 @@
import org.graylog2.plugin.Message;
import org.graylog2.plugin.Tools;
import org.graylog2.plugin.alarms.AlertCondition;
import org.graylog2.plugin.configuration.ConfigurationException;
import org.graylog2.plugin.database.ValidationException;
import org.graylog2.plugin.streams.Output;
import org.graylog2.plugin.streams.Stream;
import org.graylog2.plugin.streams.StreamRule;
import org.graylog2.rest.models.alarmcallbacks.requests.AlertReceivers;
import org.graylog2.rest.models.alarmcallbacks.requests.CreateAlarmCallbackRequest;
import org.graylog2.rest.models.streams.alerts.AlertConditionSummary;
import org.graylog2.rest.models.streams.alerts.requests.CreateConditionRequest;
import org.graylog2.rest.models.streams.requests.UpdateStreamRequest;
import org.graylog2.rest.models.system.outputs.responses.OutputSummary;
import org.graylog2.rest.resources.streams.requests.CloneStreamRequest;
Expand All @@ -71,6 +73,8 @@
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.ISODateTimeFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import javax.validation.Valid;
Expand Down Expand Up @@ -105,6 +109,8 @@
@Api(value = "Streams", description = "Manage streams")
@Path("/streams")
public class StreamResource extends RestResource {
private static final Logger LOG = LoggerFactory.getLogger(StreamResource.class);

private final StreamService streamService;
private final StreamRuleService streamRuleService;
private final StreamRouterEngine.Factory streamRouterEngineFactory;
Expand Down Expand Up @@ -391,12 +397,13 @@ public Response cloneStream(@ApiParam(name = "streamId", required = true) @PathP
checkNotDefaultStream(streamId, "The default stream cannot be cloned.");

final Stream sourceStream = streamService.load(streamId);
final String creatorUser = getCurrentUser().getName();

// Create stream.
final Map<String, Object> streamData = Maps.newHashMap();
streamData.put(StreamImpl.FIELD_TITLE, cr.title());
streamData.put(StreamImpl.FIELD_DESCRIPTION, cr.description());
streamData.put(StreamImpl.FIELD_CREATOR_USER_ID, getCurrentUser().getName());
streamData.put(StreamImpl.FIELD_CREATOR_USER_ID, creatorUser);
streamData.put(StreamImpl.FIELD_CREATED_AT, Tools.nowUTC());
streamData.put(StreamImpl.FIELD_MATCHING_TYPE, sourceStream.getMatchingType().toString());
streamData.put(StreamImpl.FIELD_REMOVE_MATCHES_FROM_DEFAULT_STREAM, cr.removeMatchesFromDefaultStream());
Expand All @@ -423,7 +430,16 @@ public Response cloneStream(@ApiParam(name = "streamId", required = true) @PathP
}

for (AlertCondition alertCondition : streamService.getAlertConditions(sourceStream)) {
streamService.addAlertCondition(stream, alertCondition);
try {
final AlertCondition clonedAlertCondition = alertService.fromRequest(
CreateConditionRequest.create(alertCondition.getType(), alertCondition.getTitle(), alertCondition.getParameters()),
stream,
creatorUser
);
streamService.addAlertCondition(stream, clonedAlertCondition);
} catch (ConfigurationException e) {
LOG.warn("Unable to clone alert condition <" + alertCondition + "> - skipping: ", e);
}
}

for (AlarmCallbackConfiguration alarmCallbackConfiguration : alarmCallbackConfigurationService.getForStream(sourceStream)) {
Expand Down