add event limit for filter event definition #16035
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # graylog2-server/src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessor.java # graylog2-server/src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
# Conflicts: # graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterAggregationForm.jsx
mpfz0r
reviewed
Aug 2, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 2, 2023
...og2-server/src/main/resources/org/graylog2/freemarker/templates/HTML/event_limit_reached.ftl
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 2, 2023
...erver/src/main/resources/org/graylog2/freemarker/templates/PLAINTEXT/event_limit_reached.ftl
Outdated
Show resolved
Hide resolved
moesterheld
reviewed
Aug 2, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Show resolved
Hide resolved
moesterheld
reviewed
Aug 2, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Show resolved
Hide resolved
# Conflicts: # graylog2-server/src/main/java/org/graylog2/notifications/Notification.java
…t on update, set default event limit to 100
mpfz0r
reviewed
Aug 17, 2023
graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionConfiguration.java
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
...server/src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessor.java
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
...og2-server/src/main/resources/org/graylog2/freemarker/templates/HTML/event_limit_reached.ftl
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
...server/src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessor.java
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Outdated
Show resolved
Hide resolved
mpfz0r
reviewed
Aug 17, 2023
.../src/main/java/org/graylog/events/processor/aggregation/AggregationEventProcessorConfig.java
Outdated
Show resolved
Hide resolved
mpfz0r
requested changes
Aug 17, 2023
moesterheld
approved these changes
Aug 17, 2023
mpfz0r
added a commit
that referenced
this pull request
Aug 24, 2023
With #16035 we try to enforce a new default event limit, without breaking backwards compatibility. The validations are making an exemption if an existing event definition is being edited which doesn't have an event limit yet (limit of 0) Duplicating event definitions was done in the frontend, and then creating a new one. This makes it impossible to differentiate between copy and create in the backend. - Create a new `/events/definitions/{definitionId}/duplicate` endpoint. Which creates a copy without performing a validation. - Also correctly set the state for unscheduled event defintions. This got missed with #15558 Refs #16035
mpfz0r
added a commit
that referenced
this pull request
Aug 30, 2023
* Allow duplicating event definitions with a limit of 0 With #16035 we try to enforce a new default event limit, without breaking backwards compatibility. The validations are making an exemption if an existing event definition is being edited which doesn't have an event limit yet (limit of 0) Duplicating event definitions was done in the frontend, and then creating a new one. This makes it impossible to differentiate between copy and create in the backend. - Create a new `/events/definitions/{definitionId}/duplicate` endpoint. Which creates a copy without performing a validation. - Also correctly set the state for unscheduled event defintions. This got missed with #15558 Refs #16035 * Add changelog * Move code to EventDefinitionHandler and add test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces an event limit for the "Filter and Aggregation" event definition. However, only if the user selects "Filter has results".
How this feature behaves:
Description
Motivation and Context
Graylog2/graylog-plugin-enterprise#5382
Types of changes