[Cloud Security] Azure - AMR Template form #166910

JordanSh · 2023-09-21T07:57:19Z

Summary

Resolves #165580

Screen.Recording.2023-09-26.at.15.01.17.mov

…rm-template-form

elasticmachine · 2023-09-26T16:13:49Z

Pinging @elastic/kibana-cloud-security-posture (Team:Cloud Security)

opauloh · 2023-09-26T16:43:17Z

x-pack/plugins/fleet/public/components/azure_arm_template_guide.tsx

+import type { CloudSecurityIntegrationAzureAccountType } from './agent_enrollment_flyout/types';
+
+const AzureResourceManagerLink =
+  'https://azure.microsoft.com/en-us/get-started/azure-portal/resource-manager/?OCID=AIDcmm5edswduu_SEM__k_CjwKCAjwxOymBhAFEiwAnodBLBHx_IB6zMNtNiK3A6rPLhhUPeftXrN3px5mwTO739pWUndPzt27aRoCMKIQAvD_BwE_k_&gad=1';


can we remove those additional URL params?

and keep the URL like this:

https://azure.microsoft.com/en-us/get-started/azure-portal/resource-manager

elasticmachine · 2023-09-26T16:43:23Z

Pinging @elastic/fleet (Team:Fleet)

opauloh · 2023-09-26T17:02:30Z

x-pack/plugins/fleet/public/services/get_template_url_from_agent_policy.ts

@@ -7,21 +7,19 @@

 import type { AgentPolicy } from '../types';



Great idea on reusing this function, I think we can export from this file an object with the supported templateUrlFieldName:

export const SUPPORTED_TEMPLATES = { CLOUD_FORMATION: 'cloud_formation_template_url', ARM: 'arm_template_url' }

this way later we can reuse it like this and avoid typos:

import { getTemplateUrlFromAgentPolicy, SUPPORTED_TEMPLATES } from '../../services'; const cloudFormationTemplateFromAgentPolicy = getTemplateUrlFromAgentPolicy( SUPPORTED_TEMPLATES.CLOUD_FORMATION, agentPolicy );

opauloh · 2023-09-26T17:03:56Z

x-pack/plugins/fleet/public/services/get_template_url_from_agent_policy.ts

- */
-export const getCloudFormationTemplateUrlFromAgentPolicy = (selectedPolicy?: AgentPolicy) => {
+export const getTemplateUrlFromAgentPolicy = (
+  templateUrlFieldName: string,


we can also export the supported templateUrlFieldName in this function similar as mentioned in the previous comment

opauloh · 2023-09-26T17:05:47Z

...posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx

+          <li>
+            <FormattedMessage
+              id="xpack.csp.azureIntegration.armTemplateSetupStep.save"
+              defaultMessage="Click the Save tand continue button on the bottom right of this page."


typo here: "Save tand continue"

opauloh · 2023-09-26T17:10:56Z

x-pack/plugins/fleet/public/services/get_template_url_from_agent_policy.test.ts

@@ -62,7 +62,7 @@ describe('getCloudFormationTemplateUrlFromAgentPolicy', () => {
      ],
    };
    // @ts-expect-error
-    const result = getCloudFormationTemplateUrlFromAgentPolicy(selectedPolicy);
+    const result = getTemplateUrlFromAgentPolicy(selectedPolicy);


I believe it's missing one param, also can you add a test for ARM?

juliaElastic

Fleet changes LGTM

JordanSh · 2023-09-27T09:48:46Z

Thanks @opauloh and @juliaElastic for the reviews.

@opauloh all comments were addressed, thanks for the great suggestions :)

kibana-ci · 2023-09-27T11:10:12Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: 1a72ada

Failed CI Steps

Defend Workflows Cypress Tests #1

Test Failures

[job] [logs] Defend Workflows Cypress Tests #1 / Endpoint generated alerts "before all" hook for "should create a Detection Engine alert from an endpoint alert" "before all" hook for "should create a Detection Engine alert from an endpoint alert"

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`cloudSecurityPosture`	234	237	+3
`fleet`	945	951	+6
total			+9

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`cloudSecurityPosture`	266.3KB	274.9KB	+8.5KB
`fleet`	1.2MB	1.2MB	+6.8KB
total			+15.4KB

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`cloudSecurityPosture`	15.5KB	15.5KB	+66.0B
`fleet`	143.2KB	143.5KB	+329.0B
total			+395.0B

Unknown metric groups

ESLint disabled line counts

id	before	after	diff
`cloudSecurityPosture`	19	23	+4

Total ESLint disabled count

id	before	after	diff
`cloudSecurityPosture`	20	24	+4

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @JordanSh

opauloh

Just out of curiosity, can we pass the params such as FleetUrl, enrollment token and elastic agent version over the URL to the ARM template?

opauloh

Tested Locally LGTM!

JordanSh · 2023-09-27T19:37:07Z

Just out of curiosity, can we pass the params such as FleetUrl, enrollment token and elastic agent version over the URL to the ARM template?

We discussed this at private but i'll update in this thread as well. This option is under investigation lead by @orestisfl , we might add it in the future

init work

aba3bc2

JordanSh added release_note:skip Skip the PR/issue when compiling release notes Team:Cloud Security Cloud Security team related labels Sep 21, 2023

JordanSh self-assigned this Sep 21, 2023

JordanSh added 25 commits September 21, 2023 11:27

texts

4d076b3

prog

56af49c

prog

e2dad68

arm url passes to modal

ed7a452

c

d033bca

c

7471727

correct modal opens

4786b52

modal sends to the correct adress on save

6d37bf0

adding flyout steps

59dcb28

flyout crashes on opening azure add agent

85fd573

more adjustments

a2393fe

more adjustments

d612baf

remove log

39d202d

Merge branch 'main' of https://github.com/elastic/kibana into azure-a…

8e04aab

…rm-template-form

added invalid version state

a858c68

clean

14d654d

adding tests

94f0946

fixed tests

024d408

Merge branch 'main' of https://github.com/elastic/kibana into azure-a…

e97c23f

…rm-template-form

fixed tests

442a49f

fixed types

288ca44

i18n fixes

292c137

Merge branch 'main' of https://github.com/elastic/kibana into azure-a…

9d66c17

…rm-template-form

fix hook

c72212f

merge

ed8b87b

JordanSh marked this pull request as ready for review September 26, 2023 16:13

JordanSh requested review from a team as code owners September 26, 2023 16:13

opauloh reviewed Sep 26, 2023

View reviewed changes

botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Sep 26, 2023

opauloh reviewed Sep 26, 2023

View reviewed changes

juliaElastic approved these changes Sep 27, 2023

View reviewed changes

review comments

1a72ada

JordanSh requested a review from opauloh September 27, 2023 09:48

opauloh reviewed Sep 27, 2023

View reviewed changes

opauloh approved these changes Sep 27, 2023

View reviewed changes

JordanSh merged commit 594cb14 into elastic:main Sep 27, 2023

kibanamachine added v8.11.0 backport:skip This commit does not require backporting labels Sep 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cloud Security] Azure - AMR Template form #166910

[Cloud Security] Azure - AMR Template form #166910

JordanSh commented Sep 21, 2023 •

edited

Loading

elasticmachine commented Sep 26, 2023

opauloh Sep 26, 2023

elasticmachine commented Sep 26, 2023

opauloh Sep 26, 2023

opauloh Sep 26, 2023

opauloh Sep 26, 2023

opauloh Sep 26, 2023

juliaElastic left a comment

JordanSh commented Sep 27, 2023

kibana-ci commented Sep 27, 2023

ESLint disabled line counts

Total ESLint disabled count

opauloh left a comment

opauloh left a comment

JordanSh commented Sep 27, 2023

		@@ -7,21 +7,19 @@

		import type { AgentPolicy } from '../types';

[Cloud Security] Azure - AMR Template form #166910

[Cloud Security] Azure - AMR Template form #166910

Conversation

JordanSh commented Sep 21, 2023 • edited Loading

Summary

elasticmachine commented Sep 26, 2023

opauloh Sep 26, 2023

Choose a reason for hiding this comment

elasticmachine commented Sep 26, 2023

opauloh Sep 26, 2023

Choose a reason for hiding this comment

opauloh Sep 26, 2023

Choose a reason for hiding this comment

opauloh Sep 26, 2023

Choose a reason for hiding this comment

opauloh Sep 26, 2023

Choose a reason for hiding this comment

juliaElastic left a comment

Choose a reason for hiding this comment

JordanSh commented Sep 27, 2023

kibana-ci commented Sep 27, 2023

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

Metrics [docs]

Module Count

Async chunks

Page load bundle

ESLint disabled line counts

Total ESLint disabled count

History

opauloh left a comment

Choose a reason for hiding this comment

opauloh left a comment

Choose a reason for hiding this comment

JordanSh commented Sep 27, 2023

JordanSh commented Sep 21, 2023 •

edited

Loading