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

[Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes #164792

Merged
merged 17 commits into from
Aug 28, 2023
Merged

[Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes #164792

merged 17 commits into from
Aug 28, 2023

Conversation

animehart
Copy link
Contributor

@animehart animehart commented Aug 25, 2023 •
edited by kibanamachine
Loading

This PR is for updating GCP forms

  • Manifest for GCP has been changed (this PR updates the field name that was updated on the manifest)
  • EuiCodeBlock for CloudShell is interactive now
  • Static hover name for AWS and GCP icon on dashboard
  • MIN_VERSION for CIS GCP has now been update to 1.5.2 from 1.5.0
Screenshot 2023-08-24 at 10 58 44 PM ## Summary

@animehart animehart changed the title cis gcp now use updated gcp field name [Cloud Security][CIS GCPcis gcp now use updated gcp field name Aug 25, 2023
@animehart animehart changed the title [Cloud Security][CIS GCPcis gcp now use updated gcp field name [Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes Aug 25, 2023
@animehart
Copy link
Contributor Author

@elasticmachine merge upstream

@animehart
Copy link
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

merge conflict between base and head

@kfirpeled kfirpeled linked an issue Aug 27, 2023 that may be closed by this pull request
[Cloud Security] [CSPM] [GCP] Clean non used credentials when saving a manual integration #164519
Closed
@animehart animehart added backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) v8.10.0 Team:Cloud Security Cloud Security team related release_note:skip Skip the PR/issue when compiling release notes labels Aug 27, 2023
@animehart animehart marked this pull request as ready for review August 27, 2023 20:53
@animehart animehart requested review from a team as code owners August 27, 2023 20:53
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Aug 28, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

opauloh
opauloh reviewed Aug 28, 2023
View reviewed changes
x-pack/plugins/fleet/public/components/google_cloud_shell_guide.tsx Outdated
@@ -53,7 +53,7 @@ export const GoogleCloudShellGuide = (props: { commandText: string }) => {
defaultMessage="Copy the following command and replace <PROJECT_ID> with your project ID."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest we also update the instruction so the user knows it can be editable before copying:

Suggested change
defaultMessage="Copy the following command and replace <PROJECT_ID> with your project ID."
defaultMessage="Replace <PROJECT_ID> in the following command with your project ID and copy the command."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good !

...gins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.test.tsx Show resolved Hide resolved
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Async chunks

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

id before after diff
cloudSecurityPosture 264.1KB 264.1KB -10.0B
fleet 1.0MB 1.0MB +37.0B
total +27.0B

Page load bundle

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

id before after diff
cloudSecurityPosture 13.7KB 13.8KB +126.0B

History

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

@animehart animehart merged commit 145fefe into elastic:main Aug 28, 2023
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.10 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.10:
- [Cloud Security][CIS GCP] Add Agent flyout updates for CIS GCP (#163910)

Manual backport

To create the backport manually run:

node scripts/backport --pr 164792

Questions ?

Please refer to the Backport tool documentation

jloleysens added a commit to jloleysens/kibana that referenced this pull request Aug 29, 2023
@jloleysens
Merge branch 'main' into run-migrations-on-migrator
44333f6 
* main: (40 commits)
  Adjust migrations and elasticsearch service settings for serverless. (elastic#165050)
  [Security Solution] expandable flyout - add investigate in timeline f… (elastic#165025)
  [SecuritySolution] Hide create dashboard button from listing (elastic#164476)
  Construct HTTP log message only if needed (elastic#165057)
  [Security Solution] expandable flyout - add no data message in entities details and entities overview components (elastic#164955)
  Add functional tests for serverless security management UIs (elastic#164886)
  [api-docs] 2023-08-29 Daily api_docs build (elastic#165056)
  [Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes (elastic#164792)
  [Security Solution] Expandable flyout - update risk classification ui in entities overview (elastic#165022)
  [Security Solution] Fixes Preconfigured Connectors not working with Assistant (elastic#164900)
  [Security Solution] Coverage Overview follow-up 2 (elastic#164986)
  [DOCS] Add cross-link for other encryption key settings (elastic#165014)
  chore(slo): general enhancement (elastic#164723)
  Revert "[SOR] Allow optionally downgrading documents with a higher version model in API READ methods" (elastic#164991)
  [OAS] Add more Elasticsearch query rule examples (elastic#164386)
  [security_solution_cypress] Add support for options in EsArchiver.load (elastic#164988)
  [Event Log] Skip setting assets to hidden in serverless (elastic#164767)
  remove unneeded usages of isErrorResponse (elastic#164609)
  [Enterprise Search] Make network drive connector platinum (elastic#165007)
  [RAM] update api key to become public (elastic#164883)
  ...
@JordanSh JordanSh mentioned this pull request Aug 29, 2023
Closed
@animehart animehart mentioned this pull request Aug 29, 2023
Merged
@animehart
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
✅ 8.10

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

animehart added a commit to animehart/kibana that referenced this pull request Aug 29, 2023
@animehart
[Cloud Security][CIS GCP]cis gcp now use updated gcp field name + sma…
4260dc0 
…ll last minute changes (elastic#164792)

This PR is for updating GCP forms
- Manifest for GCP has been changed (this PR updates the field name that
was updated on the manifest)
- EuiCodeBlock for CloudShell is interactive now
- Static hover name for AWS and GCP icon on dashboard
- MIN_VERSION for CIS GCP has now been update to 1.5.2 from 1.5.0

<img width="739" alt="Screenshot 2023-08-24 at 10 58 44 PM"
src="https://github.com/elastic/kibana/assets/8703149/b88f4787-8396-4913-a475-5a381c802021">
## Summary

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit 145fefe)
animehart added a commit that referenced this pull request Aug 29, 2023
@animehart
[8.10] [Cloud Security][CIS GCP]cis gcp now use updated gcp field nam…
608855d 
…e + small last minute changes (#164792) (#165072)

# Backport

This will backport the following commits from `main` to `8.10`:
- [[Cloud Security][CIS GCP]cis gcp now use updated gcp field name +
small last minute changes
(#164792)](#164792)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Rickyanto
Ang","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-28T22:43:03Z","message":"[Cloud
Security][CIS GCP]cis gcp now use updated gcp field name + small last
minute changes (#164792)\n\nThis PR is for updating GCP forms \r\n-
Manifest for GCP has been changed (this PR updates the field name
that\r\nwas updated on the manifest)\r\n- EuiCodeBlock for CloudShell is
interactive now\r\n- Static hover name for AWS and GCP icon on
dashboard\r\n- MIN_VERSION for CIS GCP has now been update to 1.5.2 from
1.5.0\r\n\r\n<img width=\"739\" alt=\"Screenshot 2023-08-24 at 10 58 44
PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/8703149/b88f4787-8396-4913-a475-5a381c802021\">\r\n##
Summary\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"145fefee3f2ac114009ed71148f04faa5c316621","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","Team:Cloud
Security","backport:prev-minor","v8.10.0","v8.11.0"],"number":164792,"url":"https://github.com/elastic/kibana/pull/164792","mergeCommit":{"message":"[Cloud
Security][CIS GCP]cis gcp now use updated gcp field name + small last
minute changes (#164792)\n\nThis PR is for updating GCP forms \r\n-
Manifest for GCP has been changed (this PR updates the field name
that\r\nwas updated on the manifest)\r\n- EuiCodeBlock for CloudShell is
interactive now\r\n- Static hover name for AWS and GCP icon on
dashboard\r\n- MIN_VERSION for CIS GCP has now been update to 1.5.2 from
1.5.0\r\n\r\n<img width=\"739\" alt=\"Screenshot 2023-08-24 at 10 58 44
PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/8703149/b88f4787-8396-4913-a475-5a381c802021\">\r\n##
Summary\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"145fefee3f2ac114009ed71148f04faa5c316621"}},"sourceBranch":"main","suggestedTargetBranches":["8.10"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164792","number":164792,"mergeCommit":{"message":"[Cloud
Security][CIS GCP]cis gcp now use updated gcp field name + small last
minute changes (#164792)\n\nThis PR is for updating GCP forms \r\n-
Manifest for GCP has been changed (this PR updates the field name
that\r\nwas updated on the manifest)\r\n- EuiCodeBlock for CloudShell is
interactive now\r\n- Static hover name for AWS and GCP icon on
dashboard\r\n- MIN_VERSION for CIS GCP has now been update to 1.5.2 from
1.5.0\r\n\r\n<img width=\"739\" alt=\"Screenshot 2023-08-24 at 10 58 44
PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/8703149/b88f4787-8396-4913-a475-5a381c802021\">\r\n##
Summary\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"145fefee3f2ac114009ed71148f04faa5c316621"}}]}]
BACKPORT-->
This was referenced Oct 1, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliaElastic juliaElastic juliaElastic approved these changes

@opauloh opauloh opauloh approved these changes

@mitodrummer mitodrummer Awaiting requested review from mitodrummer

Assignees
No one assigned
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Cloud Security Cloud Security team related Team:Fleet Team label for Observability Data Collection Fleet team v8.10.0 v8.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Cloud Security] [CSPM] [GCP] Clean non used credentials when saving a manual integration
7 participants
@animehart @kibanamachine @elasticmachine @kibana-ci @mitodrummer @opauloh @juliaElastic