Skip to content

fix(ess_billing): Improve reliability and prevent API errors #14744

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.

Sign up for GitHub

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 11 commits into from
Aug 18, 2025
Merged

fix(ess_billing): Improve reliability and prevent API errors #14744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d22b48e
style(ess_billing): celfmt
andrewkroh Jul 30, 2025
d7bb883
fix(ess_billing.billing): set want_more to false on error
andrewkroh Jul 30, 2025
b74e640
fix(ess_billing): use now instead of now() in CEL program
andrewkroh Jul 30, 2025
9e53bb8
add system test
andrewkroh Jul 30, 2025
0a7a2bc
fix(ess_billing): enforce minimum 'from' date to prevent API errors
andrewkroh Jul 31, 2025
7a3e86d
add changelog
andrewkroh Jul 31, 2025
583c2ac
raise stack requirement to 8.18
andrewkroh Jul 31, 2025
d1893c2
fix(ess_billing): enforce correct data types in CEL program templates
andrewkroh Aug 15, 2025
650ff09
fix(ess_billing): don't update cursor on non-HTTP 200
andrewkroh Aug 15, 2025
7540011
Merge remote-tracking branch 'elastic/main' into ess_billing/fix/no-r…
andrewkroh Aug 15, 2025
f9c66e2
comment about redundant drop processor in pipeline
andrewkroh Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/ess_billing/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# newer versions go on top
- version: "1.4.3"
changes:
- description: Fixed minimum date validation for ESS Billing API to prevent errors with dates prior to 2021-01-01. This change requires Elastic Agent 8.18 or greater.
type: bugfix
link: https://github.com/elastic/integrations/pull/14744
- description: Fixed excessive retries by stopping repeated API requests after non-200 HTTP errors.
type: bugfix
link: https://github.com/elastic/integrations/pull/14744
- version: "1.4.2"
changes:
- description: Add temporary processor to remove the fields added by the Agentless policy.
Expand Down
13 changes: 13 additions & 0 deletions packages/ess_billing/data_stream/billing/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
ess_billing:
image: docker.elastic.co/observability/stream:v0.19.0
ports:
- 8080
volumes:
- ./files:/files:ro
environment:
PORT: '8080'
STREAM_ADDR: ":8080"
command:
- http-server
- --config=/files/stream-config.yml
290 changes: 290 additions & 0 deletions packages/ess_billing/data_stream/billing/_dev/deploy/docker/files/stream-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
rules:
# Auth error test case (unused because elastic-package cannot handle testing events with error values.)
- path: /api/v2/billing/organizations/3333/costs/instances
methods: ['GET']
request_headers:
Authorization:
- "xxxx"
query_params:
from: "{from:.+}"
to: "{to:.+}"
responses:
- status_code: 403
headers:
Content-Type:
- 'text/plain; charset=utf-8'
body: |-
403: User does not have 'billing-costs:get:3333' permissions

# No instances test case (currently used because elastic-package does not support zero hit_count assertions).
- path: /api/v2/billing/organizations/2222/costs/instances
methods: ['GET']
request_headers:
Authorization:
- "xxxx"
query_params:
from: "{from:.+}"
to: "{to:.+}"
responses:
- status_code: 200
headers:
Content-Type:
- 'application/json'
body: |-
{{ minify_json `
{
"total_ecu": 14.0214,
"instances": []
}
`}}

