Skip to content

gcp,google_workspace: remove duplicate fields#4397

Merged
efd6 merged 1 commit intoelastic:mainfrom
efd6:ecs8.5-fix-regressions
Oct 6, 2022
Merged

gcp,google_workspace: remove duplicate fields#4397
efd6 merged 1 commit intoelastic:mainfrom
efd6:ecs8.5-fix-regressions

Conversation

@efd6
Copy link
Contributor

@efd6 efd6 commented Oct 6, 2022 •
edited
Loading

What does this PR do?

This fixes field definition duplications in gcp and google_workspace.

  • gcp is a regression
  • google_workspace was not discovered in previous rounds of deduplication which depend on elastic-package check and are stochastic.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

@efd6 efd6 added Team:Security-External Integrations Integration:gcp Google Cloud Platform Integration:google_workspace Google Workspace Team:Cloud-Monitoring Label for the Cloud Monitoring team labels Oct 6, 2022
@efd6 efd6 self-assigned this Oct 6, 2022
@efd6 efd6 force-pushed the ecs8.5-fix-regressions branch from 3eec74e to b132bfb Compare October 6, 2022 00:18
@efd6 efd6 mentioned this pull request Oct 6, 2022
Closed
@elasticmachine
Copy link

elasticmachine commented Oct 6, 2022 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-10-06T00:19:10.448+0000

  • Duration: 21 min 20 sec

Test stats 🧪

Test Results
Failed 0
Passed 129
Skipped 0
Total 129

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@elasticmachine
Copy link

elasticmachine commented Oct 6, 2022

🚀 Benchmarks report

Package gcp 👍(4) 💚(0) 💔(1)

Expand to view
Data stream Previous EPS New EPS Diff (%) Result
audit 1633.99 1360.54 -273.45 (-16.74%) 💔

Package google_workspace 👍(4) 💚(1) 💔(1)

Expand to view
Data stream Previous EPS New EPS Diff (%) Result
groups 5649.72 3496.5 -2153.22 (-38.11%) 💔

To see the full report comment with /test benchmark fullreport

@elasticmachine
Copy link

elasticmachine commented Oct 6, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (11/11) 💚
Files 100.0% (11/11) 💚 2.508
Classes 100.0% (11/11) 💚 2.508
Methods 94.475% (171/181) 👍 4.186
Lines 96.273% (2971/3086) 👍 4.638
Conditionals 100.0% (0/0) 💚

@efd6 efd6 marked this pull request as ready for review October 6, 2022 01:00
@efd6 efd6 requested review from a team as code owners October 6, 2022 01:00
@elasticmachine
Copy link

elasticmachine commented Oct 6, 2022

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

This was referenced Oct 6, 2022
Merged
Closed
djptek
djptek approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@djptek djptek left a comment

Choose a reason for hiding this comment

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

I did a grep for the fields & TBH I'm not 100% clear which ones should go and which not as I'm not familiar with this integration so I'll trust you on that as the formatting looks fine. LGTM

@efd6
Copy link
Contributor Author

efd6 commented Oct 6, 2022

In general I'm choosing the ECS external definitions unless there is a local value being assigned to the field.

tommyers-elastic
tommyers-elastic approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@tommyers-elastic tommyers-elastic left a comment

Choose a reason for hiding this comment

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

gcp changes LGTM. thanks!

@efd6 efd6 merged commit ca7c022 into elastic:main Oct 6, 2022
@andrewkroh andrewkroh mentioned this pull request Oct 20, 2022
Merged
@efd6 efd6 deleted the ecs8.5-fix-regressions branch February 5, 2025 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marc-gr marc-gr marc-gr approved these changes

@tommyers-elastic tommyers-elastic tommyers-elastic approved these changes

+1 more reviewer

@djptek djptek djptek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@efd6 efd6

Labels

Integration:gcp Google Cloud Platform Integration:google_workspace Google Workspace Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@efd6 @elasticmachine @djptek @marc-gr @tommyers-elastic