Merge branch '6.0' into backport-6.0/add-system-cache-entities

Graylog2 · Feb 5, 2025 · 38eb4ed · 38eb4ed
2 parents 1074621 + 5104619
commit 38eb4ed
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 27 deletions.
diff --git a/changelog/6.0.11/.gitkeep b/changelog/6.0.11/.gitkeep
@@ -0,0 +1 @@
+# Keep the directory in Git
diff --git a/changelog/unreleased/issue-19058.toml → changelog/6.0.11/issue-19058.toml b/changelog/unreleased/issue-19058.toml → changelog/6.0.11/issue-19058.toml
diff --git a/changelog/6.0.11/issue-20465.toml b/changelog/6.0.11/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"]
diff --git a/changelog/unreleased/issue-21185.toml → changelog/6.0.11/issue-21185.toml b/changelog/unreleased/issue-21185.toml → changelog/6.0.11/issue-21185.toml
diff --git a/changelog/unreleased/pr-21206.toml → changelog/6.0.11/pr-21206.toml b/changelog/unreleased/pr-21206.toml → changelog/6.0.11/pr-21206.toml
diff --git a/data-node/pom.xml b/data-node/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-project-parent</relativePath>
     </parent>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>graylog-parent</artifactId>
         <groupId>org.graylog</groupId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/full-backend-tests/pom.xml b/full-backend-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-project-parent</relativePath>
     </parent>
 

diff --git a/graylog-plugin-archetype/pom.xml b/graylog-plugin-archetype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-project-parent</relativePath>
     </parent>
 

diff --git a/graylog-plugin-parent/graylog-plugin-web-parent/pom.xml b/graylog-plugin-parent/graylog-plugin-web-parent/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.graylog.plugins</groupId>
         <artifactId>graylog-plugin-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>graylog-plugin-web-parent</artifactId>

diff --git a/graylog-plugin-parent/pom.xml b/graylog-plugin-parent/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
     </parent>
 
     <groupId>org.graylog.plugins</groupId>

diff --git a/graylog-project-parent/pom.xml b/graylog-project-parent/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>graylog-project-parent</artifactId>

diff --git a/graylog-storage-elasticsearch7/pom.xml b/graylog-storage-elasticsearch7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.graylog.plugins</groupId>
         <artifactId>graylog-plugin-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-plugin-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/graylog-storage-opensearch2/pom.xml b/graylog-storage-opensearch2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.graylog.plugins</groupId>
         <artifactId>graylog-plugin-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-plugin-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/graylog2-server/pom.xml b/graylog2-server/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
-        <version>6.0.11-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../graylog-project-parent</relativePath>
     </parent>
 

diff --git a/graylog2-web-interface/manifests/package.json b/graylog2-web-interface/manifests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graylog-web-manifests",
-  "version": "6.0.11-SNAPSHOT",
+  "version": "6.0.12-SNAPSHOT",
   "description": "Manifests needed to reuse vendor & shared bundles in graylog web interface plugins",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/graylog2-web-interface/package.json b/graylog2-web-interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graylog-web-interface",
-  "version": "6.0.11-SNAPSHOT",
+  "version": "6.0.12-SNAPSHOT",
   "description": "Graylog Web Interface",
   "author": "torch",
   "license": "SSPL-1.0",

diff --git a/graylog2-web-interface/packages/graylog-web-plugin/package.json b/graylog2-web-interface/packages/graylog-web-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graylog-web-plugin",
-  "version": "6.0.11-SNAPSHOT",
+  "version": "6.0.12-SNAPSHOT",
   "description": "Helper code for streamlining Graylog web interface plugin development",
   "main": "index.js",
   "repository": {

diff --git a/graylog2-web-interface/src/views/logic/views/UseCreateSavedSearch.ts b/graylog2-web-interface/src/views/logic/views/UseCreateSavedSearch.ts
@@ -21,20 +21,23 @@ import type { ElasticsearchQueryString, TimeRange } from 'views/logic/queries/Qu
 import ViewGenerator from 'views/logic/views/ViewGenerator';
 import type Parameter from 'views/logic/parameters/Parameter';
 
+type Props = {
+  streamId?: string | string[],
+  timeRange?: TimeRange,
+  queryString?: ElasticsearchQueryString,
+  parameters?: Array<Parameter>,
+}
+
+type Deps = Array<Props[keyof Props]> | [];
 const useCreateSavedSearch = ({
   streamId,
   timeRange,
   queryString,
   parameters,
-}:{
-  streamId?: string | string[],
-  timeRange?: TimeRange,
-  queryString?: ElasticsearchQueryString,
-  parameters?: Array<Parameter>,
-}) => useMemo(
+}:Props, deps: Deps = []) => useMemo(
   () => ViewGenerator({ type: View.Type.Search, streamId, timeRange, queryString, parameters }),
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  [],
+  deps,
 );
 
 export default useCreateSavedSearch;
diff --git a/graylog2-web-interface/src/views/pages/StreamSearchPage.test.tsx b/graylog2-web-interface/src/views/pages/StreamSearchPage.test.tsx
@@ -87,27 +87,28 @@ describe('StreamSearchPage', () => {
       queryString: undefined,
       streamId: 'stream-id-1',
       timeRange: undefined,
-    }));
+    }, [streamId]));
   });
 
-  it('should recreate view when streamId passed from props changes', async () => {
+  it('should rerender hook when streamId passed from props changes', async () => {
     const { rerender } = render(<SimpleStreamSearchPage />);
 
     await waitFor(() => expect(useCreateSavedSearch).toHaveBeenCalledWith({
       queryString: undefined,
       streamId: 'stream-id-1',
       timeRange: undefined,
-    }));
+    }, [streamId]));
 
-    asMock(useParams).mockReturnValue({ streamId: 'stream-id-2' });
+    const secondStream = 'stream-id-2';
+    asMock(useParams).mockReturnValue({ streamId: secondStream });
 
     rerender(<SimpleStreamSearchPage />);
 
     await waitFor(() => expect(useCreateSavedSearch).toHaveBeenLastCalledWith({
       queryString: undefined,
       streamId: 'stream-id-2',
       timeRange: undefined,
-    }));
+    }, [secondStream]));
   });
 
   describe('loading another view', () => {

diff --git a/graylog2-web-interface/src/views/pages/StreamSearchPage.tsx b/graylog2-web-interface/src/views/pages/StreamSearchPage.tsx
@@ -35,7 +35,7 @@ const StreamSearchPage = () => {
   }
 
   const { timeRange, queryString } = useSearchURLQueryParams();
-  const viewPromise = useCreateSavedSearch({ streamId, timeRange, queryString });
+  const viewPromise = useCreateSavedSearch({ streamId, timeRange, queryString }, [streamId]);
   const view = useCreateSearch(viewPromise);
 
   const _loadNewView = useCallback(() => loadNewViewForStream(history, streamId), [history, streamId]);

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.graylog</groupId>
     <artifactId>graylog-parent</artifactId>
-    <version>6.0.11-SNAPSHOT</version>
+    <version>6.0.12-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Graylog Parent POM</name>