Skip to content

Commit c9e4188

Browse files
Update (most) obs-cloud-monitoring owned packages to format_version 3.0.0 (elastic#8041)
* run 'elastic-package format' across all obs-cloud-monitoring owned packages * remove duplicate and unsupported fields from obs-cloud-monitoring owned packages * [aws_logs] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 1.0.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/aws_logs * [awsfargate] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 1.0.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/awsfargate * [awsfirehose] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 2.9.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/awsfirehose * [azure_application_insights] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 2.9.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/azure_application_insights * [azure_billing] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 2.9.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/azure_billing * [gcp_metrics] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 2.0.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/gcp_metrics * additional manual fixes for 'azure_metrics' package * [azure_metrics] - removed dotted YAML keys from manifest The format_version in the package manifest changed from 1.0.0 to 3.0.0. Removed dotted YAML keys from package manifest. Added 'owner.type: elastic' to package manifest. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@v0.0.0-20230926022833-8e5b97998cc0 -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/azure_metrics * update PR number on affected packages * revert changes to 'azure' package - these will be done in a sepearate PR * fix weird auto-formatting introduced into embedded painless scripts in yaml files. * update awsfargate mappings for package-spec v3 compatibility * update awsfirehose mappings for package-spec v3 compatibility * update azure_application_insights validation.yml for package-spec v3 compatibility * update azure_billing validation.yml for package-spec v3 compatibility * revert changes to azure_metrics * remove ingest pipeline that seems to have somehow creeped its way into this PR by mistake
1 parent 43088cb commit c9e4188

File tree

25 files changed

+180
-103
lines changed

25 files changed

+180
-103
lines changed

packages/aws_logs/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: 0.6.0
2+
changes:
3+
- description: Update the package format_version to 3.0.0.
4+
type: enhancement
5+
link: https://github.com/elastic/integrations/pull/8041
16
- version: "0.5.1"
27
changes:
38
- description: Remove duplicated number_of_workers settings

packages/aws_logs/manifest.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
format_version: 1.0.0
1+
format_version: "3.0.0"
22
name: aws_logs
33
title: Custom AWS Logs
44
description: Collect raw logs from AWS S3 or CloudWatch with Elastic Agent.
55
type: integration
6-
version: 0.5.1
7-
release: beta
8-
license: basic
6+
version: "0.6.0"
97
categories:
108
- observability
119
- custom
1210
- aws
1311
conditions:
14-
kibana.version: ^8.0.0
12+
kibana:
13+
version: ^8.0.0
14+
elastic:
15+
subscription: basic
1516
policy_templates:
1617
- name: aws_logs
1718
title: Custom AWS Logs
@@ -89,3 +90,4 @@ vars:
8990
description: URL to proxy connections in the form of http\[s\]://<user>:<password>@<server name/ip>:<port>
9091
owner:
9192
github: elastic/obs-cloud-monitoring
93+
type: elastic

packages/awsfargate/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: 0.4.0
3+
changes:
4+
- description: Update the package format_version to 3.0.0.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/8041
27
- version: 0.3.0
38
changes:
49
- description: Enable TSDB for task stats data stream. This improves storage usage and query performance. For more details, see https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds.html.

packages/awsfargate/data_stream/task_stats/fields/ecs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@
5656
# agent
5757
- name: agent.id
5858
external: ecs
59-
dimension: true
59+
dimension: true

packages/awsfargate/data_stream/task_stats/fields/fields.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
- name: awsfargate.task_stats
22
type: group
3-
release: beta
43
fields:
54
- name: cluster_name
65
type: keyword
@@ -23,8 +22,6 @@
2322
- name: cpu
2423
type: group
2524
fields:
26-
- name: core
27-
type: object
2825
- name: core.*.pct
2926
type: scaled_float
3027
metric_type: gauge
@@ -303,7 +300,7 @@
303300
description: |
304301
Total memory usage.
305302
- name: stats.*
306-
type: object
303+
type: unsigned_long
307304
description: |
308305
Raw memory stats from the cgroups memory.stat interface
309306
- name: usage

packages/awsfargate/data_stream/task_stats/sample_event.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,22 @@
66
"task_known_status": "RUNNING",
77
"task_desired_status": "RUNNING",
88
"cpu": {
9-
"core": null,
9+
"core": {
10+
"1": {
11+
"pct": 0,
12+
"norm": {
13+
"pct": 0
14+
},
15+
"ticks": 1520000000
16+
},
17+
"2": {
18+
"pct": 0,
19+
"norm": {
20+
"pct": 0
21+
},
22+
"ticks": 1420180000000
23+
}
24+
},
1025
"kernel": {
1126
"norm": {
1227
"pct": 0

packages/awsfargate/docs/README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ If you want to learn more about Amazon ECS metrics, take a look at the blog post
304304
| @timestamp | Event timestamp. | date | |
305305
| agent.id | Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id. | keyword | |
306306
| awsfargate.task_stats.cluster_name | Cluster name | keyword | |
307-
| awsfargate.task_stats.cpu.core | | object | |
308307
| awsfargate.task_stats.cpu.core.\*.norm.pct | Percentage of time per CPU core normalized by the number of CPU cores. | scaled_float | gauge |
309308
| awsfargate.task_stats.cpu.core.\*.pct | Percentage of time per CPU core. | scaled_float | gauge |
310309
| awsfargate.task_stats.cpu.core.\*.ticks | CPU ticks per CPU core. | long | counter |
@@ -351,7 +350,7 @@ If you want to learn more about Amazon ECS metrics, take a look at the blog post
351350
| awsfargate.task_stats.memory.rss.usage.max | Max memory usage. | long | counter |
352351
| awsfargate.task_stats.memory.rss.usage.pct | Memory usage percentage. | scaled_float | gauge |
353352
| awsfargate.task_stats.memory.rss.usage.total | Total memory usage. | long | gauge |
354-
| awsfargate.task_stats.memory.stats.\* | Raw memory stats from the cgroups memory.stat interface | object | |
353+
| awsfargate.task_stats.memory.stats.\* | Raw memory stats from the cgroups memory.stat interface | unsigned_long | |
355354
| awsfargate.task_stats.memory.usage.max | Max memory usage. | long | counter |
356355
| awsfargate.task_stats.memory.usage.pct | Memory usage percentage. | scaled_float | gauge |
357356
| awsfargate.task_stats.memory.usage.total | Total memory usage. | long | gauge |
@@ -403,7 +402,22 @@ An example event for `task_stats` looks as following:
403402
"task_known_status": "RUNNING",
404403
"task_desired_status": "RUNNING",
405404
"cpu": {
406-
"core": null,
405+
"core": {
406+
"1": {
407+
"pct": 0,
408+
"norm": {
409+
"pct": 0
410+
},
411+
"ticks": 1520000000
412+
},
413+
"2": {
414+
"pct": 0,
415+
"norm": {
416+
"pct": 0
417+
},
418+
"ticks": 1420180000000
419+
}
420+
},
407421
"kernel": {
408422
"norm": {
409423
"pct": 0

packages/awsfargate/manifest.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
format_version: 1.0.0
1+
format_version: "3.0.0"
22
name: awsfargate
33
title: AWS Fargate
4-
version: 0.3.0
5-
license: basic
4+
version: "0.4.0"
65
description: Collects metrics from containers and tasks running on Amazon ECS clusters with Elastic Agent.
76
type: integration
87
categories:
98
- observability
109
- aws
11-
release: beta
1210
conditions:
13-
kibana.version: "^8.8.0"
11+
kibana:
12+
version: "^8.8.0"
13+
elastic:
14+
subscription: basic
1415
owner:
1516
github: elastic/obs-cloud-monitoring
17+
type: elastic
1618
screenshots:
1719
- src: /img/awsfargate-integration-overview.png
1820
title: awsfargate integration overview

packages/awsfargate/validation.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
errors:
2+
exclude_checks:
3+
- SVR00002 # expected filter in dashboard: no filter found

packages/awsfirehose/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: 0.5.0
3+
changes:
4+
- description: Update the package format_version to 3.0.0.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/8041
27
- version: 0.4.0
38
changes:
49
- description: Add routing rules for cloudfront log, elb log and s3access log.

0 commit comments

Comments
 (0)