Skip to content
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

Jump to bottom

[Ingest Manager] Allow to force unenroll from the UI #72386

Merged
merged 4 commits into from
Jul 21, 2020
Merged

[Ingest Manager] Allow to force unenroll from the UI #72386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b8500e
[Ingest Manager] Allow to force unenroll from the UI
nchaulet Jul 20, 2020
22ebc7f
Merge branch 'master' into feature-ui-force-unenroll
elasticmachine Jul 20, 2020
5a47dd3
Update x-pack/plugins/ingest_manager/public/applications/ingest_manag…
nchaulet Jul 21, 2020
ca2e7fc
Fix after review
nchaulet Jul 21, 2020
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
6 changes: 3 additions & 3 deletions x-pack/plugins/ingest_manager/common/services/agent_status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export function getAgentStatus(agent: Agent, now: number = Date.now()): AgentSta
if (!agent.active) {
return 'inactive';
}
if (!agent.last_checkin) {
return 'enrolling';
}
if (agent.unenrollment_started_at && !agent.unenrolled_at) {
return 'unenrolling';
}
if (!agent.last_checkin) {
return 'enrolling';
}

const msLastCheckIn = new Date(lastCheckIn || 0).getTime();
const msSinceLastCheckIn = new Date().getTime() - msLastCheckIn;
Expand Down
24 changes: 19 additions & 5 deletions ...ins/ingest_manager/public/applications/ingest_manager/components/context_menu_actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type Props = {
props: EuiButtonProps;
children: JSX.Element;
};
isOpen?: boolean;
onChange?: (isOpen: boolean) => void;
} & (
| {
items: EuiContextMenuPanelProps['items'];
Expand All @@ -31,10 +33,22 @@ type Props = {
}
);

export const ContextMenuActions = React.memo<Props>(({ button, ...props }) => {
const [isOpen, setIsOpen] = useState(false);
const handleCloseMenu = useCallback(() => setIsOpen(false), [setIsOpen]);
const handleToggleMenu = useCallback(() => setIsOpen(!isOpen), [isOpen]);
export const ContextMenuActions = React.memo<Props>(({ button, onChange, isOpen, ...props }) => {
const [isOpenState, setIsOpenState] = useState(false);
const handleCloseMenu = useCallback(() => {
if (onChange) {
onChange(false);
} else {
setIsOpenState(false);
}
}, [setIsOpenState, onChange]);
const handleToggleMenu = useCallback(() => {
if (onChange) {
onChange(!isOpen);
} else {
setIsOpenState(!isOpenState);
}
}, [isOpenState, onChange, isOpen]);

return (
<EuiPopover
Expand All @@ -55,7 +69,7 @@ export const ContextMenuActions = React.memo<Props>(({ button, ...props }) => {
/>
)
}
isOpen={isOpen}
isOpen={isOpen === undefined ? isOpenState : isOpen}
closePopover={handleCloseMenu}
>
{'items' in props ? (
Expand Down
18 changes: 13 additions & 5 deletions ...applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
const hasWriteCapabilites = useCapabilities().write;
const refreshAgent = useAgentRefresh();
const [isReassignFlyoutOpen, setIsReassignFlyoutOpen] = useState(assignFlyoutOpenByDefault);
const isUnenrolling = agent.status === 'unenrolling';

const onClose = useMemo(() => {
if (onCancelReassign) {
Expand Down Expand Up @@ -59,7 +60,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
defaultMessage="Assign new agent config"
/>
</EuiContextMenuItem>,
<AgentUnenrollProvider key="unenrollAgent">
<AgentUnenrollProvider key="unenrollAgent" forceUnenroll={isUnenrolling}>
{(unenrollAgentsPrompt) => (
<EuiContextMenuItem
icon="cross"
Expand All @@ -68,10 +69,17 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
unenrollAgentsPrompt([agent.id], 1, refreshAgent);
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
defaultMessage="Unenroll"
/>
{isUnenrolling ? (
<FormattedMessage
id="xpack.ingestManager.agentList.forceUnenrollOneButton"
defaultMessage="Force unenroll"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
defaultMessage="Unenroll"
/>
)}
</EuiContextMenuItem>
)}
</AgentUnenrollProvider>,
Expand Down
22 changes: 17 additions & 5 deletions ...ngest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,12 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
const { getHref } = useLink();
const hasWriteCapabilites = useCapabilities().write;

const isUnenrolling = agent.status === 'unenrolling';
const [isMenuOpen, setIsMenuOpen] = useState(false);
return (
<ContextMenuActions
isOpen={isMenuOpen}
onChange={(isOpen) => setIsMenuOpen(isOpen)}
items={[
<EuiContextMenuItem
icon="inspect"
Expand All @@ -100,21 +104,29 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
/>
</EuiContextMenuItem>,

<AgentUnenrollProvider>
<AgentUnenrollProvider forceUnenroll={isUnenrolling}>
{(unenrollAgentsPrompt) => (
<EuiContextMenuItem
disabled={!hasWriteCapabilites}
icon="cross"
onClick={() => {
unenrollAgentsPrompt([agent.id], 1, () => {
refresh();
setIsMenuOpen(false);
});
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
defaultMessage="Unenroll"
/>
{isUnenrolling ? (
<FormattedMessage
id="xpack.ingestManager.agentList.forceUnenrollOneButton"
defaultMessage="Force unenroll"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
defaultMessage="Unenroll"
/>
)}
</EuiContextMenuItem>
)}
</AgentUnenrollProvider>,
Expand Down
43 changes: 30 additions & 13 deletions .../public/applications/ingest_manager/sections/fleet/components/agent_unenroll_provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { agentRouteService } from '../../../services';

interface Props {
children: (unenrollAgents: UnenrollAgents) => React.ReactElement;
forceUnenroll?: boolean;
}

export type UnenrollAgents = (
Expand All @@ -24,7 +25,10 @@ export type UnenrollAgents = (

type OnSuccessCallback = (agentsUnenrolled: string[]) => void;

export const AgentUnenrollProvider: React.FunctionComponent<Props> = ({ children }) => {
export const AgentUnenrollProvider: React.FunctionComponent<Props> = ({
children,
forceUnenroll = false,
}) => {
const core = useCore();
const [agents, setAgents] = useState<string[] | string>([]);
const [agentsCount, setAgentsCount] = useState<number>(0);
Expand Down Expand Up @@ -65,19 +69,24 @@ export const AgentUnenrollProvider: React.FunctionComponent<Props> = ({ children
const { error } = await sendRequest<PostAgentUnenrollResponse>({
path: agentRouteService.getUnenrollPath(agentId),
method: 'post',
body: {
force: forceUnenroll,
},
});

if (error) {
throw new Error(error.message);
}

const successMessage = i18n.translate(
'xpack.ingestManager.unenrollAgents.successSingleNotificationTitle',
{
defaultMessage: "Unenrolling agent '{id}'",
values: { id: agentId },
}
);
const successMessage = forceUnenroll
? i18n.translate('xpack.ingestManager.unenrollAgents.successForceSingleNotificationTitle', {
defaultMessage: "Agent '{id}' unenrolled",
values: { id: agentId },
})
: i18n.translate('xpack.ingestManager.unenrollAgents.successSingleNotificationTitle', {
defaultMessage: "Unenrolling agent '{id}'",
values: { id: agentId },
});
core.notifications.toasts.addSuccess(successMessage);

if (onSuccessCallback.current) {
Expand Down Expand Up @@ -107,11 +116,19 @@ export const AgentUnenrollProvider: React.FunctionComponent<Props> = ({ children
<EuiConfirmModal
title={
isSingle && !unenrollByKuery ? (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmModal.deleteSingleTitle"
defaultMessage="Unenroll agent '{id}'?"
values={{ id: agents[0] }}
/>
forceUnenroll ? (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmModal.forceDeleteSingleTitle"
defaultMessage="Force unenroll agent '{id}'?"
values={{ id: agents[0] }}
/>
) : (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmModal.deleteSingleTitle"
defaultMessage="Unenroll agent '{id}'?"
values={{ id: agents[0] }}
/>
)
) : (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmModal.deleteMultipleTitle"
Expand Down