Chargeback 0.3.1: chargeable-unit field names and deployment_tags fix#18102
Open
JohannesMahne wants to merge 7 commits intowip-johannes-chargebackfrom
Open
Chargeback 0.3.1: chargeable-unit field names and deployment_tags fix#18102JohannesMahne wants to merge 7 commits intowip-johannes-chargebackfrom
JohannesMahne wants to merge 7 commits intowip-johannes-chargebackfrom
Conversation
JohannesMahne
added a commit
to elastic/elasticsearch-chargeback
that referenced
this pull request
Mar 27, 2026
…erences - Add integration/assets/0.3.1/chargeback-0.3.1.zip (built from integrations PR elastic/integrations#18102) - Update Instructions.md asset link to chargeback-0.3.1.zip - Update README.md version header, compatibility table, and add 0.3.1 release notes - Bump CHARGEBACK_VERSION default to 0.3.1 in run_e2e_tests.sh and cleanup_testing_env.sh Key changes in 0.3.1 vs 0.3.0: deployment_tags string/array fix in billing transform, explicit lookup mappings removed from manifest, pipeline versions bumped to 0.3.1-billing / 0.3.1-usage, dashboard @timestamp exists filter added. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
packages/chargeback/kibana/alerting_rule_template/chargeback-deployment-missing-usage-data.json
Show resolved
Hide resolved
Author
|
Test evidence: 
|
Author
|
Hey @sholzhauer-es — requesting your review here. This PR renames the ECU-based fields to chargeable-unit terminology ( |
e2b9237 to
4984f8f
Compare
- Rename conf_ecu_rate -> conf_chargeable_unit_rate (float -> double), conf_ecu_rate_unit -> conf_chargeable_unit_rate_unit - Rename total_ecu -> total_chargeable_units in billing_cluster_cost transform - Fix billing_cluster_cost transform to handle ess.billing.deployment_tags as string or array - Fix billing.yml ingest pipeline: snapshot-storage regex & -> .* so snapshot SKUs are correctly classified as cost_type 'snapshots' - Add explicit billing_cluster_cost_lookup index mappings - Bump manifest to 0.3.1, pipeline versions to 0.3.1-billing/0.3.1-usage - Update dashboard ES|QL and README for new field names Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
4984f8f to
37e5987
Compare
Fixes CI: mage check requires every package to have an owner. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
elastic/elasticsearch-chargeback is not a valid GitHub team in CODEOWNERS; align with chargeback package. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
sholzhauer-es
requested changes
Mar 30, 2026
Contributor
sholzhauer-es
left a comment
There was a problem hiding this comment.
During build i got a warning:
Build the package
2026/03/30 13:20:40 INFO License text found in "/Users/sholzhauer/Github/elastic/integrations/LICENSE.txt" will be included in package
Error: building package failed: invalid content found in built zip package: found 1 validation error:
1. item [alerting_rule_template] is not allowed in folder [/Users/sholzhauer/Github/elastic/integrations/build/packages/chargeback-0.3.1.zip/kibana]
Package did build successfully ✅
Rule templates showing up ✅
In place upgrade breaks the dashboard though.
Contributor
|
The README references a "upgrade documentation", can we clarify that? Might be i was missing that. |
This was referenced Mar 31, 2026
JohannesMahne
added a commit
that referenced
this pull request
Apr 7, 2026
- Use COALESCE in all dashboard ES|QL for total_chargeable_units/total_ecu and conf_chargeable_unit_rate/conf_ecu_rate (and unit fields) so lookup data from before the rename still works after upgrade. - Document end-user upgrade behavior under Dashboard; fix sample conf_end_date. - Note compatibility in changelog 0.3.1 entry. Responds to review on #18102 (in-place upgrade breaking dashboard; clarify upgrade expectations). Made-with: Cursor
- Use COALESCE in all dashboard ES|QL for total_chargeable_units/total_ecu and conf_chargeable_unit_rate/conf_ecu_rate (and unit fields) so lookup data from before the rename still works after upgrade. - Document end-user upgrade behavior under Dashboard; fix sample conf_end_date. - Note compatibility in changelog 0.3.1 entry. Responds to review on #18102 (in-place upgrade breaking dashboard; clarify upgrade expectations). Made-with: Cursor
- Bump format_version to 3.5.0 (same track as integrations that ship kibana/alerting_rule_template) so built zips validate against current package-spec kibana layout. - Remove validation.yml SVR00002 exclusion; dashboard already satisfies the time-filter check. - README: note Kibana 9.2+ requirement for alert rule templates. Addresses review feedback on #18102 (alerting_rule_template zip validation warning; clarify alerting vs stack version). Made-with: Cursor
Author
|
@sholzhauer-es - I fixed all the issues you picked up. The dashboard issue was because of changing field names in the lookup index. I fixed it by using |
CI runs elastic-package v0.118 (go.mod), which fails check when docs/README.md differs from build output sourced from _dev/build/docs/README.md. Move upgrade and alerting copy into the build source, fix sample conf_end_date, rebuild rendered README. Made-with: Cursor
JohannesMahne
added a commit
to elastic/elasticsearch-chargeback
that referenced
this pull request
Apr 7, 2026
Built with elastic-package from integrations branch wip-johannes-chargeback-chargable-units @ 3a87a3c98b (PR elastic/integrations#18102). Includes dashboard ES|QL COALESCE for 0.3.0 upgrade compatibility, README sync via _dev/build/docs, format_version 3.5.0, and removal of validation.yml SVR00002 override. Refreshes asset for #89. Made-with: Cursor
💚 Build Succeeded
History
|
JohannesMahne
added a commit
to elastic/elasticsearch-chargeback
that referenced
this pull request
Apr 7, 2026
Built with elastic-package from branch wip-johannes-chargeback-chargable-units @ 24c5f464e9 (elastic/integrations#18102). Includes onprem_billing changelog link lint fix for CI; chargeback package unchanged in zip content vs prior rebuild if only sibling package differed— rebuilt from current integrations tree for PR #89. Made-with: Cursor
Author
|
Merge / release housekeeping (supersedes integrations#17409; fixes elasticsearch-chargeback#91)
|
This was referenced Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Bumps the Chargeback integration to 0.3.1 with generic chargeable-unit field names, a billing_cluster_cost runtime fix when
ess.billing.deployment_tagsis a single string, dashboard ES|QL and validation updates, and pipeline /fleet_transform_versionbumps.Changes
conf_ecu_rate/conf_ecu_rate_unit→conf_chargeable_unit_rate/conf_chargeable_unit_rate_unit;total_ecu→total_chargeable_units(transforms, ingest, dashboard, docs).deployment_tagsas List or String (see elasticsearch-chargeback#91).@timestampexists filter for package build validation (SVR00002).fleet_transform_version: 0.3.1.Base branch
Opened against
wip-johannes-chargeback(upstream integration line). If you prefer a branch namedwip-chargeback-integration, create it from the same tip as this line and retarget, or say the word and we can align naming.Testing
elastic-package buildsucceeds; artifact:build/packages/chargeback-0.3.1.zip.Changelog
changelog.yml0.3.1 entry currently links elasticsearch-chargeback#91; update to this PR link after merge if desired.Made with Cursor