opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Never change the state of system definitions on edit (#24780)

Browse Source 
* Never change the state of system definitions on edit
This commit is contained in:
Łukasz Kamiński
2026-01-23 08:57:13 +01:00
committed by GitHub
parent b4c4a40640
commit e8a7e9cd6c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/pr-24780.toml Normal file
View File

@@ -0,0 +1,6 @@
type = "fixed"
message = "Removed unnecessary automatic disabling of system event definitions during editing operations."
issues = ["22946"]
pulls = ["24780"]

11
graylog2-server/src/main/java/org/graylog/events/rest/EventDefinitionsResource.java
View File

@@ -77,6 +77,7 @@ import org.graylog2.audit.AuditEventSender;
import org.graylog2.audit.jersey.AuditEvent;
import org.graylog2.audit.jersey.NoAuditEvent;
import org.graylog2.database.PaginatedList;
import org.graylog2.database.entities.NonDeletableSystemScope;
import org.graylog2.database.entities.source.DBEntitySourceService;
import org.graylog2.database.utils.SourcedMongoEntityUtils;
import org.graylog2.plugin.rest.PluginRestResource;
@@ -357,8 +358,14 @@ public class EventDefinitionsResource extends RestResource implements PluginRest
if (result.failed()) {
return Response.status(Response.Status.BAD_REQUEST).entity(result).build();
}
dto = dto.toBuilder().state(schedule ? EventDefinition.State.ENABLED : EventDefinition.State.DISABLED).build();
if (NonDeletableSystemScope.NAME.equals(dto.scope())) {
//never change the state of system definitions, as the state cannot be later on changed in the UI
dto = dto.toBuilder().build();
} else {
dto = dto.toBuilder()
.state(schedule ? EventDefinition.State.ENABLED : EventDefinition.State.DISABLED)
.build();
}
recentActivityService.update(definitionId, GRNTypes.EVENT_DEFINITION, userContext.getUser());
return Response.ok().entity(eventDefinitionHandler.update(dto, schedule)).build();
}