github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] disable unenroll action on agentless agents (#216299)

Browse source 
## Summary

Closes https://github.com/elastic/kibana/issues/209173

Disable Unenroll agent action on agentless agents

<img width="1124" alt="image"
src="https://github.com/user-attachments/assets/6603bac5-b0b1-4a20-8b16-f121bd69e969"
/>
<img width="1126" alt="image"
src="https://github.com/user-attachments/assets/e41bca5b-f73d-44bc-b095-9970a25f6322"
/>
This commit is contained in:
Julia Bardi 2025-03-28 16:51:02 +01:00 • committed by GitHub
parent e3db203470
commit 6914495033
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx
View file

@ -79,7 +79,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
</EuiContextMenuItem>,
<EuiContextMenuItem
icon="refresh"
disabled={!isAgentUpgradeable(agent)}
disabled={!isAgentUpgradeable(agent) || agentPolicy?.supports_agentless === true}
onClick={() => {
setIsUpgradeModalOpen(true);
}}
@ -146,7 +146,9 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
? [
<EuiContextMenuItem
icon="trash"
disabled={!hasFleetAllPrivileges || !agent.active}
disabled={
!hasFleetAllPrivileges || !agent.active || agentPolicy?.supports_agentless === true
}
onClick={() => {
setIsUnenrollModalOpen(true);
}}

2
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.tsx
View file

@ -83,7 +83,7 @@ export const TableRowActions: React.FunctionComponent<{
</EuiContextMenuItem>,
<EuiContextMenuItem
key="agentUnenrollBtn"
disabled={!agent.active}
disabled={!agent.active || agentPolicy?.supports_agentless === true}
icon="trash"
onClick={() => {
onUnenrollClick();

6
x-pack/platform/plugins/shared/fleet/server/services/agents/unenroll.ts
View file

@ -10,7 +10,7 @@ import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/
import { v4 as uuidv4 } from 'uuid';
import type { Agent } from '../../types';
import { HostedAgentPolicyRestrictionRelatedError } from '../../errors';
import { FleetError, HostedAgentPolicyRestrictionRelatedError } from '../../errors';
import { SO_SEARCH_LIMIT } from '../../constants';
import { getCurrentNamespace } from '../spaces/get_current_namespace';
import { agentsKueryNamespaceFilter } from '../spaces/agent_namespaces';
@ -39,6 +39,10 @@ async function unenrollAgentIsAllowed(
);
}
if (agentPolicy?.supports_agentless) {
throw new FleetError(`Cannot unenroll agentless agent ${agentId}`);
}
return true;
}