Skip to content

[8.19] [Fleet] Fix selected log level when there is a policy override (#259425) #259941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsoriano merged 3 commits into from
Mar 27, 2026
Merged

[8.19] [Fleet] Fix selected log level when there is a policy override (#259425) #259941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6dccb2
[8.9][Fleet] Fix displayed log level when there is a policy override
jsoriano Mar 24, 2026
b8d3c6b
Changes from node scripts/eslint_all_files --no-cache --fix
kibanamachine Mar 27, 2026
9004ef0
Merge branch '8.19' into fix-log-level-selection-8.19
jsoriano Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion ...ations/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { useAuthz, useStartServices } from '../../../../../hooks';
import { createFleetTestRendererMock } from '../../../../../../../mock';

import { AgentLogsUI } from './agent_logs';
import { SelectLogLevel } from './select_log_level';

jest.mock('@kbn/kibana-utils-plugin/public', () => {
return {
Expand Down Expand Up @@ -192,14 +193,40 @@ describe('AgentLogsUI', () => {
expect(result.queryByTestId('viewInLogsBtn')).not.toBeInTheDocument();
});

it('should show log level dropdown with correct value', () => {
it('should show log level dropdown with correct value when agent has a per-agent override', () => {
mockStartServices();
const result = renderComponent();
const logLevelDropdown = result.getByTestId('selectAgentLogLevel');
expect(logLevelDropdown.getElementsByTagName('option').length).toBe(4);
expect(logLevelDropdown).toHaveDisplayValue('debug');
});

it('should fall back to policy log level when agent has no per-agent override', () => {
jest.mocked(useStartServices).mockReturnValue({
notifications: { toasts: { addSuccess: jest.fn(), addError: jest.fn() } },
} as any);
const renderer = createFleetTestRendererMock();
const agent = {
id: 'agent1',
local_metadata: { elastic: { agent: { version: '8.15.0' } } },
} as any;
const result = renderer.render(<SelectLogLevel agent={agent} agentPolicyLogLevel="warning" />);
expect(result.getByTestId('selectAgentLogLevel')).toHaveDisplayValue('warning');
});

it('should fall back to info when agent has no per-agent override and policy has no log level set', () => {
jest.mocked(useStartServices).mockReturnValue({
notifications: { toasts: { addSuccess: jest.fn(), addError: jest.fn() } },
} as any);
const renderer = createFleetTestRendererMock();
const agent = {
id: 'agent1',
local_metadata: { elastic: { agent: { version: '8.15.0' } } },
} as any;
const result = renderer.render(<SelectLogLevel agent={agent} />);
expect(result.getByTestId('selectAgentLogLevel')).toHaveDisplayValue('info');
});

it('should always show apply log level changes button', () => {
mockStartServices();
const result = renderComponent();
Expand Down
2 changes: 1 addition & 1 deletion ...tions/fleet/sections/agents/agent_details_page/components/agent_logs/select_log_level.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const SelectLogLevel: React.FC<{ agent: Agent; agentPolicyLogLevel?: stri
);

const [agentLogLevel, setAgentLogLevel] = useState(
agent.local_metadata?.elastic?.agent?.log_level ?? DEFAULT_LOG_LEVEL
agent.local_metadata?.elastic?.agent?.log_level ?? agentPolicyLogLevel
);
const [selectedLogLevel, setSelectedLogLevel] = useState(agentLogLevel);

Expand Down
Loading