Skip to content

AWS Integration enable v9 Kibana support #12637

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.

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

Merged
merged 17 commits into from
Feb 17, 2025
Merged

AWS Integration enable v9 Kibana support #12637

merged 17 commits into from
Feb 17, 2025

Conversation

gizas
Copy link
Contributor

@gizas gizas commented Feb 6, 2025

  • Enhancement

Proposed commit message

WHAT: Enabling support for AWS and AWS Custom Logs integrations for 9.0 version
WHY: Is needed in order to enable above integrations in version 9.0.0

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.
  • I have verified that any added dashboard complies with Kibana's Dashboard good practices

How to test this PR locally

  1. Clone Pr
  2. elastic-package build with v0.109.1
  3. elastic-package stack up -d -v --version=9.0.0-SNAPSHOT to install a local ES
  4. Install an agent + Fleet with prementioned integrations enabled

Related issues

Screenshots

No errors in Fleet:

Screenshot 2025-02-06 at 11 48 09 AM

Cloudwatch Metrics:

Screenshot 2025-02-06 at 11 58 01 AM

Cloudwatch logs

Screenshot 2025-02-06 at 12 12 05 PM

AWS S3 Logs:

aws s3 acess

AWS Custom Logs Integration

Screenshot 2025-02-06 at 12 29 50 PM

Signed-off-by: Andreas Gkizas <[email protected]>
@gizas gizas requested review from a team as code owners February 6, 2025 10:59
@gizas gizas added Integration:aws AWS Integration:aws_logs Custom AWS Logs Team:obs-ds-hosted-services Observability Hosted Services team [elastic/obs-ds-hosted-services] labels Feb 6, 2025
@@ -15,6 +15,11 @@ processors:
target_field: event.original
ignore_missing: true
if: 'ctx.event?.original == null'
- remove:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To remove errors for JSE0001:

Error: building package failed: invalid content found in built zip package: found 2 validation errors:
   1. file "/Users/andreasgkizas/elastic/integrations3/integrations/build/packages/aws-2.39.0.zip/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml" is invalid: field processors.158.remove: if is required
   2. file "/Users/andreasgkizas/elastic/integrations3/integrations/build/packages/aws-2.39.0.zip/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml" is invalid: field processors.158.remove.field: rename "message" to "event.original" processor requires remove "message" processor (JSE00001)

@@ -1,4 +1,3 @@
errors:
exclude_checks:
- SVR00004 # References in dashboards.
- SVR00005 # Kibana version for saved tags.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not needed anymore, it can built without this

@elasticmachine
Copy link

elasticmachine commented Feb 6, 2025

💔 Build Failed

Failed CI Steps

History

@gizas
Copy link
Contributor Author

gizas commented Feb 6, 2025

/test stack 9.0.0-SNAPSHOT

Signed-off-by: Andreas Gkizas <[email protected]>
@gizas gizas closed this Feb 7, 2025
@gizas gizas reopened this Feb 7, 2025
@gizas
Copy link
Contributor Author

gizas commented Feb 7, 2025

/test stack 9.0.0-SNAPSHOT

@elasticmachine
Copy link

⏳ Build in-progress, with failures

Failed CI Steps

@elasticmachine
Copy link

💔 Build Failed

Failed CI Steps

@gizas
Copy link
Contributor Author

gizas commented Feb 7, 2025

/test

@gizas
Copy link
Contributor Author

gizas commented Feb 7, 2025

/test stack 9.0.0-SNAPSHOT

@elasticmachine
Copy link

⏳ Build in-progress, with failures

Failed CI Steps

@gizas
Copy link
Contributor Author

gizas commented Feb 7, 2025

/test

1 similar comment
@gizas
Copy link
Contributor Author

gizas commented Feb 7, 2025

/test

@gizas
Copy link
Contributor Author

gizas commented Feb 10, 2025

9.0.0 done as part of this #12503

