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

jamf_pro: normalize jamf_pro.inventory.operating_system.version and os.version to three-part versions #12834

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Feb 19, 2025

Proposed commit message

jamf_pro: normalize jamf_pro.inventory.operating_system.version and os.version to three-part versions

Depending on the source of the Jamf data, we may receive two-part (e.g.
15.1) or three-part (e.g. 15.1.0) versions for versions where the last
part is zero. This leads to multiplication of the numbers of
semantically identical versions in search results and dashboards. So
normalise all OS versions to the three-part form, unless there are other
syntax components (this should never happen).

Note

The dashboard uses jamf_pro.inventory.operating_system.version, so this why we need to change both.

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

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

@efd6 efd6 added enhancement New feature or request Team:Security-Service Integrations Security Service Integrations Team [elastic/security-service-integrations] Integration:jamf_pro Jamf Pro labels Feb 19, 2025
@efd6 efd6 self-assigned this Feb 19, 2025
@efd6 efd6 force-pushed the 12799-jamf_pro branch 2 times, most recently from 65f6d87 to cc55317 Compare February 19, 2025 02:05
"rapidSecurityResponse": null,
"softwareUpdateDeviceId": "J314cAP",
"supplementalBuildVersion": "23H311",
"version": "14.7"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note this.

"name": "macOS",
"software_update_device_id": "J314cAP",
"supplemental_build_version": "23H311",
"version": "14.7.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Normalised.

},
"os": {
"name": "macOS",
"version": "14.7.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Normalised.

"rapidSecurityResponse": null,
"softwareUpdateDeviceId": "J314cAP",
"supplementalBuildVersion": "23H311",
"version": "14"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note this.

"name": "macOS",
"software_update_device_id": "J314cAP",
"supplemental_build_version": "23H311",
"version": "14.0.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Normalised.

},
"os": {
"name": "macOS",
"version": "14.0.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Normalised.

@elastic-vault-github-plugin-prod

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@efd6 efd6 marked this pull request as ready for review February 19, 2025 02:27
@efd6 efd6 requested a review from a team as a code owner February 19, 2025 02:27
@elasticmachine
Copy link

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

efd6 added 2 commits February 20, 2025 06:57
…s.version to three-part versions

Depending on the source of the Jamf data, we may receive two-part (e.g.
15.1) or three-part (e.g. 15.1.0) versions for versions where the last
part is zero. This leads to multiplication of the numbers of
semantically identical versions in search results and dashboards. So
normalise all OS versions to the three-part form, unless there are other
syntax components (this should never happen).
@elasticmachine
Copy link

💚 Build Succeeded

History

cc @efd6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Integration:jamf_pro Jamf Pro Team:Security-Service Integrations Security Service Integrations Team [elastic/security-service-integrations]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[jamf_pro]: Normalize macOS version number
2 participants