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.

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

Jump to bottom

Fix aws.billing.EstimatedCharges field name #1606

Merged
merged 2 commits into from
Sep 9, 2021
Merged

Fix aws.billing.EstimatedCharges field name #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f430b46
Fix aws.billing.EstimatedCharges field name
kaiyan-sheng Sep 8, 2021
258817c
add changelog
kaiyan-sheng Sep 8, 2021
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
5 changes: 5 additions & 0 deletions packages/aws/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "0.10.6"
changes:
- description: Fix aws.billing.EstimatedCharges field name
type: bugfix
link: https://github.com/elastic/integrations/pull/1606
- version: "0.10.5"
changes:
- description: Add event.created field
Expand Down
2 changes: 1 addition & 1 deletion packages/aws/data_stream/billing/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- name: billing
type: group
fields:
- name: EstimatedCharges.max
- name: EstimatedCharges
type: long
description: Maximum estimated charges for AWS acccount.
- name: Currency
Expand Down
32 changes: 22 additions & 10 deletions packages/aws/data_stream/billing/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,29 @@
},
"aws": {
"billing": {
"metrics": {
"EstimatedCharges": {
"max": 1625.41
}
"Currency": "USD",
"EstimatedCharges": 39.26,
"ServiceName": "AmazonEKS",
"AmortizedCost": {
"amount": 51.6,
"unit": "USD"
},
"BlendedCost": {
"amount": 51.6,
"unit": "USD"
},
"NormalizedUsageAmount": {
"amount": 672,
"unit": "N/A"
},
"UnblendedCost": {
"amount": 51.6,
"unit": "USD"
},
"UsageQuantity": {
"amount": 168,
"unit": "N/A"
}
},
"cloudwatch": {
"namespace": "AWS/Billing"
},
"dimensions": {
"Currency": "USD"
}
},
"service": {
Expand Down
34 changes: 23 additions & 11 deletions packages/aws/docs/billing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,29 @@ An example event for `billing` looks as following:
},
"aws": {
"billing": {
"metrics": {
"EstimatedCharges": {
"max": 1625.41
}
"Currency": "USD",
"EstimatedCharges": 39.26,
"ServiceName": "AmazonEKS",
"AmortizedCost": {
"amount": 51.6,
"unit": "USD"
},
"BlendedCost": {
"amount": 51.6,
"unit": "USD"
},
"NormalizedUsageAmount": {
"amount": 672,
"unit": "N/A"
},
"UnblendedCost": {
"amount": 51.6,
"unit": "USD"
},
"UsageQuantity": {
"amount": 168,
"unit": "N/A"
}
},
"cloudwatch": {
"namespace": "AWS/Billing"
},
"dimensions": {
"Currency": "USD"
}
},
"service": {
Expand All @@ -66,7 +78,7 @@ An example event for `billing` looks as following:
| aws.billing.BlendedCost.amount | Blended cost amount. | double |
| aws.billing.BlendedCost.unit | Blended cost unit. | keyword |
| aws.billing.Currency | Currency name. | keyword |
| aws.billing.EstimatedCharges.max | Maximum estimated charges for AWS acccount. | long |
| aws.billing.EstimatedCharges | Maximum estimated charges for AWS acccount. | long |
| aws.billing.NormalizedUsageAmount.amount | Normalized usage amount. | double |
| aws.billing.NormalizedUsageAmount.unit | Normalized usage amount unit. | keyword |
| aws.billing.ServiceName | AWS service name. | keyword |
Expand Down
2 changes: 1 addition & 1 deletion packages/aws/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: aws
title: AWS
version: 0.10.5
version: 0.10.6
license: basic
description: This integration collects logs and metrics from Amazon Web Services (AWS)
type: integration
Expand Down