@gizas gizas closed this Feb 10, 2025
Signed-off-by: Andreas Gkizas <[email protected]>
@gizas gizas reopened this Feb 10, 2025
@gizas
Copy link
Contributor Author

gizas commented Feb 10, 2025

/test

@@ -7,7 +7,11 @@ vars:
skip_ignored_fields:
- aws.waf.terminating_rule_match_details.location
- aws.waf.non_terminating_matching_rules.ruleMatchDetails.location
- aws.waf.non_terminating_matching_rules.ruleMatchDetails.action
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@elastic/security-service-integrations team can you please help understand here why I have those failures?

See https://buildkite.com/elastic/integrations/builds/22118

Signed-off-by: Andreas Gkizas <[email protected]>
@@ -13,10 +13,59 @@
type: nested
description: |
The list of non-terminating rules in the rule group that match the request. These are always COUNT rules (non-terminating rules that match)
fields:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Needed to solve the pipeline errors of https://buildkite.com/elastic/integrations/builds/22047

Big thanks to @zmoog for details

Copy link
Member

Choose a reason for hiding this comment

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

Is this because these fields existed in the beats metricset and not incorporated for Integrations ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because of this, for spec +3.0.1, subobject fields need to be explicitly defined.

Copy link
Contributor

Choose a reason for hiding this comment

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

Specifically this: elastic/elastic-package#1489

Signed-off-by: Andreas Gkizas <[email protected]>
Signed-off-by: Andreas Gkizas <[email protected]>
Signed-off-by: Andreas Gkizas <[email protected]>
Signed-off-by: Andreas Gkizas <[email protected]>
Signed-off-by: Andreas Gkizas <[email protected]>
@gizas
Copy link
Contributor Author

gizas commented Feb 12, 2025

/test stack 9.0.0-SNAPSHOT

@elastic-vault-github-plugin-prod
Copy link

elastic-vault-github-plugin-prod bot commented Feb 12, 2025

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@elasticmachine
Copy link

💚 Build Succeeded

History

@gizas
Copy link
Contributor Author

gizas commented Feb 12, 2025

@elastic/security-service-integrations can I have a review please?

@@ -1,7 +1,7 @@
format_version: 3.0.0
format_version: 3.3.1
Copy link
Contributor

@kcreddy kcreddy Feb 14, 2025

Choose a reason for hiding this comment

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

@@ -13,10 +13,59 @@
type: nested
description: |
The list of non-terminating rules in the rule group that match the request. These are always COUNT rules (non-terminating rules that match)
fields:
Copy link
Contributor

Choose a reason for hiding this comment

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

Specifically this: elastic/elastic-package#1489

Signed-off-by: Andreas Gkizas <[email protected]>
@gizas
Copy link
Contributor Author

gizas commented Feb 14, 2025

/test stack 9.0.0-SNAPSHOT

Copy link

@elasticmachine
Copy link

💚 Build Succeeded

@elasticmachine
Copy link

💚 Build Succeeded

@gizas
Copy link
Contributor Author

gizas commented Feb 17, 2025

@kcreddy a final review please ?

@gizas gizas merged commit f1b34ed into main Feb 17, 2025
7 checks passed
@gizas gizas deleted the awsenablement9 branch February 17, 2025 07:21
@elastic-vault-github-plugin-prod

Package aws - 2.40.0 containing this change is available at https://epr.elastic.co/package/aws/2.40.0/

@elastic-vault-github-plugin-prod

Package aws_logs - 1.7.0 containing this change is available at https://epr.elastic.co/package/aws_logs/1.7.0/

flexitrev pushed a commit that referenced this pull request Mar 20, 2025
* aws commit to enable v9 support

Signed-off-by: Andreas Gkizas <[email protected]>



---------

Signed-off-by: Andreas Gkizas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Integration:aws_logs Custom AWS Logs Integration:aws AWS Team:obs-ds-hosted-services Observability Hosted Services team [elastic/obs-ds-hosted-services]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants