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.

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

[O11y] Migrate infraobs packages to ecs@mappings #10171

Merged
merged 25 commits into from
Jul 8, 2024

Conversation

harnish-elastic
Copy link
Contributor

@harnish-elastic harnish-elastic commented Jun 18, 2024

  • Enhancement

Proposed commit message

Migration performed using ecs-update. Minor manual changes are performed.

  • event.category or event.type is expecting value as an array instead of string. Hence provided the value as an array.

  • generated pipeline and system tests.

  • If the package is containing kibana version configuration as below,

    conditions:
      kibana.version: "^8.10.0"
    

    Updated these configuration to,

    conditions:
      kibana:
        version: "^8.10.0"
    

Command

  go run github.com/andrewkroh/go-examples/ecs-update@014b35dfe4c9832b51e7c909a39a48257d6a005d \
    -ecs-version=8.11.0 \
    -ecs-git-ref=v8.11.0 \
    -fields-yml-drop-ecs \
    -kibana-version=^8.13.0 \
    -drop-import-mappings \
    -pr=10171 \
    -owner=elastic/obs-infraobs-integrations \
    packages/*

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.

TSDB Testing

  • Performed TSDB testing for some packages. I have put the index templates in this doc.
  • Performed live data collection to make sure there are no event drops.

@harnish-elastic harnish-elastic self-assigned this Jun 18, 2024
@efd6
Copy link
Contributor

efd6 commented Jun 18, 2024

s/10135/10171/ in PR description. Also suggest using sha 014b35dfe4c9832b51e7c909a39a48257d6a005d for the tool; f7c19f8f3fa105fe1d869ed34f4d6c76c75bce2c is out of date with some fixes.

To fix up issues the best thing to do is reset --hard origin/main and re-run the command with the correct values, rather than polishing the PR.

@harnish-elastic
Copy link
Contributor Author

s/10135/10171/ in PR description. Also suggest using sha 014b35dfe4c9832b51e7c909a39a48257d6a005d for the tool; f7c19f8f3fa105fe1d869ed34f4d6c76c75bce2c is out of date with some fixes.

To fix up issues the best thing to do is reset --hard origin/main and re-run the command with the correct values, rather than polishing the PR.

Cool, let me do that. Thanks!

@elasticmachine
Copy link

elasticmachine commented Jun 18, 2024

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@efd6
Copy link
Contributor

efd6 commented Jun 18, 2024

The issues with the sample events will need addressing. The approach that I have taken is to do manual fix-ups guided by the failures that I see after running the tool (for example here) and then run the tool after those fixes are merged.

niraj-elastic and others added 2 commits June 24, 2024 17:01
…anual_ecs_mapping_migration

Conflicts:
	packages/rabbitmq/changelog.yml
@harnish-elastic harnish-elastic marked this pull request as ready for review June 25, 2024 06:40
@harnish-elastic harnish-elastic requested a review from a team as a code owner June 25, 2024 06:40
ignore_empty_value: true
ignore_failure: true
- append:
field: event.category
value:
- log
value: ["network"]
Copy link
Contributor

Choose a reason for hiding this comment

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

@harnish-elastic Can you please explain this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The change was related to event.category will not be longer support the value log. So based on data stream's logs, the network value suits. Hence updated the value!

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you share what the exact error here and since when has this category been removed ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oracle_weblogic/access test-access.log:
[0] parsing field value failed: field "event.category"'s value "log" is not one of the allowed values (api, authentication, configuration, database, driver, email, file, host, iam, intrusion_detection, library, malware, network, package, process, registry, session, threat, vulnerability, web)

ignore_empty_value: true
ignore_failure: true
- append:
field: event.category
value:
- log
value: ["network"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you share what the exact error here and since when has this category been removed ?

packages/rabbitmq/data_stream/exchange/fields/ecs.yml Outdated Show resolved Hide resolved
…anual_ecs_mapping_migration

Conflicts:
	packages/prometheus/changelog.yml
	packages/prometheus/docs/README.md
	packages/prometheus/manifest.yml
@elasticmachine
Copy link

💚 Build Succeeded

History

cc @harnish-elastic

Copy link

Quality Gate failed Quality Gate failed

Failed conditions
38.9% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube

ignore_empty_value: true
ignore_failure: true
- append:
field: event.category
value:
- log
value: ["iam"]
Copy link
Contributor

Choose a reason for hiding this comment

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

When i look at the attached screenshot of this PR, i do not think that we must limit the event.category to iam only.

Copy link
Contributor

Choose a reason for hiding this comment

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

To unblock this PR, lets keep in "iam" for now.
If we come to a consensus that we need to add more categories, we can do that later as we are appending here.

Copy link
Contributor

@tetianakravchenko tetianakravchenko left a comment

Choose a reason for hiding this comment

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

prometheus.remote_write - LGTM!

Copy link
Contributor

@ishleenk17 ishleenk17 left a comment

Choose a reason for hiding this comment

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

Looks good!

Copy link
Contributor

@niraj-elastic niraj-elastic left a comment

Choose a reason for hiding this comment

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

LGTM

@ishleenk17 ishleenk17 merged commit ca32ce2 into elastic:main Jul 8, 2024
4 of 5 checks passed
@elasticmachine
Copy link

Package cassandra - 1.14.0 containing this change is available at https://epr.elastic.co/search?package=cassandra

@elasticmachine
Copy link

Package nats - 1.7.0 containing this change is available at https://epr.elastic.co/search?package=nats

@elasticmachine
Copy link

Package oracle_weblogic - 1.7.0 containing this change is available at https://epr.elastic.co/search?package=oracle_weblogic

@elasticmachine
Copy link

Package prometheus - 1.18.0 containing this change is available at https://epr.elastic.co/search?package=prometheus

@elasticmachine
Copy link

Package rabbitmq - 1.15.0 containing this change is available at https://epr.elastic.co/search?package=rabbitmq

@elasticmachine
Copy link

Package spring_boot - 1.6.0 containing this change is available at https://epr.elastic.co/search?package=spring_boot

@elasticmachine
Copy link

Package sql - 0.5.0 containing this change is available at https://epr.elastic.co/search?package=sql

@elasticmachine
Copy link

Package stan - 1.7.0 containing this change is available at https://epr.elastic.co/search?package=stan

@elasticmachine
Copy link

Package statsd_input - 0.4.0 containing this change is available at https://epr.elastic.co/search?package=statsd_input

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants