Merge branch 'master' into 15003-ipfix-infinite-loop

Nithin-Kasam · Nithin-Kasam · commit 50384bee7adf · 2026-08-06T21:42:02.000+05:30
diff --git a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java
@@ -284,6 +284,7 @@ public Map<String, NodeInfo> nodesInfo() {
 
     private NodeInfo createNodeInfo(JsonNode nodesJson) {
         return NodeInfo.builder()
+                .name(nodesJson.at("/name").asText())
                 .version(nodesJson.at("/version").asText())
                 .os(nodesJson.at("/os"))
                 .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList())
diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java
@@ -293,6 +293,7 @@ public Map<String, NodeInfo> nodesInfo() {
 
     private NodeInfo createNodeInfo(JsonNode nodesJson) {
         return NodeInfo.builder()
+                .name(nodesJson.at("/name").asText())
                 .version(nodesJson.at("/version").asText())
                 .os(nodesJson.at("/os"))
                 .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList())
diff --git a/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java b/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java
@@ -315,6 +315,7 @@ public Map<String, org.graylog2.system.stats.elasticsearch.NodeInfo> nodesInfo()
 
     private org.graylog2.system.stats.elasticsearch.NodeInfo createNodeInfo(JsonNode nodesJson) {
         return org.graylog2.system.stats.elasticsearch.NodeInfo.builder()
+                .name(nodesJson.at("/name").asText())
                 .version(nodesJson.at("/version").asText())
                 .os(nodesJson.at("/os"))
                 .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList())
diff --git a/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java b/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java
@@ -30,6 +30,9 @@ public static Builder builder() {
         return new AutoValue_NodeInfo.Builder();
     }
 
+    @JsonProperty
+    public abstract String name();
+
     @JsonProperty
     public abstract String version();
 
@@ -44,6 +47,8 @@ public static Builder builder() {
 
     @AutoValue.Builder
     public abstract static class Builder {
+        public abstract Builder name(String name);
+
         public abstract Builder version(String version);
 
         public abstract Builder os(Object os);
diff --git a/graylog2-web-interface/docs/graylog-luma/package.json b/graylog2-web-interface/docs/graylog-luma/package.json
@@ -11,12 +11,12 @@
     "build-storybook": "storybook build"
   },
   "devDependencies": {
-    "@storybook/addon-docs": "^10.4.6",
+    "@storybook/addon-docs": "^10.5.5",
     "@storybook/addon-webpack5-compiler-swc": "^4.0.3",
-    "@storybook/react-webpack5": "^10.4.6",
-    "eslint-plugin-storybook": "^10.4.6",
+    "@storybook/react-webpack5": "^10.5.5",
+    "eslint-plugin-storybook": "^10.5.5",
     "mermaid": "^11.16.0",
-    "storybook": "^10.4.6",
+    "storybook": "^10.5.5",
     "storybook-dark-mode": "^5.0.0",
     "typescript": "^5.8.2"
   },
diff --git a/graylog2-web-interface/docs/graylog-luma/yarn.lock b/graylog2-web-interface/docs/graylog-luma/yarn.lock
diff --git a/graylog2-web-interface/docs/yarn.lock b/graylog2-web-interface/docs/yarn.lock
@@ -4178,9 +4178,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^8.13.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+  version "8.21.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.0.tgz#012e413fc07429945121b0c153158c4343086951"
+  integrity sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==
 
 y18n@^5.0.5:
   version "5.0.8"
diff --git a/graylog2-web-interface/packages/eslint-config-graylog/package.json b/graylog2-web-interface/packages/eslint-config-graylog/package.json
@@ -21,7 +21,7 @@
     "eslint-plugin-compat": "7.0.2",
     "eslint-plugin-graylog": "file:../eslint-plugin-graylog",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jest": "29.15.3",
+    "eslint-plugin-jest": "29.16.0",
     "eslint-plugin-jest-dom": "5.5.0",
     "eslint-plugin-jest-formatting": "3.1.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
diff --git a/graylog2-web-interface/packages/graylog-web-plugin/package.json b/graylog2-web-interface/packages/graylog-web-plugin/package.json
@@ -28,15 +28,15 @@
   "dependencies": {
     "@graylog/sawmill": "4.0.10",
     "@reduxjs/toolkit": "^2.5.1",
-    "@tanstack/react-query": "5.101.2",
+    "@tanstack/react-query": "5.101.3",
     "@types/react": "18.3.13",
     "eslint-config-graylog": "file:../eslint-config-graylog",
     "formik": "2.4.9",
     "history": "^5.3.0",
     "html-webpack-plugin": "^5.5.0",
     "jest-preset-graylog": "file:../jest-preset-graylog",
     "moment": "2.30.1",
-    "moment-timezone": "0.6.2",
+    "moment-timezone": "0.6.3",
     "react": "18.3.1",
     "react-dom": "18.2.0",
     "react-redux": "^9.2.0",
@@ -47,7 +47,7 @@
     "typescript": "6.0.3",
     "use-query-params": "^2.2.0",
     "webpack": "5.108.1",
-    "webpack-cli": "7.1.0",
+    "webpack-cli": "7.2.1",
     "webpack-merge": "^6.0.1"
   },
   "eslintConfig": {
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/Constants.ts b/graylog2-web-interface/src/components/common/EntityDataTable/Constants.ts
@@ -28,6 +28,8 @@ export const BULK_SELECT_COL_ID = 'bulk-select';
 
 export const ACTIONS_COL_ID = 'actions';
 
+export const RESIZE_HIT_AREA_OVERHANG = 7;
+
 export const UTILITY_COLUMNS = new Set([BULK_SELECT_COL_ID, ACTIONS_COL_ID]);
 
 export const ATTRIBUTE_STATUS = {
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx
@@ -355,6 +355,7 @@ const EntityDataTable = <Entity extends EntityBase, Meta = unknown>({
                     $scrollContainerWidth={scrollContainerWidth}>
                     <InnerContainer>
                       <Table<Entity>
+                        columnWidths={columnWidths}
                         expandedSectionRenderers={expandedSectionRenderers}
                         headerGroups={headerGroups}
                         rowOverride={rowOverride}
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/Table.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/Table.tsx
@@ -58,11 +58,13 @@ const StyledTable = styled(BaseTable)(
 
 const Td = styled.td<{
   $colId: string;
+  $hideEmptyTailBorder: boolean;
   $hidePadding: boolean;
+  $isLastVisibleColumn: boolean;
   $pinningPosition: ColumnPinningPosition;
   $textAlign: string;
 }>(
-  ({ $colId, $hidePadding, $pinningPosition, $textAlign }) => css`
+  ({ $colId, $hideEmptyTailBorder, $hidePadding, $isLastVisibleColumn, $pinningPosition, $textAlign, theme }) => css`
     word-break: break-word;
     ${$textAlign &&
     css`
@@ -94,17 +96,33 @@ const Td = styled.td<{
         padding: 0;
       }
     `}
+
+    ${$hideEmptyTailBorder &&
+    css`
+      &&& {
+        border-right: none;
+      }
+    `}
+
+    ${$isLastVisibleColumn &&
+    css`
+      && {
+        border-right-color: ${theme.colors.table.row.divider};
+      }
+    `}
   `,
 );
 
 type Props<Entity extends EntityBase> = {
+  columnWidths: { [colId: string]: number };
   expandedSectionRenderers: ExpandedSectionRenderers<Entity> | undefined;
   rowOverride?: RowOverride<Entity>;
   headerGroups: Array<HeaderGroup<Entity>>;
   rows: Array<Row<Entity>>;
 };
 
 const Table = <Entity extends EntityBase>({
+  columnWidths,
   expandedSectionRenderers,
   rowOverride = undefined,
   headerGroups,
@@ -114,9 +132,13 @@ const Table = <Entity extends EntityBase>({
 
   const isRowExpanded = (rowId: string) => !!expandedSections?.[rowId];
 
+  const isTailColumnEmpty = !columnWidths[ACTIONS_COL_ID];
+  const leafHeaders = headerGroups[headerGroups.length - 1]?.headers ?? [];
+  const lastVisibleColumnId = isTailColumnEmpty ? leafHeaders[leafHeaders.length - 2]?.column.id : undefined;
+
   return (
     <StyledTable condensed bordered>
-      <TableHead headerGroups={headerGroups} />
+      <TableHead columnWidths={columnWidths} headerGroups={headerGroups} />
       {rows.map((row) => {
         const visibleCells = row.getVisibleCells();
         const visibleCellCount = visibleCells.length;
@@ -127,6 +149,8 @@ const Table = <Entity extends EntityBase>({
             <Td
               key={cell.id}
               $colId={cell.column.id}
+              $hideEmptyTailBorder={cell.column.id === ACTIONS_COL_ID && isTailColumnEmpty}
+              $isLastVisibleColumn={cell.column.id === lastVisibleColumnId}
               $pinningPosition={cell.column.getIsPinned()}
               $hidePadding={columnMeta?.hideCellPadding}
               $textAlign={columnMeta?.columnRenderer?.textAlign}>
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/TableHead.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/TableHead.tsx
@@ -27,7 +27,7 @@ import {
   columnTransition,
   displayScrollRightIndicatorVar,
 } from 'components/common/EntityDataTable/CSSVariables';
-import { ACTIONS_COL_ID } from 'components/common/EntityDataTable/Constants';
+import { ACTIONS_COL_ID, RESIZE_HIT_AREA_OVERHANG } from 'components/common/EntityDataTable/Constants';
 import ScrollShadow from 'theme/box-shadows/ScrollShadow';
 import useForceUpdate from 'util/hooks/useForceUpdate';
 import zIndices from 'theme/z-indices';
@@ -46,12 +46,23 @@ const Thead = styled.thead(
 
 export const Th = styled.th<{
   $colId: string;
+  $hideEmptyTailBorder: boolean;
+  $hideEmptyTailPinShadow: boolean;
   $hidePadding: boolean;
   $pinningPosition: ColumnPinningPosition;
   $revealHeaderActions: boolean;
   $zIndex: number;
 }>(
-  ({ $colId, $hidePadding, $pinningPosition, $revealHeaderActions, $zIndex, theme }) => css`
+  ({
+    $colId,
+    $hideEmptyTailBorder,
+    $hideEmptyTailPinShadow,
+    $hidePadding,
+    $pinningPosition,
+    $revealHeaderActions,
+    $zIndex,
+    theme,
+  }) => css`
     position: relative;
     padding: 0 !important;
     z-index: ${$pinningPosition ? zIndices.tableHeaderCellPinned : $zIndex};
@@ -78,6 +89,7 @@ export const Th = styled.th<{
           position: sticky;
           ${$pinningPosition === 'left' ? 'left' : 'right'}: 0;
           ${$pinningPosition === 'right' &&
+          !$hideEmptyTailPinShadow &&
           css`
             box-shadow: inset -1px 0 0 ${theme.colors.table.row.divider};
           `}
@@ -99,16 +111,23 @@ export const Th = styled.th<{
         display: var(${displayScrollRightIndicatorVar}, none);
       }
     `}
+
+    ${$hideEmptyTailBorder &&
+    css`
+      && {
+        border-right: none;
+      }
+    `}
   `,
 );
 
-const ResizeHitArea = styled.div<{ $isResizing: boolean }>(
-  ({ theme, $isResizing }) => css`
+const ResizeHitArea = styled.div<{ $isResizing: boolean; $constrainOverhang: boolean }>(
+  ({ theme, $isResizing, $constrainOverhang }) => css`
     position: absolute;
     top: 0;
     bottom: 0;
-    right: -7px;
-    width: 14px;
+    right: ${$constrainOverhang ? 0 : -RESIZE_HIT_AREA_OVERHANG}px;
+    width: ${RESIZE_HIT_AREA_OVERHANG * ($constrainOverhang ? 1 : 2)}px;
     cursor: col-resize;
     touch-action: none;
     user-select: none;
@@ -119,12 +138,18 @@ const ResizeHitArea = styled.div<{ $isResizing: boolean }>(
       position: absolute;
       top: 0;
       bottom: 0;
-      left: 50%;
       width: 3px;
       transform: translateX(-50%);
       background-color: ${theme.colors.variant.info};
       opacity: ${$isResizing ? 1 : 0};
       transition: opacity 0.15s ease-in-out;
+      ${$constrainOverhang
+        ? css`
+            right: -2px;
+          `
+        : css`
+            left: 50%;
+          `};
     }
 
     &:hover::after {
@@ -141,8 +166,17 @@ const ResizeCursorGlobalStyle = createGlobalStyle`
   }
 `;
 
-const TableHeaderCell = <Entity extends EntityBase>({ header }: { header: Header<Entity, unknown> }) => {
+const TableHeaderCell = <Entity extends EntityBase>({
+  header,
+  isTailColumnEmpty,
+  constrainResizeOverhang,
+}: {
+  header: Header<Entity, unknown>;
+  isTailColumnEmpty: boolean;
+  constrainResizeOverhang: boolean;
+}) => {
   const columnMeta = header.column.columnDef.meta as ColumnMetaContext<Entity>;
+  const isActionsColumn = header.column.id === ACTIONS_COL_ID;
   const forceUpdate = useForceUpdate();
   const [isHoveringResizeHandle, setIsHoveringResizeHandle] = useState(false);
 
@@ -170,6 +204,8 @@ const TableHeaderCell = <Entity extends EntityBase>({ header }: { header: Header
       key={header.id}
       colSpan={header.colSpan}
       $colId={header.column.id}
+      $hideEmptyTailBorder={isActionsColumn && isTailColumnEmpty}
+      $hideEmptyTailPinShadow={isActionsColumn && !header.column.columnDef.header}
       $hidePadding={columnMeta?.hideCellPadding}
       $pinningPosition={header.column.getIsPinned()}
       $zIndex={zIndices.tableHeaderCell - header.index}
@@ -182,6 +218,7 @@ const TableHeaderCell = <Entity extends EntityBase>({ header }: { header: Header
           onMouseEnter={() => setIsHoveringResizeHandle(true)}
           onMouseLeave={() => setIsHoveringResizeHandle(false)}
           $isResizing={header.column.getIsResizing()}
+          $constrainOverhang={constrainResizeOverhang}
           role="separator"
           aria-label={`Resize ${columnMeta?.label ?? header.column.id} column`}
           title={`Resize ${columnMeta?.label ?? header.column.id} column`}
@@ -192,20 +229,30 @@ const TableHeaderCell = <Entity extends EntityBase>({ header }: { header: Header
 };
 
 type Props<Entity extends EntityBase> = {
+  columnWidths: { [colId: string]: number };
   headerGroups: Array<HeaderGroup<Entity>>;
 };
 
-const TableHead = <Entity extends EntityBase>({ headerGroups }: Props<Entity>) => (
-  <Thead>
-    <ResizeCursorGlobalStyle />
-    {headerGroups.map((headerGroup) => (
-      <tr key={headerGroup.id}>
-        {headerGroup.headers.map((header) => (
-          <TableHeaderCell key={header.id} header={header} />
-        ))}
-      </tr>
-    ))}
-  </Thead>
-);
+const TableHead = <Entity extends EntityBase>({ columnWidths, headerGroups }: Props<Entity>) => {
+  const isTailColumnEmpty = !columnWidths[ACTIONS_COL_ID];
+
+  return (
+    <Thead>
+      <ResizeCursorGlobalStyle />
+      {headerGroups.map((headerGroup) => (
+        <tr key={headerGroup.id}>
+          {headerGroup.headers.map((header, index) => (
+            <TableHeaderCell
+              key={header.id}
+              header={header}
+              isTailColumnEmpty={isTailColumnEmpty}
+              constrainResizeOverhang={isTailColumnEmpty && index === headerGroup.headers.length - 2}
+            />
+          ))}
+        </tr>
+      ))}
+    </Thead>
+  );
+};
 
 export default TableHead;
diff --git a/graylog2-web-interface/src/components/common/StatCard/StatCard.tsx b/graylog2-web-interface/src/components/common/StatCard/StatCard.tsx
diff --git a/graylog2-web-interface/src/components/common/index.tsx b/graylog2-web-interface/src/components/common/index.tsx
diff --git a/graylog2-web-interface/yarn.lock b/graylog2-web-interface/yarn.lock
diff --git a/pom.xml b/pom.xml