# Normal test case.
- path: /api/v2/billing/organizations/1111/costs/instances
methods: ['GET']
request_headers:
Authorization:
- "xxxx"
query_params:
from: "{from:.+}"
to: "{to:.+}"
responses:
- status_code: 200
headers:
Content-Type:
- 'application/json'
body: |-
{{ minify_json `
{
"total_ecu": 14.0214,
"instances": [
{
"total_ecu": 14.0214,
"id": "4679751e171d403d8603cb1639b67e57",
"name": "example-deployment",
"type": "deployment",
"product_line_items": [
{
"name": "Cloud Standard, AWS us-east-1 (N. Virginia), aws.es.datafrozen.i3en.2, 4GB, 1AZ",
"total_ecu": 2.8992,
"type": "capacity",
"sku": "aws.es.datafrozen.i3en.2_us-east-1_4096_1",
"unit": "hour",
"quantity": {
"value": 24,
"formatted_value": "24 hours"
},
"display_quantity": {
"value": 24,
"formatted_value": "24 hours",
"type": "default"
},
"rate": {
"value": 0.1208,
"formatted_value": "0.1208 per hour"
},
"kind": "elasticsearch",
"quantities": []
},
{
"name": "Cloud Standard, AWS us-east-1 (N. Virginia), aws.es.datahot.c6gd, 4GB, 2AZ",
"total_ecu": 7.3728,
"type": "capacity",
"sku": "aws.es.datahot.c6gd_us-east-1_4096_2",
"unit": "hour",
"quantity": {
"value": 24,
"formatted_value": "24 hours"
},
"display_quantity": {
"value": 24,
"formatted_value": "24 hours",
"type": "default"
},
"rate": {
"value": 0.3072,
"formatted_value": "0.3072 per hour"
},
"kind": "elasticsearch",
"quantities": []
},
{
"name": "Cloud Standard, AWS us-east-1 (N. Virginia), aws.kibana.c6gd, 1GB, 1AZ",
"total_ecu": 0.0,
"type": "capacity",
"sku": "aws.kibana.c6gd_us-east-1_1024_1",
"unit": "hour",
"quantity": {
"value": 24,
"formatted_value": "24 hours"
},
"display_quantity": {
"value": 24,
"formatted_value": "24 hours",
"type": "default"
},
"rate": {
"value": 0.0,
"formatted_value": "0.0000 per hour"
},
"kind": "kibana",
"quantities": []
},
{
"name": "AWS Data Transfer In",
"total_ecu": 0.0,
"type": "data_in",
"sku": "aws.data-transfer-in",
"unit": "GB",
"quantity": {
"value": 8.326714027673006,
"formatted_value": "8.3267 GBs"
},
"display_quantity": {
"value": 8.326714027673006,
"formatted_value": "8.3267 GBs",
"type": "default"
},
"rate": {
"value": 0.0,
"formatted_value": "0.0000 per GB"
},
"kind": null,
"quantities": []
},
{
"name": "AWS Data Transfer Out",
"total_ecu": 0.0236,
"type": "data_out",
"sku": "aws.data-transfer-out",
"unit": "GB",
"quantity": {
"value": 0.47151940781623125,
"formatted_value": "0.4715 GBs"
},
"display_quantity": {
"value": 0.47151940781623125,
"formatted_value": "0.4715 GBs",
"type": "default"
},
"rate": {
"value": 0.05,
"formatted_value": "0.0500 per GB"
},
"kind": null,
"quantities": []
},
{
"name": "AWS Data Transfer Inter-Node",
"total_ecu": 2.4238,
"type": "data_internode",
"sku": "aws.data-transfer-inter-node",
"unit": "GB",
"quantity": {
"value": 151.48789499513805,
"formatted_value": "151.4879 GBs"
},
"display_quantity": {
"value": 151.48789499513805,
"formatted_value": "151.4879 GBs",
"type": "default"
},
"rate": {
"value": 0.016,
"formatted_value": "0.0160 per GB"
},
"kind": null,
"quantities": []
},
{
"name": "AWS Snapshot Storage",
"total_ecu": 0.2724,
"type": "storage_bytes",
"sku": "aws.snapshot-storage",
"unit": "GB",
"quantity": {
"value": 8.25573491696794,
"formatted_value": "8.2557 GBs"
},
"display_quantity": {
"value": 8.25573491696794,
"formatted_value": "8.2557 GBs",
"type": "default"
},
"rate": {
"value": 0.033,
"formatted_value": "0.0330 per GB"
},
"kind": null,
"quantities": []
},
{
"name": "AWS Snapshot Storage API",
"total_ecu": 1.0296,
"type": "storage_api",
"sku": "aws.snapshot-api-1k",
"unit": "1000 API Calls",
"quantity": {
"value": 572,
"formatted_value": "572k requests"
},
"display_quantity": {
"value": 572,
"formatted_value": "572k requests",
"type": "default"
},
"rate": {
"value": 0.0018,
"formatted_value": "0.0018 per 1000 API Calls"
},
"kind": null,
"quantities": []
},
{
"name": "Synthetics Browser",
"total_ecu": 0.0,
"type": "synthetics_browser",
"sku": "global.synthetics-browser",
"unit": "test",
"quantity": {
"value": 0.0,
"formatted_value": "0 tests"
},
"display_quantity": {
"value": 0.0,
"formatted_value": "0 tests",
"type": "default"
},
"rate": {
"value": 0.0123,
"formatted_value": "0.0123 per test"
},
"kind": null,
"quantities": []
},
{
"name": "Synthetics Lightweight",
"total_ecu": 0.0,
"type": "synthetics_lightweight",
"sku": "global.synthetics-lightweight",
"unit": "region",
"quantity": {
"value": 0.0,
"formatted_value": "0 regions"
},
"display_quantity": {
"value": 0.0,
"formatted_value": "0 regions",
"type": "default"
},
"rate": {
"value": 28.0,
"formatted_value": "28.0000 per region"
},
"kind": null,
"quantities": []
}
]
}
]
}
`}}
22 changes: 22 additions & 0 deletions packages/ess_billing/data_stream/billing/_dev/test/system/test-normal-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
input: cel
service: ess_billing
vars:
url: http://{{Hostname}}:{{Port}}
organization_id: 1111
api_key: xxxx
data_stream:
vars:
lookbehind: 2
hide_sensitive: false
enable_request_tracer: true
# Verify this merges with the built-in drop_event processor.
processors: |-
- add_fields:
target: labels
fields:
test_run_id: "{{Test.RunID}}"

assert:
# There are 10 records in the mocked response.
# And with lookbehind=2 this means it will execute twice, resulting in 10 * 2 = 20 records.
hit_count: 20
Loading