Merge branch 'main' into ao/136301-update-view-filter-title

elastic · Jul 20, 2022 · 404a153 · 404a153
2 parents e66706d + 030ff82
commit 404a153
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade.ts b/x-pack/plugins/fleet/server/services/agents/upgrade.ts
@@ -8,6 +8,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import moment from 'moment';
 import pMap from 'p-map';
+import uuid from 'uuid/v4';
 
 import type { Agent, BulkActionResult, FleetServerAgentAction, CurrentUpgrade } from '../../types';
 import {
@@ -100,6 +101,7 @@ export async function sendUpgradeAgentsActions(
       }
     }
   } else if ('kuery' in options) {
+    const actionId = uuid();
     return await processAgentsInBatches(
       esClient,
       {
@@ -108,7 +110,14 @@ export async function sendUpgradeAgentsActions(
         batchSize: options.batchSize,
       },
       async (agents: Agent[], skipSuccess: boolean) =>
-        await upgradeBatch(soClient, esClient, agents, outgoingErrors, options, skipSuccess)
+        await upgradeBatch(
+          soClient,
+          esClient,
+          agents,
+          outgoingErrors,
+          { ...options, actionId },
+          skipSuccess
+        )
     );
   }
 
@@ -121,6 +130,7 @@ async function upgradeBatch(
   givenAgents: Agent[],
   outgoingErrors: Record<Agent['id'], Error>,
   options: ({ agents: Agent[] } | GetAgentsOptions) & {
+    actionId?: string;
     version: string;
     sourceUri?: string | undefined;
     force?: boolean;
@@ -183,6 +193,7 @@ async function upgradeBatch(
   );
 
   await createAgentAction(esClient, {
+    id: options.actionId,
     created_at: now,
     data,
     ack_data: data,

diff --git a/...mponent_templates/component_template_wizard/component_template_form/steps/step_review.tsx b/...mponent_templates/component_template_wizard/component_template_form/steps/step_review.tsx
@@ -69,7 +69,7 @@ export const StepReview: React.FunctionComponent<Props> = React.memo(
     } = serializedComponentTemplate;
 
     const isFleetDatastreamsVisible =
-      dataStreams?.length && componentTemplate._meta?.managed_by === MANAGED_BY_FLEET;
+      Boolean(dataStreams?.length) && componentTemplate._meta?.managed_by === MANAGED_BY_FLEET;
 
     const SummaryTab = () => (
       <div data-test-subj="summaryTab">
@@ -125,7 +125,7 @@ export const StepReview: React.FunctionComponent<Props> = React.memo(
               </EuiDescriptionListDescription>
             </EuiDescriptionList>
           </EuiFlexItem>
-          {isFleetDatastreamsVisible && (
+          {isFleetDatastreamsVisible && dataStreams && (
             <EuiFlexItem>
               {/* Datastream mappings */}
               <FormattedMessage