Merge branch 'master' into feature/datanode_logs_support_bundle

.github/workflows/fix-linter-hints.yml

@@ -36,6 +36,9 @@ jobs:
         continue-on-error: true
         working-directory: graylog2-web-interface
         run: yarn lint --fix -o /tmp/report.json -f json
+      - name: Run prettier
+        working-directory: graylog2-web-interface
+        run: yarn format
       - name: Run lint:styles --fix
         continue-on-error: true
         working-directory: graylog2-web-interface
@@ -54,7 +57,7 @@ jobs:
           author: Dr. Lint-a-lot <[email protected]>
           branch: fix/linter-hints
           committer: Dr. Lint-a-lot <[email protected]>
-          commit-message: Running lint --fix
+          commit-message: Running lint --fix & prettier
           delete-branch: true
 
       - name: Get headRef and SHA of PR

UPGRADING.md

@@ -4,10 +4,11 @@ Upgrading to Graylog 6.2.x
 ## Breaking Changes
 
 ### Plugins
-
-Adjustment of `enterpriseWidgets` web interface plugin. The `editComponent` attribute now no longer has a `onSubmit` prop.
-Before this change the prop had to be called to close the widget edit mode. Now it is enough to call `applyAllWidgetChanges` from the `WidgetEditApplyAllChangesContext`.
-Alternatively the `SaveOrCancelButtons` component can be used in the edit component for custom widgets. It renders a cancel and submit button and calls `applyAllWidgetChanges` on submit.
+* This release includes Java API changes which might require plugin authors to adjust their code. Please check
+  [Java API Changes](#java-api-changes) for details.
+* Adjustment of `enterpriseWidgets` web interface plugin. The `editComponent` attribute now no longer has a `onSubmit` prop.
+  Before this change the prop had to be called to close the widget edit mode. Now it is enough to call `applyAllWidgetChanges` from the `WidgetEditApplyAllChangesContext`.
+  Alternatively the `SaveOrCancelButtons` component can be used in the edit component for custom widgets. It renders a cancel and submit button and calls `applyAllWidgetChanges` on submit.
 
 ## Configuration File Changes
 
@@ -21,7 +22,12 @@ Alternatively the `SaveOrCancelButtons` component can be used in the edit compon
 
 ## Java API Changes
 
-The following Java Code API changes have been made.
+Upgraded [MongoJack](https://github.com/mongojack/mongojack) to version 5.x. This impacts the Java API for accessing
+documents in MongoDB. Some previously deprecated MongoJack classes (like `org.mongojack.DBQuery`) have been removed.
+Plugin authors will have to replace usages of removed classes to corresponding classes from the MongoDB driver
+packages, most prominently `com.mongodb.client.model.Filters`.
+
+Additionally, the following Java Code API changes are included in this release:
 
 | File/method                                    | Description |
 |------------------------------------------------|-------------|

changelog/unreleased/issue-20423.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Fixing keyboard shortcut conflicts for opening query history by changing it to ctrl+space on win and linux os"
+
+issues = ["20423"]
+pulls = ["21336"]

changelog/unreleased/issue-20465.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Fixed the issue when the streams link in the message table was not working on the streams page."
+
+issues=["20465"]
+pulls = ["21338"]

changelog/unreleased/issue-21321.toml

@@ -0,0 +1,5 @@
+type = "added"
+message = "Added overview-page for access-tokens, accessible by admins."
+
+issues = ["21321", "21396"]
+pulls = ["21315"]

changelog/unreleased/issue-21322.toml

@@ -0,0 +1,5 @@
+type="a"
+message="Added new Configuration to define default for allowing access tokens for external users."
+
+issues=["21322"]
+pulls=["21438"]

changelog/unreleased/issue-9368.toml

@@ -0,0 +1,5 @@
+type = "fixed"
+message = "Fixed query validation with parameter usage. Parameters representing field names do not cause 'unknown field' warnings anymore."
+
+issues = ["9368"]
+pulls = ["21469"]

changelog/unreleased/pr-21136.toml

@@ -0,0 +1,4 @@
+type = "a"
+message = "Adding advanced field type for event definitions, looking up titles in aggregations and message table."
+
+pulls = ["21136"]

changelog/unreleased/pr-21359.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Fix error when clicking the Replay search link in event definition summary in edit modal on security events page"
+
+issues = ["graylog-plugin-enterprise#9289"]
+pulls = ["21359"]

changelog/unreleased/pr-21376.toml

@@ -0,0 +1,5 @@
+type = "fixed"
+message = "Improve readability of filter preview error message in event definition wizard (dark mode)."
+
+issues = ["Graylog2/graylog-plugin-enterprise#9336"]
+pulls = ["21376"]

changelog/unreleased/pr-21456.toml

@@ -0,0 +1,5 @@
+type = "added"
+message = "Added escape character handling to the key_value pipeline function."
+
+pulls = ["21456"]
+issues = ["graylog-plugin-enterprise#9552"]

changelog/unreleased/pr-21467.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "UI Framework for deprecating pipeline functions"
+
+pulls = ["21467"]
+issues = ["19287"]

changelog/unreleased/pr-21493.toml

@@ -0,0 +1,4 @@
+type = "c"
+message = "Upgraded MongoJack dependency to `5.0.2`. This might require changes to third-party plugins. Please check Graylog upgrade notes."
+
+pulls = ["21493"]

changelog/unreleased/pr-21538.toml

@@ -0,0 +1,5 @@
+type = "fixed"
+message = "Upgrade AWS Kinesis client libary to version 6.1.0 to fix potential shard processing issues."
+
+issues = ["21451"]
+pulls = ["21538"]

graylog-project-parent/pom.xml

@@ -483,6 +483,14 @@
                         <groupId>org.apache.directory.api</groupId>
                         <artifactId>api-ldap-schema-data</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcpkix-jdk15on</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>