Merge remote-tracking branch 'origin/master' into add/collector-health-status

thll · thll · commit 68c1bdc70acb · 2026-07-31T15:14:31.000+02:00
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/ExpandedSectionToggleWrapper.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/ExpandedSectionToggleWrapper.tsx
@@ -15,24 +15,33 @@
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
 import React from 'react';
-import { styled } from 'styled-components';
+import { styled, css } from 'styled-components';
 
 import useExpandedSections from 'components/common/EntityDataTable/hooks/useExpandedSections';
 
-const StyledWrapper = styled.div`
-  cursor: pointer;
-`;
+const StyledWrapper = styled.div<{ $align?: 'right' }>(
+  ({ $align }) => css`
+    display: flex;
+    cursor: pointer;
+    height: 100%;
+    width: 100%;
+    align-items: center;
+    justify-content: ${$align === 'right' ? 'flex-end' : 'flex-start'};
+  `,
+);
 
 type Props = React.PropsWithChildren<{
   id: string;
+  align?: 'right';
+  section: string;
 }>;
 
-const ExpandedSectionToggleWrapper = ({ id, children = undefined }: Props) => {
+const ExpandedSectionToggleWrapper = ({ id, section, align = undefined, children = undefined }: Props) => {
   const { toggleSection } = useExpandedSections();
-  const _toggleSection = () => toggleSection(id, 'configuration');
+  const _toggleSection = () => toggleSection(id, section);
 
   return (
-    <StyledWrapper title="show details" onClick={_toggleSection}>
+    <StyledWrapper title="Show details" onClick={_toggleSection} $align={align}>
       {children}
     </StyledWrapper>
   );
diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/index.ts b/graylog2-web-interface/src/components/common/EntityDataTable/index.ts
@@ -17,8 +17,9 @@
 import EntityDataTable from './EntityDataTable';
 import MoreActions from './MoreActions';
 import type { ColumnRenderers, ColumnSchema } from './types';
+import ExpandedSectionToggleWrapper from './ExpandedSectionToggleWrapper';
 
 export { default as useTableEventHandlers } from './hooks/useTableEventHandlers';
 
-export { ColumnRenderers, ColumnSchema, MoreActions };
+export { ColumnRenderers, ColumnSchema, MoreActions, ExpandedSectionToggleWrapper };
 export default EntityDataTable;
diff --git a/graylog2-web-interface/src/components/common/Icon/Icon.tsx b/graylog2-web-interface/src/components/common/Icon/Icon.tsx
@@ -41,7 +41,7 @@ const spinAnimation = keyframes`
   }
 `;
 
-type ColorVariants = 'success' | 'warning';
+type ColorVariants = 'success' | 'warning' | 'info';
 
 const StyledSpan = styled.span<{
   $size: string;
diff --git a/graylog2-web-interface/src/components/common/MoreActions.tsx b/graylog2-web-interface/src/components/common/MoreActions.tsx
@@ -15,13 +15,11 @@
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
 import * as React from 'react';
-import styled from 'styled-components';
 
 import { DropdownButton } from 'components/bootstrap';
-import type { StyleProps } from 'components/bootstrap/Button';
 
-import Icon from './Icon';
 import type { SizeProp } from './Icon';
+import Icon from './Icon';
 
 type MoreActionsIconProps = {
   size?: SizeProp;
@@ -31,21 +29,17 @@ export const MoreActionsIcon = ({ size = undefined }: MoreActionsIconProps) => <
 type MoreActionsMenuProps = {
   'aria-label'?: string;
   size?: SizeProp;
-  bsStyle?: StyleProps;
   className?: string;
   id?: string;
   keepMounted?: boolean;
   pullRight?: boolean;
   title?: string;
   solid?: boolean;
 };
-const StyledDropdownButton = styled(DropdownButton)<{ $transparent?: boolean }>`
-  ${({ $transparent }) => ($transparent ? 'background-color: transparent;' : '')}
-`;
+
 export const MoreActionsMenu = ({
   'aria-label': ariaLabel,
   size = 'xs',
-  bsStyle = undefined,
   children = undefined,
   className = undefined,
   id = undefined,
@@ -54,10 +48,9 @@ export const MoreActionsMenu = ({
   title = 'More Actions',
   solid = false,
 }: React.PropsWithChildren<MoreActionsMenuProps>) => (
-  <StyledDropdownButton
-    $transparent={!solid}
+  <DropdownButton
     aria-label={ariaLabel}
-    bsStyle={bsStyle}
+    bsStyle={solid ? undefined : 'transparent'}
     buttonTitle={title}
     className={className}
     id={id}
@@ -67,5 +60,5 @@ export const MoreActionsMenu = ({
     title={<MoreActionsIcon size={size} />}
     withinPortal>
     {children}
-  </StyledDropdownButton>
+  </DropdownButton>
 );
diff --git a/graylog2-web-interface/src/components/event-definitions/event-definitions/SchedulingCell.tsx b/graylog2-web-interface/src/components/event-definitions/event-definitions/SchedulingCell.tsx
@@ -51,8 +51,8 @@ const DetailValue = styled.dd(
   `,
 );
 
-const DetailsButton = styled(Button)`
-  padding: 6px 8px;
+const DetailsOverlayTrigger = styled(OverlayTrigger)`
+  vertical-align: bottom;
 `;
 
 const getTimeRange = (scheduler: Scheduler) => {
@@ -144,17 +144,15 @@ const SchedulingInfo = ({
   return (
     <>
       {`Runs ${executeEveryFormatted}${searchWithinMessage} `}
-      <OverlayTrigger
+      <DetailsOverlayTrigger
         trigger="click"
         rootClose
         placement="left"
         title={`${title} details.`}
         overlay={detailsPopover(scheduler, clearNotifications)}
         width={500}>
-        <DetailsButton bsStyle="link">
-          <Icon name="info" />
-        </DetailsButton>
-      </OverlayTrigger>
+        <Icon name="info" title={`${title} details.`} bsStyle={'info'} />
+      </DetailsOverlayTrigger>
     </>
   );
 };
diff --git a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/hooks/useCustomColumnRenderers.tsx b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/hooks/useCustomColumnRenderers.tsx
@@ -17,10 +17,10 @@
 import React, { useMemo } from 'react';
 
 import type { FieldTypeOrigin } from 'components/indices/IndexSetFieldTypes/types';
-import ExpandedRowToggleWrapper from 'components/indices/IndexSetFieldTypes/originBadges/ExpandedRowToggleWrapper';
 import { Icon } from 'components/common';
 import useFieldTypesForMappings from 'views/logic/fieldactions/ChangeFieldType/hooks/useFieldTypesForMappings';
 import OriginCell from 'components/indices/IndexSetFieldTypes/originBadges/OriginCell';
+import { ExpandedSectionToggleWrapper } from 'components/common/EntityDataTable';
 
 const useCustomColumnRenderers = () => {
   const {
@@ -35,9 +35,9 @@ const useCustomColumnRenderers = () => {
         },
         origin: {
           renderCell: (origin: FieldTypeOrigin, { id }) => (
-            <ExpandedRowToggleWrapper id={id}>
+            <ExpandedSectionToggleWrapper id={id} section="overriddenProfile">
               <OriginCell origin={origin} />
-            </ExpandedRowToggleWrapper>
+            </ExpandedSectionToggleWrapper>
           ),
           staticWidth: 200,
         },
diff --git a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/originBadges/ExpandedRowToggleWrapper.tsx b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/originBadges/ExpandedRowToggleWrapper.tsx
diff --git a/graylog2-web-interface/src/components/inputs/InputsOveriew/ColumnRenderers.tsx b/graylog2-web-interface/src/components/inputs/InputsOveriew/ColumnRenderers.tsx
@@ -17,10 +17,11 @@
 import * as React from 'react';
 
 import type { ColumnRenderers } from 'components/common/EntityDataTable';
+import { ExpandedSectionToggleWrapper } from 'components/common/EntityDataTable';
 import type { InputSummary } from 'hooks/usePaginatedInputs';
 import type { InputTypesSummary } from 'hooks/useInputTypes';
 import type { InputStates } from 'hooks/useInputsStates';
-import { TypeCell, NodeCell, ThroughputCell, ExpandedSectionToggleWrapper } from 'components/inputs/InputsOveriew';
+import { TypeCell, NodeCell, ThroughputCell } from 'components/inputs/InputsOveriew';
 import FailuresCell from 'components/inputs/InputsOveriew/cells/FailuresCell';
 import MessageCountCell from 'components/inputs/InputsOveriew/cells/MessageCountCell';
 import ExtractorCountCell from 'components/inputs/InputsOveriew/cells/ExtractorCountCell';
@@ -30,6 +31,8 @@ import { InputStateBadge } from 'components/inputs';
 import Routes from 'routing/Routes';
 import { Link } from 'components/common';
 
+const EXPANDED_SECTION = 'configuration';
+
 type Props = {
   inputTypes: InputTypesSummary;
   inputStates?: InputStates;
@@ -39,7 +42,7 @@ const customColumnRenderers = ({ inputTypes, inputStates }: Props): ColumnRender
   attributes: {
     title: {
       renderCell: (_title: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION}>
           <Link to={Routes.SYSTEM.INPUT_DIAGNOSIS(input.id)} title={`show input diagnosis for ${input.title}`}>
             {input.title}
           </Link>
@@ -49,31 +52,31 @@ const customColumnRenderers = ({ inputTypes, inputStates }: Props): ColumnRender
     },
     type: {
       renderCell: (type: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION}>
           <TypeCell type={type} inputTypes={inputTypes} />
         </ExpandedSectionToggleWrapper>
       ),
       width: 0.5,
     },
     desired_state: {
       renderCell: (_state: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION}>
           <InputStateBadge input={input} inputStates={inputStates} />
         </ExpandedSectionToggleWrapper>
       ),
       staticWidth: 130,
     },
     node_id: {
       renderCell: (_type: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION}>
           <NodeCell input={input} />
         </ExpandedSectionToggleWrapper>
       ),
       staticWidth: 150,
     },
     traffic: {
       renderCell: (_traffic: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION} align="right">
           <ThroughputCell input={input} />
         </ExpandedSectionToggleWrapper>
       ),
@@ -82,7 +85,7 @@ const customColumnRenderers = ({ inputTypes, inputStates }: Props): ColumnRender
     },
     input_failures: {
       renderCell: (_failures: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION} align="right">
           <FailuresCell input={input} />
         </ExpandedSectionToggleWrapper>
       ),
@@ -91,15 +94,17 @@ const customColumnRenderers = ({ inputTypes, inputStates }: Props): ColumnRender
     },
     address: {
       renderCell: (_address: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION}>
           {input.attributes?.bind_address || 'N/A'}
         </ExpandedSectionToggleWrapper>
       ),
       staticWidth: 125,
     },
     port: {
       renderCell: (_port: string, input: InputSummary) => (
-        <ExpandedSectionToggleWrapper id={input.id}>{input.attributes?.port || 'N/A'}</ExpandedSectionToggleWrapper>
+        <ExpandedSectionToggleWrapper id={input.id} section={EXPANDED_SECTION} align="right">
+          {input.attributes?.port || 'N/A'}
+        </ExpandedSectionToggleWrapper>
       ),
       staticWidth: 'matchHeader',
     },
diff --git a/graylog2-web-interface/src/components/inputs/InputsOveriew/index.tsx b/graylog2-web-interface/src/components/inputs/InputsOveriew/index.tsx
@@ -25,7 +25,6 @@ export { default as FailuresCell } from './cells/FailuresCell';
 export { default as MessageCountCell } from './cells/MessageCountCell';
 export { default as ExtractorCountCell } from './cells/ExtractorCountCell';
 export { default as AssociatedStreamsCell } from './cells/AssociatedStreamsCell';
-export { default as ExpandedSectionToggleWrapper } from './ExpandedSectionToggleWrapper';
 export { default as ThroughputSection } from './expanded-sections/ThroughputSection';
 export { default as Connections } from './expanded-sections/Connections';
 export { default as NetworkIOStats } from './expanded-sections/NetworkIOStats';
diff --git a/graylog2-web-interface/src/views/components/searchbar/saved-search/SearchActionsMenu.tsx b/graylog2-web-interface/src/views/components/searchbar/saved-search/SearchActionsMenu.tsx
@@ -252,7 +252,7 @@ const SearchActionsMenu = () => {
         bsStyle="default"
         disabledInfo={isNew && 'Only saved searches can be shared.'}
       />
-      <MoreActionsMenu aria-label="Open search actions dropdown" id="search-actions-dropdown" pullRight>
+      <MoreActionsMenu aria-label="Open search actions dropdown" id="search-actions-dropdown" pullRight solid>
         <MenuItem onSelect={toggleMetadataEdit} disabled={!isAllowedToEdit} icon="edit">
           Edit metadata
         </MenuItem>
diff --git a/pom.xml b/pom.xml
@@ -183,15 +183,15 @@
         <lucene.version>10.5.0</lucene.version>
         <lz4.version>1.11.1</lz4.version>
         <metrics.version>4.2.39</metrics.version>
-        <mongodb-driver.version>5.9.0</mongodb-driver.version>
+        <mongodb-driver.version>5.9.1</mongodb-driver.version>
         <mongojack.version>5.1.0</mongojack.version>
         <natty.version>0.13</natty.version>
         <netty.version>4.2.16.Final</netty.version>
         <netty-tcnative-boringssl-static.version>2.0.81.Final</netty-tcnative-boringssl-static.version>
         <okhttp.version>5.4.0</okhttp.version>
         <opencsv.version>2.3</opencsv.version>
         <opentelemetry.version>1.64.0</opentelemetry.version>
-        <opentelemetry-instrumentation.version>2.29.0</opentelemetry-instrumentation.version>
+        <opentelemetry-instrumentation.version>2.30.0</opentelemetry-instrumentation.version>
         <opentelemetry-semconv.version>1.43.0</opentelemetry-semconv.version>
         <os-platform-finder.version>1.2.3</os-platform-finder.version>
         <pkts.version>3.0.18</pkts.version>
@@ -248,7 +248,7 @@
         <yarn.version>v1.22.22</yarn.version>
 
         <!-- Plugin versions -->
-        <license-maven.version>5.0.0</license-maven.version>
+        <license-maven.version>5.1.1</license-maven.version>
         <download-maven-plugin.version>1.6.8.1</download-maven-plugin.version>
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
@@ -989,7 +989,7 @@
                         <dependency>
                             <groupId>org.openrewrite</groupId>
                             <artifactId>rewrite-java</artifactId>
-                            <version>8.87.5</version>
+                            <version>8.87.7</version>
                         </dependency>
                         <dependency>
                             <groupId>org.openrewrite.recipe</groupId>

Original file line number	Diff line number	Diff line change
@@ -41,7 +41,7 @@ const spinAnimation = keyframes`
`41`	`41`	`}`
`42`	`42`	`;
`43`	`43`
`44`		`-type ColorVariants = 'success' \| 'warning';`
	`44`	`+type ColorVariants = 'success' \| 'warning' \| 'info';`
`45`	`45`
`46`	`46`	`const StyledSpan = styled.span<{`
`47`	`47`	`$size: string;`