[UII] Allow to reset log level for agents >= 8.15.0

x-pack/plugins/fleet/common/constants/agent_policy.ts

@@ -39,17 +39,10 @@ export const DEFAULT_MAX_AGENT_POLICIES_WITH_INACTIVITY_TIMEOUT = 750;
 export const AGENTLESS_POLICY_ID = 'agentless'; // the policy id defined here: https://github.com/elastic/project-controller/blob/main/internal/project/security/security_kibana_config.go#L86
 
 export const AGENT_LOG_LEVELS = {
-  ERROR: 'error',
-  WARNING: 'warning',
-  INFO: 'info',
-  DEBUG: 'debug',
+  info: 'info',
+  debug: 'debug',
+  warning: 'warning',
+  error: 'error',
 };
 
-export const DEFAULT_LOG_LEVEL = AGENT_LOG_LEVELS.INFO;
-
-export const agentLoggingLevels = {
-  Info: 'info',
-  Debug: 'debug',
-  Warning: 'warning',
-  Error: 'error',
-} as const;
+export const DEFAULT_LOG_LEVEL = AGENT_LOG_LEVELS.info;

x-pack/plugins/fleet/common/openapi/bundled.json

@@ -7294,6 +7294,7 @@
                 "properties": {
                   "log_level": {
                     "type": "string",
+                    "nullable": true,
                     "enum": [
                       "debug",
                       "info",

x-pack/plugins/fleet/common/openapi/bundled.yaml

@@ -4674,6 +4674,7 @@ components:
               properties:
                 log_level:
                   type: string
+                  nullable: true
                   enum:
                     - debug
                     - info

x-pack/plugins/fleet/common/openapi/components/schemas/agent_action.yaml

@@ -19,6 +19,7 @@ oneOf:
         properties:
           log_level:
             type: string
+            nullable: true
             enum:
               - debug
               - info

x-pack/plugins/fleet/common/settings/agent_policy_settings.ts → x-pack/plugins/fleet/common/settings/agent_policy_settings.tsx

@@ -4,11 +4,14 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiCode } from '@elastic/eui';
+
 import { z } from 'zod';
 
-import { agentLoggingLevels } from '../constants';
+import { AGENT_LOG_LEVELS, DEFAULT_LOG_LEVEL } from '../constants';
 
 import type { SettingsConfig } from './types';
 
@@ -130,20 +133,19 @@ export const AGENT_POLICY_ADVANCED_SETTINGS: SettingsConfig[] = [
   },
   {
     name: 'agent.logging.level',
-    hidden: true,
     title: i18n.translate('xpack.fleet.settings.agentPolicyAdvanced.agentLoggingLevelTitle', {
       defaultMessage: 'Agent logging level',
     }),
-    description: i18n.translate(
-      'xpack.fleet.settings.agentPolicyAdvanced.agentLoggingLevelDescription',
-      {
-        defaultMessage:
-          'Sets the log level for all the agents on the policy. The default log level is "info".',
-      }
+    description: (
+      <FormattedMessage
+        id="xpack.fleet.settings.agentPolicyAdvanced.agentLoggingLevelDescription"
+        defaultMessage="Sets the log level for all the agents on the policy. The default log level is {level}."
+        values={{ level: <EuiCode>{DEFAULT_LOG_LEVEL}</EuiCode> }}
+      />
     ),
     api_field: {
       name: 'agent_logging_level',
     },
-    schema: z.nativeEnum(agentLoggingLevels).default(agentLoggingLevels.Info),
+    schema: z.nativeEnum(AGENT_LOG_LEVELS).default(DEFAULT_LOG_LEVEL),
   },
 ];

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx

@@ -65,11 +65,15 @@ describe('AgentLogsUI', () => {
       },
     } as any);
   });
-  const renderComponent = () => {
+  const renderComponent = (
+    opts = {
+      agentVersion: '8.11.0',
+    }
+  ) => {
     const renderer = createFleetTestRendererMock();
     const agent = {
       id: 'agent1',
-      local_metadata: { elastic: { agent: { version: '8.11' } } },
+      local_metadata: { elastic: { agent: { version: opts.agentVersion, log_level: 'debug' } } },
     } as any;
     const state = {
       datasets: ['elastic_agent'],
@@ -125,4 +129,35 @@ describe('AgentLogsUI', () => {
       `http://localhost:5620/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:'2023-20-04T14:00:00.340Z',to:'2023-20-04T14:20:00.340Z'))&_a=(columns:!(event.dataset,message),index:'logs-*',query:(language:kuery,query:'elastic_agent.id:agent1 and (data_stream.dataset:elastic_agent) and (log.level:info or log.level:error)'))`
     );
   });
+
+  it('should show log level dropdown with correct value', () => {
+    mockStartServices();
+    const result = renderComponent();
+    const logLevelDropdown = result.getByTestId('selectAgentLogLevel');
+    expect(logLevelDropdown.getElementsByTagName('option').length).toBe(4);
+    expect(logLevelDropdown).toHaveDisplayValue('debug');
+  });
+
+  it('should always show apply log level changes button', () => {
+    mockStartServices();
+    const result = renderComponent();
+    const applyLogLevelBtn = result.getByTestId('applyLogLevelBtn');
+    expect(applyLogLevelBtn).toBeInTheDocument();
+    expect(applyLogLevelBtn).not.toHaveAttribute('disabled');
+  });
+
+  it('should hide reset log level button for agents version < 8.15.0', () => {
+    mockStartServices();
+    const result = renderComponent();
+    const resetLogLevelBtn = result.queryByTestId('resetLogLevelBtn');
+    expect(resetLogLevelBtn).not.toBeInTheDocument();
+  });
+
+  it('should show reset log level button for agents version >= 8.15.0', () => {
+    mockStartServices();
+    const result = renderComponent({ agentVersion: '8.15.0' });
+    const resetLogLevelBtn = result.getByTestId('resetLogLevelBtn');
+    expect(resetLogLevelBtn).toBeInTheDocument();
+    expect(resetLogLevelBtn).not.toHaveAttribute('disabled');
+  });
 });

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx

@@ -342,7 +342,10 @@ export const AgentLogsUI: React.FunctionComponent<AgentLogsProps> = memo(
           </EuiPanel>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <SelectLogLevel agent={agent} />
+          <SelectLogLevel
+            agent={agent}
+            agentPolicyLogLevel={agentPolicy?.advanced_settings?.agent_logging_level}
+          />
         </EuiFlexItem>
       </WrapperFlexGroup>
     );