Update the onSubmit logic and handle case with single agent

elastic · May 18, 2022 · f442fa9 · f442fa9
1 parent 669d749
commit f442fa9
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 46 deletions.
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/agent.ts b/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
@@ -89,6 +89,7 @@ export interface PostBulkAgentUpgradeRequest {
     agents: string[] | string;
     source_uri?: string;
     version: string;
+    rollout_duration_seconds: number
   };
 }
 

diff --git a/.../public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx b/.../public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx
@@ -70,7 +70,6 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
           <AgentUpgradeAgentModal
             agents={[agent]}
             agentCount={1}
-            version={kibanaVersion}
             onClose={() => {
               setIsUpgradeModalOpen(false);
               refreshAgent();

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
@@ -500,7 +500,6 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
               setAgentToUpgrade(undefined);
               fetchData();
             }}
-            version={kibanaVersion}
           />
         </EuiPortal>
       )}

diff --git a/...et/public/applications/fleet/sections/agents/components/agent_upgrade_modal/constants.tsx b/...et/public/applications/fleet/sections/agents/components/agent_upgrade_modal/constants.tsx
@@ -31,11 +31,11 @@ export const FALLBACK_VERSIONS = [
 ];
 
 export const MAINTAINANCE_WINDOWS = [
-  '1 hour',
-  '2 hours',
-  '4 hours',
-  '8 hours',
-  '12 hours',
-  '24 hours',
-  '48 hours',
+  1,
+  2,
+  4,
+  8,
+  12,
+  24,
+  48
 ];
diff --git a/.../fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx b/.../fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
@@ -37,15 +37,16 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
     value: option,
   }));
   const maintainanceOptions: Array<EuiComboBoxOptionOption<string>> = MAINTAINANCE_WINDOWS.map((option) => ({
-    label: option,
-    value: option,
+    label: option === 1 ? `${option} hour` : `${option} hours`,
+    value: `${option * 3600}`
   }));
   const [selectedVersion, setSelectedVersion] = useState([fallbackVersions[0]]);
   const [selectedMantainanceWindow, setSelectedMantainanceWindow] = useState([maintainanceOptions[0]]);
   const isSingleAgent = Array.isArray(agents) && agents.length === 1;
   const isAllAgents = agents === '';
 
   const getVersion = (selectedVersion: EuiComboBoxOptionOption<string>[]) => selectedVersion[0].value as string;
+  const getRolloutDuration = (selectedMantainanceWindow: EuiComboBoxOptionOption<string>[]) =>  Number(selectedMantainanceWindow[0].value)
 
   async function onSubmit() {
     const version = getVersion(selectedVersion);
@@ -58,6 +59,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
         : await sendPostBulkAgentUpgrade({
             agents: Array.isArray(agents) ? agents.map((agent) => agent.id) : agents,
             version,
+            rollout_duration_seconds: getRolloutDuration(selectedMantainanceWindow)
           });
       if (error) {
         throw error;
@@ -206,42 +208,45 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
         />
       </EuiFormRow>
       <EuiSpacer size="m" />
-      <EuiFormRow
-        label= {
-          <EuiFlexGroup gutterSize="s">
-            <EuiFlexItem grow={false}>
-              {i18n.translate(
-                'xpack.fleet.upgradeAgents.maintainanceAvailableLabel',
-                {
-                  defaultMessage: 'Maintainance window available',
-                }
-              )}
-            </EuiFlexItem>
-            <EuiSpacer size="xs" />
-            <EuiFlexItem grow={false}>
-              <EuiToolTip position="top" content={i18n.translate(
-                'xpack.fleet.upgradeAgents.maintainanceAvailableTooltip',
-                {
-                  defaultMessage: 'Defines the duration of time available to perform the upgrade. The agent upgrades are spread uniformly across this duration in order to avoid exhausting network resources.',
-                }
-              )}>
-                <EuiIcon type="iInCircle" title="TooltipIcon" />
-              </EuiToolTip>
-            </EuiFlexItem>
-        </EuiFlexGroup>
-      }
-        fullWidth
-      >
-        <EuiComboBox
+      { !isSingleAgent ?
+        <EuiFormRow
+          label= {
+            <EuiFlexGroup gutterSize="s">
+              <EuiFlexItem grow={false}>
+                {i18n.translate(
+                  'xpack.fleet.upgradeAgents.maintainanceAvailableLabel',
+                  {
+                    defaultMessage: 'Maintainance window available',
+                  }
+                )}
+              </EuiFlexItem>
+              <EuiSpacer size="xs" />
+              <EuiFlexItem grow={false}>
+                <EuiToolTip position="top" content={i18n.translate(
+                  'xpack.fleet.upgradeAgents.maintainanceAvailableTooltip',
+                  {
+                    defaultMessage: 'Defines the duration of time available to perform the upgrade. The agent upgrades are spread uniformly across this duration in order to avoid exhausting network resources.',
+                  }
+                )}>
+                  <EuiIcon type="iInCircle" title="TooltipIcon" />
+                </EuiToolTip>
+              </EuiFlexItem>
+          </EuiFlexGroup>
+        }
           fullWidth
-          singleSelection={{ asPlainText: true }}
-          options={maintainanceOptions}
-          selectedOptions={selectedMantainanceWindow}
-          onChange={(selectedMantainanceWindow: Array<EuiComboBoxOptionOption<string>>) => {
-            setSelectedMantainanceWindow(selectedMantainanceWindow);
-          }}
-        />
-      </EuiFormRow>
+        >
+          <EuiComboBox
+            fullWidth
+            singleSelection={{ asPlainText: true }}
+            options={maintainanceOptions}
+            selectedOptions={selectedMantainanceWindow}
+            onChange={(selectedMantainanceWindow: Array<EuiComboBoxOptionOption<string>>) => {
+              setSelectedMantainanceWindow(selectedMantainanceWindow);
+            }}
+          />
+        </EuiFormRow>
+        : null
+      }
 
     </EuiConfirmModal>
   );