Skip to content

[axonius ]Axonius fix merge conflicts with main and code improvements. - #19286

Closed
muskan-agarwal26 wants to merge 18 commits into
elastic:mainfrom
muskan-agarwal26:axonius-fix_conflictc
Closed

muskan-agarwal26 wants to merge 18 commits into
elastic:mainfrom
muskan-agarwal26:axonius-fix_conflictc

Conversation

@muskan-agarwal26

Copy link
Copy Markdown
Contributor

Proposed commit message

  1. Update cel code and manifest to use asset_type_list var
  2. Remove event.data.* and map fields on root level.
  3. Remove drop event from pipeline
  4. Update transform frequency to 90d for assets
  5. ILM retention to 30d for assets
  6. Add visual level filter in dashboard
  7. Add remove inside on_failure in convert processor
  8. Change tenant_number field type to long and description/summary field type to text
  9. Add fingerprint description and code comments in transform, as added in network datastream
  10. Add note in overview of dashboard for assets
  11. Update the if condition in all pipeline processors to be in the format: ctx.axonius?.asset_type == pattern

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

To test the Axonius package:

  • Clone integrations repo.
  • Install elastic package locally.
  • Start elastic stack using elastic-package.
  • Move to integrations/packages/axonius directory.
  • Run the following command to run tests.

Related issues

muskan-agarwal26 and others added 14 commits December 31, 2025 17:57
…6171)

This introduces a new Axonius integration for cybersecurity asset management, enabling collection of adapter health and performance data through the Axonius API. The integration provides visibility into adapter status, connection health, and configuration details to help teams maintain reliable data ingestion and identify problematic integrations.

Test samples were derived from live data samples, which were subsequently sanitized.
The initial release includes user data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.
The release includes gateway data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.
axonius: add exposure data stream with vulnerability and asset data

This new data stream collects vulnerability instances, vulnerabilities, 
and vulnerability repository data from the Axonius platform via the 
/api/v2/assets/ endpoint. Axonius fields are mapped to their 
corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

API documentation: https://docs.axonius.com/docs/axonius-rest-api
---------

