Merge branch 'master' into update-stream-telemetry

changelog/unreleased/issue-13822.toml

@@ -0,0 +1,9 @@
+type = "fixed"
+message = "Fix link target for search query error documentation links."
+
+issues = ["13822"]
+pulls = ["20563"]
+
+details.user = """
+The documentation link now points to the error types section again, instead of just the search query page.
+"""

changelog/unreleased/pr-20558.toml

@@ -0,0 +1,5 @@
+type = "c" # One of: a(dded), c(hanged), d(eprecated), r(emoved), f(ixed), s(ecurity)
+message = "API endpoint for listing users will not return an error anymore when user is lacking permission, but return current user only instead."
+
+issues = []
+pulls = ["20558"]

graylog-plugin-archetype/pom.xml

@@ -46,7 +46,7 @@
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-packaging</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
             </extension>
         </extensions>
 
@@ -84,7 +84,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

graylog-project-parent/pom.xml

@@ -614,7 +614,7 @@
                                 <plugin>
                                     <groupId>com.mebigfatguy.fb-contrib</groupId>
                                     <artifactId>fb-contrib</artifactId>
-                                    <version>7.6.4</version>
+                                    <version>7.6.5</version>
                                 </plugin>
                             </plugins>
                         </configuration>

graylog2-server/src/main/java/org/graylog2/outputs/BatchedMessageFilterOutput.java

@@ -32,6 +32,8 @@
 import org.graylog2.plugin.outputs.FilteredMessageOutput;
 import org.graylog2.plugin.outputs.MessageOutput;
 import org.graylog2.shared.messageq.MessageQueueAcknowledger;
+import org.graylog2.system.shutdown.GracefulShutdownHook;
+import org.graylog2.system.shutdown.GracefulShutdownService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +56,7 @@
  * registered {@link FilteredMessageOutput} outputs.
  */
 @Singleton
-public class BatchedMessageFilterOutput implements MessageOutput {
+public class BatchedMessageFilterOutput implements MessageOutput, GracefulShutdownHook {
     private static final Logger LOG = LoggerFactory.getLogger(BatchedMessageFilterOutput.class);
 
     private final Map<String, FilteredMessageOutput> outputs;
@@ -72,8 +74,9 @@ public class BatchedMessageFilterOutput implements MessageOutput {
     private final MessageQueueAcknowledger acknowledger;
     private final Meter outputWriteFailures;
     private final Timer processTime;
-    private ScheduledFuture<?> flushTask;
+    private final GracefulShutdownService gracefulShutdownService;
     private final IndexSetAwareMessageOutputBuffer buffer;
+    private ScheduledFuture<?> flushTask;
 
     @Inject
     public BatchedMessageFilterOutput(Map<String, FilteredMessageOutput> outputs,
@@ -82,6 +85,7 @@ public BatchedMessageFilterOutput(Map<String, FilteredMessageOutput> outputs,
                                       Cluster cluster,
                                       MessageQueueAcknowledger acknowledger,
                                       IndexSetAwareMessageOutputBuffer indexSetAwareMessageOutputBuffer,
+                                      GracefulShutdownService gracefulShutdownService,
                                       @Named("output_flush_interval") int outputFlushInterval,
                                       @Named("shutdown_timeout") int shutdownTimeoutMs,
                                       @Named("daemonScheduler") ScheduledExecutorService daemonScheduler) {
@@ -105,6 +109,7 @@ public BatchedMessageFilterOutput(Map<String, FilteredMessageOutput> outputs,
         this.bufferFlushesRequested = metricRegistry.meter(name(this.getClass(), "bufferFlushesRequested"));
         this.processTime = metricRegistry.timer(name(this.getClass(), "processTime"));
         this.outputWriteFailures = metricRegistry.meter(name(this.getClass(), "outputWriteFailures"));
+        this.gracefulShutdownService = gracefulShutdownService;
     }
 
     @Override
@@ -119,6 +124,7 @@ public void initialize() throws Exception {
                 LOG.error("Caught exception while trying to flush outputs", e);
             }
         }, outputFlushInterval.toMillis(), outputFlushInterval.toMillis(), TimeUnit.MILLISECONDS);
+        gracefulShutdownService.register(this);
     }
 
     @VisibleForTesting
@@ -211,6 +217,16 @@ void cancelFlushTask() {
     @Override
     public void stop() {
         LOG.debug("Stopping output filter");
+        doGracefulShutdown();
+        try {
+            gracefulShutdownService.unregister(this);
+        } catch (IllegalStateException e) {
+            LOG.debug("Couldn't unregister from graceful shutdown service: {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public void doGracefulShutdown() {
         cancelFlushTask();
 
         if (cluster.isConnected() && cluster.isDeflectorHealthy()) {

graylog2-server/src/main/java/org/graylog2/rest/resources/users/UsersResource.java

@@ -34,6 +34,7 @@
 import org.apache.shiro.mgt.DefaultSecurityManager;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
+import org.graylog.plugins.views.search.permissions.SearchUser;
 import org.graylog.security.UserContext;
 import org.graylog.security.authservice.AuthServiceBackendDTO;
 import org.graylog.security.authservice.GlobalAuthServiceConfig;
@@ -233,17 +234,23 @@ private UserSummary returnSummary(UserContext userContext, User user) {
      */
     @GET
     @Deprecated
-    @RequiresPermissions(RestPermissions.USERS_LIST)
     @ApiOperation(value = "List all users", notes = "Permissions and session data included by default")
     public UserList listUsers(
             @ApiParam(name = "include_permissions") @QueryParam("include_permissions") @DefaultValue("true") boolean includePermissions,
-            @ApiParam(name = "include_sessions") @QueryParam("include_sessions") @DefaultValue("true") boolean includeSessions) {
-        return listUsersSelective(includePermissions, includeSessions);
+            @ApiParam(name = "include_sessions") @QueryParam("include_sessions") @DefaultValue("true") boolean includeSessions,
+            @Context SearchUser searchUser) {
+        final Optional<AllUserSessions> optSessions = includeSessions ? Optional.of(AllUserSessions.create(sessionService)) : Optional.empty();
+        return searchUser.isPermitted(RestPermissions.USERS_LIST) ?
+                listUsersSelective(includePermissions, optSessions) :
+                listForLoggedInUser(searchUser, includePermissions, optSessions);
     }
 
-    private UserList listUsersSelective(boolean includePermissions, boolean includeSessions) {
+    private UserList listForLoggedInUser(final SearchUser searchUser, final boolean includePermissions, Optional<AllUserSessions> optSessions) {
+        return UserList.create(List.of(toUserResponse(searchUser.getUser(), includePermissions, optSessions)));
+    }
+
+    private UserList listUsersSelective(final boolean includePermissions, final Optional<AllUserSessions> optSessions) {
         final List<User> users = userManagementService.loadAll();
-        final Optional<AllUserSessions> optSessions = includeSessions ? Optional.of(AllUserSessions.create(sessionService)) : Optional.empty();
 
         final List<UserSummary> resultUsers = Lists.newArrayListWithCapacity(users.size() + 1);
         userManagementService.getRootUser().ifPresent(adminUser ->

graylog2-server/src/main/resources/log4j2.xml

@@ -38,6 +38,7 @@
         <Logger name="org.apache.hadoop" level="warn"/>
         <Logger name="org.apache.parquet.hadoop.InternalParquetRecordReader" level="warn"/>
         <Logger name="org.apache.avro.Schema" level="error"/>
+        <Logger name="org.openqa.selenium.devtools.Connection" level="warn"/>
         <Root level="info">
             <AppenderRef ref="STDOUT"/>
             <AppenderRef ref="graylog-internal-logs"/>

graylog2-server/src/test/java/org/graylog2/outputs/BatchedMessageFilterOutputTest.java

@@ -36,6 +36,7 @@
 import org.graylog2.shared.SuppressForbidden;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.graylog2.shared.messageq.MessageQueueAcknowledger;
+import org.graylog2.system.shutdown.GracefulShutdownService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -75,6 +76,8 @@ class BatchedMessageFilterOutputTest {
     private IndexSet indexSet;
     @Mock(extraInterfaces = MessageOutput.class)
     private FilteredMessageOutput targetOutput1;
+    @Mock
+    private GracefulShutdownService gracefulShutdownService;
 
     private static final int MESSAGES_PER_BATCH = 3;
 
@@ -129,6 +132,7 @@ void setUp() {
                 cluster,
                 acknowledger,
                 buffer,
+                gracefulShutdownService,
                 outputFlushInterval,
                 shutdownTimeoutMs,
                 Executors.newSingleThreadScheduledExecutor()

graylog2-web-interface/packages/eslint-config-graylog/package.json

@@ -15,8 +15,8 @@
   "dependencies": {
     "@babel/eslint-parser": "7.16.5",
     "@tanstack/eslint-plugin-query": "4.36.1",
-    "@typescript-eslint/eslint-plugin": "7.16.1",
-    "@typescript-eslint/parser": "7.16.1",
+    "@typescript-eslint/eslint-plugin": "8.7.0",
+    "@typescript-eslint/parser": "8.7.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-import-resolver-webpack": "0.13.9",
@@ -27,7 +27,7 @@
     "eslint-plugin-jest-dom": "5.4.0",
     "eslint-plugin-jest-formatting": "3.1.0",
     "eslint-plugin-jsx-a11y": "6.10.0",
-    "eslint-plugin-react": "7.36.1",
+    "eslint-plugin-react": "7.37.0",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-testing-library": "6.3.0"
   }

graylog2-web-interface/packages/graylog-web-plugin/package.json

@@ -33,7 +33,7 @@
     "@tanstack/react-query": "4.36.1",
     "@types/create-react-class": "15.6.8",
     "@types/jquery": "3.5.31",
-    "@types/react": "18.3.8",
+    "@types/react": "18.3.10",
     "babel-preset-graylog": "file:../babel-preset-graylog",
     "create-react-class": "15.7.0",
     "eslint-config-graylog": "file:../eslint-config-graylog",

graylog2-web-interface/src/components/event-definitions/event-definition-types/AggregationForm.tsx

@@ -37,6 +37,7 @@ import commonStyles from '../common/commonStyles.css';
 type EventDefinitionConfig = {
   group_by: Array<string>,
   streams: Array<string>,
+  stream_categories?: Array<string>,
 };
 
 type EventDefinition = {

graylog2-web-interface/src/components/events/events/types.ts

@@ -20,6 +20,7 @@ export type EventReplayInfo = {
   timerange_end: string,
   query: string,
   streams: string[],
+  stream_categories?: string[],
 };
 
 export type Event = {

graylog2-web-interface/src/components/search/MessageShow.jsx

@@ -51,8 +51,6 @@ class MessageShow extends React.Component {
     this.setState(getImmutableProps(nextProps));
   }
 
-  // eslint-disable-next-line class-methods-use-this
-
   renderForDisplay = (fieldName) => {
     // No highlighting for the message details view.
     const { message } = this.props;

graylog2-web-interface/src/contexts/DefaultQueryClientProvider.tsx

@@ -30,6 +30,11 @@ const defaultOptions = {
     queries: {
       refetchOnWindowFocus: false,
       networkMode: 'always' as const,
+      retry: (failureCount, error) => {
+        if (error.status >= 400 && error.status < 500) return false;
+
+        return failureCount < 4;
+      },
     },
   },
 };

graylog2-web-interface/src/util/DocsHelper.ts

@@ -50,12 +50,7 @@ const docsHelper = {
     PIPELINES: 'pipelines',
     REPORTING: 'reporting',
     ROLLING_ES_UPGRADE: 'rolling-es-upgrade',
-    SEARCH_QUERY_ERRORS: {
-      UNKNOWN_FIELD: 'query-language#unknown-field',
-      QUERY_PARSING_ERROR: 'query-language#parse-exception',
-      INVALID_OPERATOR: 'query-language#invalid-operator',
-      UNDECLARED_PARAMETER: 'query-language#undeclared-parameter',
-    },
+    SEARCH_QUERY_ERRORS: 'query-language#ErrorTypes',
     SEARCH_QUERY_LANGUAGE: 'query-language',
     STREAMS: 'streams',
     STREAM_PROCESSING_RUNTIME_LIMITS: 'streams#stream-processing-runtime-limits',

graylog2-web-interface/src/views/components/TypeSpecificValue.tsx

@@ -28,9 +28,10 @@ import StreamsField from 'views/components/fieldtypes/StreamsField';
 import PercentageField from 'views/components/fieldtypes/PercentageField';
 import { getPrettifiedValue } from 'views/components/visualizations/utils/unitConverters';
 import type FieldUnit from 'views/logic/aggregationbuilder/FieldUnit';
-import { DECIMAL_PLACES, UNIT_FEATURE_FLAG } from 'views/components/visualizations/Constants';
+import { UNIT_FEATURE_FLAG } from 'views/components/visualizations/Constants';
 import useFeature from 'hooks/useFeature';
 import { MISSING_BUCKET_NAME } from 'views/Constants';
+import formatValueWithUnitLabel from 'views/components/visualizations/utils/formatValueWithUnitLabel';
 
 import EmptyValue from './EmptyValue';
 import CustomPropTypes from './CustomPropTypes';
@@ -60,7 +61,7 @@ type TypeSpecificValueProps = {
 const ValueWithUnitRenderer = ({ value, unit }: { value: number, unit: FieldUnit}) => {
   const prettified = getPrettifiedValue(value, { abbrev: unit.abbrev, unitType: unit.unitType });
 
-  return <span title={value.toString()}>{`${Number(prettified?.value).toFixed(DECIMAL_PLACES)} ${prettified.unit.abbrev}`}</span>;
+  return <span title={value.toString()}>{formatValueWithUnitLabel(prettified?.value, prettified.unit.abbrev)}</span>;
 };
 
 const FormattedValue = ({ field, value, truncate, render, unit, type }: TypeSpecificValueProps) => {

graylog2-web-interface/src/views/components/aggregationwizard/units/FieldUnitPopover.tsx

@@ -27,6 +27,7 @@ import type { Unit } from 'views/components/visualizations/utils/unitConverters'
 import { mappedUnitsFromJSON as units } from 'views/components/visualizations/utils/unitConverters';
 import type { FieldUnitsFormValues } from 'views/types';
 import type FieldUnit from 'views/logic/aggregationbuilder/FieldUnit';
+import getUnitTextLabel from 'views/components/visualizations/utils/getUnitTextLabel';
 
 const Container = styled.div`
   display: flex;
@@ -76,7 +77,7 @@ const FieldUnitPopover = ({ field, predefinedUnit }: { field: string, predefined
   const badgeLabel = useMemo(() => {
     const curUnit = values?.units?.[field]?.abbrev;
 
-    return curUnit || '...';
+    return getUnitTextLabel(curUnit) || '...';
   }, [field, values?.units]);
 
   const predefinedInfo = useMemo(() => {

graylog2-web-interface/src/views/components/messagelist/MessagePreview.tsx

@@ -54,15 +54,15 @@ type Props = {
 const MessagePreview = ({ onRowClick, colSpanFixup, message, messageFieldType, showMessageRow, config }: Props) => {
   const MessageRowOverride = usePluginEntities('views.components.widgets.messageTable.messageRowOverride')?.[0];
 
-  return (
+  return showMessageRow && (
     <TableRow onClick={onRowClick}>
       <td colSpan={colSpanFixup}>
-        {showMessageRow && !!MessageRowOverride && (
+        {!!MessageRowOverride && (
           <MessageRowOverride messageFields={message.fields}
                               config={config}
                               renderMessageRow={() => renderMessageFieldRow(message, messageFieldType)} />
         )}
-        {(showMessageRow && !MessageRowOverride) && renderMessageFieldRow(message, messageFieldType)}
+        {(!MessageRowOverride) && renderMessageFieldRow(message, messageFieldType)}
       </td>
     </TableRow>
   );

graylog2-web-interface/src/views/components/searchbar/queryvalidation/QueryValidation.test.tsx

@@ -86,7 +86,7 @@ describe('QueryValidation', () => {
     await openExplanation();
 
     await screen.findByText('Parse Exception');
-    await screen.findByTitle('Parse Exception documentation');
+    await screen.findByTitle('Query error documentation');
   });
 
   it('renders pluggable validation explanation', async () => {

graylog2-web-interface/src/views/components/searchbar/queryvalidation/QueryValidation.tsx

@@ -146,21 +146,6 @@ const useTriggerIfErrorsPersist = (trigger: () => void) => {
   return [showExplanation, toggleShow] as const;
 };
 
-const getErrorDocumentationLink = (errorType: string) => {
-  switch (errorType) {
-    case 'UNKNOWN_FIELD':
-      return DocsHelper.PAGES.SEARCH_QUERY_ERRORS.UNKNOWN_FIELD;
-    case 'QUERY_PARSING_ERROR':
-      return DocsHelper.PAGES.SEARCH_QUERY_ERRORS.QUERY_PARSING_ERROR;
-    case 'INVALID_OPERATOR':
-      return DocsHelper.PAGES.SEARCH_QUERY_ERRORS.INVALID_OPERATOR;
-    case 'UNDECLARED_PARAMETER':
-      return DocsHelper.PAGES.SEARCH_QUERY_ERRORS.UNDECLARED_PARAMETER;
-    default:
-      return DocsHelper.PAGES.SEARCH_QUERY_LANGUAGE;
-  }
-};
-
 type QueryForm = {
   queryString: QueryValidationState,
 };
@@ -230,9 +215,9 @@ const QueryValidation = () => {
               <Explanation key={id}>
                 <span><b>{errorTitle}</b>: {errorMessage}</span>
                 {errorType && (
-                <DocumentationLink page={getErrorDocumentationLink(errorType)}
-                                   title={`${errorTitle} documentation`}
-                                   text={<DocumentationIcon name="lightbulb_circle" />} />
+                  <DocumentationLink page={DocsHelper.PAGES.SEARCH_QUERY_ERRORS}
+                                     title="Query error documentation"
+                                     text={<DocumentationIcon name="lightbulb_circle" />} />
                 )}
               </Explanation>
             ))}

graylog2-web-interface/src/views/components/visualizations/PlotLegend.tsx

@@ -57,8 +57,7 @@ const VariableContainer = styled.div<{ $height: number, $width: number }>(({ $he
   width: ${$width}px;
   grid-template-columns: ${$width}px;
   grid-template-rows: ${$height}px auto;
-  grid-column-gap: 0;
-  grid-row-gap: 0;
+  grid-gap: 0;
   justify-content: center;
 `);