Co-authored-by: muskan-crest <muskan.agarwal@crestdata.ai>
…am (elastic#16603)

This new data stream collects alert findings and incidents data from the Axonius platform via the
/api/v2/assets/ endpoint. Axonius fields are mapped to their
corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

API documentation: https://docs.axonius.com/docs/axonius-rest-api
The release includes storage data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.
The release includes ticket data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

---------

Co-authored-by: muskan-crest <muskan.agarwal@crestdata.ai>
The release includes network data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.
The release includes identity data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

---------

Co-authored-by: muskan-crest <muskan.agarwal@crestdata.ai>
The release includes compute data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

---------

Co-authored-by: muskan-crest <muskan.agarwal@crestdata.ai>
… (elastic#16658)

The release includes application data stream and associated dashboard.

Axonius fields are mapped to their corresponding ECS fields where possible.

Test samples were derived from live data samples, which were subsequently
sanitized.

---------

Co-authored-by: muskan-crest <muskan.agarwal@crestdata.ai>
1. update cel code and manifest to use asset_type_list var
2. remove event.data.*  and map fields on root level.
3. remove drop event from pipeline
4. update transform frequency to 90d for assets
5. ILM retention to 30d for assets
6. Add visual level filter in dashboard
7. Add remove inside on_failure in convert processor
8. Change tenant_number field type to long and description/summary field type to text
9. Add fingerprint description and code comments in transform, as added in network datastream
10. Add note in overview of dashboard for assets
11. Update the if condition in all pipeline processors to be in the format: ctx.axonius?.asset_type ==  pattern.
@muskan-agarwal26
muskan-agarwal26 marked this pull request as ready for review May 29, 2026 10:48
@muskan-agarwal26
muskan-agarwal26 requested a review from a team as a code owner May 29, 2026 10:48
@github-actions

Copy link
Copy Markdown
Contributor

Elastic Docs Style Checker (Vale)

Summary: 21 warnings, 7 suggestions found

⚠️ Warnings (21): Fix when the suggestion improves clarity or correctness.
File Line Rule Message
packages/axonius/_dev/build/docs/README.md 5 Elastic.EndPuntuaction Don't end headings with punctuation.
packages/axonius/_dev/build/docs/README.md 128 Elastic.MenuArrowsBold Use '→' to separate menu items, not '' or '='. Example: Select Manage index → Add lifecycle policy.
packages/axonius/_dev/build/docs/README.md 128 Elastic.MenuArrows Use '→' to separate menu items, not '' or '='. Example: Select Manage index → Add lifecycle policy.
packages/axonius/_dev/build/docs/README.md 165 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'and so on' instead of 'etc'.
packages/axonius/_dev/build/docs/README.md 183 Elastic.DirectionalLanguage Don't use directional language. Use 'the following element' instead of 'the table below'.
packages/axonius/data_stream/identity/fields/fields.yml 78 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 183 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 324 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 447 Elastic.Accessibility Don't use language such as 'non-verbal' that defines people by their disability.
packages/axonius/data_stream/identity/fields/fields.yml 660 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 753 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 807 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 849 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 1245 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 1275 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 1311 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/identity/fields/fields.yml 1350 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/network/fields/fields.yml 146 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/network/fields/fields.yml 323 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/data_stream/network/fields/fields.yml 326 Elastic.Latinisms Latin terms and abbreviations are a common source of confusion. Use 'for example' instead of 'e.g'.
packages/axonius/manifest.yml 114 Elastic.DontUse Don't use 'Please'.
💡 Suggestions (7): Optional style improvements. Apply when helpful.
File Line Rule Message
packages/axonius/changelog.yml 1 Elastic.Versions Use 'later versions' instead of 'newer versions' when referring to versions.
packages/axonius/data_stream/compute/fields/fields.yml 788 Elastic.Repetition "on" is repeated.
packages/axonius/data_stream/compute/fields/fields.yml 1483 Elastic.WordChoice Consider using 'can, might' instead of 'may', unless the term is in the UI.
packages/axonius/data_stream/identity/fields/fields.yml 16 Elastic.WordChoice Consider using 'deactivated, deselected, hidden, turned off, unavailable' instead of 'disabled', unless the term is in the UI.
packages/axonius/data_stream/identity/fields/fields.yml 1410 Elastic.WordChoice Consider using 'can, might' instead of 'may', unless the term is in the UI.
packages/axonius/data_stream/network/fields/fields.yml 1283 Elastic.WordChoice Consider using 'can, might' instead of 'may', unless the term is in the UI.
packages/axonius/data_stream/ticket/fields/fields.yml 129 Elastic.WordChoice Consider using 'can, might' instead of 'may', unless the term is in the UI.

The Vale linter checks documentation changes against the Elastic Docs style guide. To use Vale locally or report issues, refer to Elastic style guide for Vale.

@andrewkroh andrewkroh added New Integration Issue or pull request for creating a new integration package. documentation Improvements or additions to documentation. Applied to PRs that modify *.md files. Crest Contributions from Crest developement team. labels May 29, 2026
@elastic-vault-github-plugin-prod

Copy link
Copy Markdown
Contributor

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@kcreddy kcreddy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@muskan-agarwal26 can you confirm this is the only commit 52777a0 that is newly added code in this PR (that wasn't reviewed yet)?

Maybe we create another PR just for this commit 52777a0 changes alone into existing feature/ branch first, and then revisit this PR.
@efd6 WDYT?

If we are going with this PR itself (no new PR for 52777a0), I think we should update the changelog to properly describe what's new.

Comment thread packages/axonius/changelog.yml Outdated
Comment on lines +7 to +9
- description: Initial release.
type: enhancement
link: https://github.com/elastic/integrations/pull/16599

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The description here doesn't match with this PR.

Comment thread packages/axonius/changelog.yml Outdated
Comment on lines +4 to +6
- description: Resolve merge conflicts and code improvements.
type: enhancement
link: https://github.com/elastic/integrations/pull/19286

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think current PR should be linked to description: Initial release

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There are many inconsistencies in this changelog

  • 7 data streams are completely missing
  • Initial release not linked to the correct PR.

Could also just go with:

- version: 0.1.0
  changes:
    - description: Initial release with adapter, user, gateway, exposure, alert_finding, incident, storage, ticket, network, identity, compute, and application data streams.
      type: enhancement
      link: https://github.com/elastic/integrations/pull/19286

@efd6 any suggestion here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@muskan-agarwal26,

A PR into elastic:main from feature/** branch (previous approach) should be enough for the new integrations - because there shouldn't be any merge conflicts (no integration related files in elastic:main yet). Did you already try this and faced any difficulties?

@kcreddy
kcreddy requested a review from efd6 May 29, 2026 13:54
@elasticmachine

Copy link
Copy Markdown

💚 Build Succeeded

History

@muskan-agarwal26
muskan-agarwal26 requested a review from kcreddy June 1, 2026 09:10
@muskan-agarwal26
muskan-agarwal26 changed the base branch from main to feature/axonius-0.1.0 June 2, 2026 06:51
@muskan-agarwal26
muskan-agarwal26 requested review from a team as code owners June 2, 2026 06:51
@muskan-agarwal26
muskan-agarwal26 requested review from nkvoll and removed request for a team June 2, 2026 06:51
@muskan-agarwal26
muskan-agarwal26 changed the base branch from feature/axonius-0.1.0 to main June 2, 2026 06:53
@efd6

efd6 commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

What is the feature branch that this was obtained from?

@muskan-agarwal26

Copy link
Copy Markdown
Contributor Author

Closing as raised another(#19335) to merge into feature/axonius-0.1.0, as discussed with @kcreddy .

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

Labels

Crest Contributions from Crest developement team. documentation Improvements or additions to documentation. Applied to PRs that modify *.md files. New Integration Issue or pull request for creating a new integration package.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants