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

[O11y][Apache Tomcat] Add TSDB enablement for request and cache data streams and update ecs.yml file #6788

Merged
merged 8 commits into from Oct 18, 2023
Merged

[O11y][Apache Tomcat] Add TSDB enablement for request and cache data streams and update ecs.yml file #6788

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61dc862
add tsdb enablement
harnish-elastic Jul 3, 2023
de1a464
update changelog.yml
harnish-elastic Jul 3, 2023
c29d2af
address review comments for re-generate system test
harnish-elastic Jul 7, 2023
101af08
Merge branch 'main' of https://github.com/harnish-elastic/integration…
harnish-elastic Jul 7, 2023
008fdda
update ecs.yml as per tsdb enablement
harnish-elastic Jul 12, 2023
776a9fe
move index_mode lines to end of the file
harnish-elastic Jul 13, 2023
ea31a34
Merge branch 'main' of https://github.com/harnish-elastic/integration…
harnish-elastic Jul 13, 2023
9f5752b
Merge branch 'main' of https://github.com/harnish-elastic/integration…
harnish-elastic Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/apache_tomcat/changelog.yml
View file
Open in desktop
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "0.9.0"
changes:
- description: Add support of TSDB enablement to request and cache data streams.
type: enhancement
link: https://github.com/elastic/integrations/pull/6788
- version: "0.8.0"
changes:
- description: Update the processor description link.
Expand Down
10 changes: 8 additions & 2 deletions packages/apache_tomcat/data_stream/cache/fields/ecs.yml
View file
Open in desktop
Expand Up @@ -2,14 +2,20 @@
name: agent.id
dimension: true
- external: ecs
name: cloud.instance.id
name: cloud.account.id
dimension: true
- external: ecs
name: cloud.availability_zone
dimension: true
- external: ecs
name: cloud.project.id
name: cloud.instance.id
dimension: true
- external: ecs
name: cloud.provider
dimension: true
- external: ecs
name: cloud.region
dimension: true
- external: ecs
name: container.id
dimension: true
Expand Down
2 changes: 2 additions & 0 deletions packages/apache_tomcat/data_stream/cache/manifest.yml
View file
Open in desktop
Expand Up @@ -29,3 +29,5 @@ streams:
template_path: stream.yml.hbs
title: Apache Tomcat Cache metrics
description: Collect Apache Tomcat Cache metrics.
elasticsearch:
index_mode: "time_series"
30 changes: 15 additions & 15 deletions packages/apache_tomcat/data_stream/cache/sample_event.json
View file
Open in desktop
@@ -1,11 +1,11 @@
{
"@timestamp": "2023-05-02T10:24:35.071Z",
"@timestamp": "2023-07-06T06:19:25.324Z",
"agent": {
"ephemeral_id": "50b70c68-699c-4bb6-9e46-1d19f2f971e1",
"id": "41c81fe5-7323-4e84-b501-ddad2fa3530a",
"ephemeral_id": "dd4ae675-0ef8-49ba-9568-d7f989add4dd",
"id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "8.7.0"
"version": "8.8.0"
},
"apache_tomcat": {
"cache": {
Expand Down Expand Up @@ -45,18 +45,18 @@
"version": "8.7.0"
},
"elastic_agent": {
"id": "41c81fe5-7323-4e84-b501-ddad2fa3530a",
"id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
"snapshot": false,
"version": "8.7.0"
"version": "8.8.0"
},
"event": {
"agent_id_status": "verified",
"category": [
"web"
],
"dataset": "apache_tomcat.cache",
"duration": 295546716,
"ingested": "2023-05-02T10:24:39Z",
"duration": 253547035,
"ingested": "2023-07-06T06:19:29Z",
"kind": "metric",
"module": "apache_tomcat",
"type": [
Expand All @@ -67,22 +67,22 @@
"architecture": "x86_64",
"containerized": true,
"hostname": "docker-fleet-agent",
"id": "cdea87653a5e4f29905ca04b74758604",
"id": "e8978f2086c14e13b7a0af9ed0011d19",
"ip": [
"172.31.0.4"
"172.27.0.7"
],
"mac": [
"02-42-AC-1F-00-04"
"02-42-AC-1B-00-07"
],
"name": "docker-fleet-agent",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "3.10.0-1160.88.1.el7.x86_64",
"kernel": "3.10.0-1160.90.1.el7.x86_64",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "20.04.5 LTS (Focal Fossa)"
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"metricset": {
Expand All @@ -94,7 +94,7 @@
"type": "prometheus"
},
"tags": [
"forwarded",
"apache_tomcat-cache"
"apache_tomcat-cache",
"forwarded"
]
}
10 changes: 8 additions & 2 deletions packages/apache_tomcat/data_stream/request/fields/ecs.yml
View file
Open in desktop
Expand Up @@ -2,14 +2,20 @@
name: agent.id
dimension: true
- external: ecs
name: cloud.instance.id
name: cloud.account.id
dimension: true
- external: ecs
name: cloud.availability_zone
dimension: true
- external: ecs
name: cloud.project.id
name: cloud.instance.id
dimension: true
- external: ecs
name: cloud.provider
dimension: true
- external: ecs
name: cloud.region
dimension: true
- external: ecs
name: container.id
dimension: true
Expand Down
2 changes: 2 additions & 0 deletions packages/apache_tomcat/data_stream/request/manifest.yml
View file
Open in desktop
Expand Up @@ -29,3 +29,5 @@ streams:
template_path: stream.yml.hbs
title: Apache Tomcat Request metrics
description: Collect Apache Tomcat Request metrics.
elasticsearch:
index_mode: "time_series"
34 changes: 17 additions & 17 deletions packages/apache_tomcat/data_stream/request/sample_event.json
View file
Open in desktop
@@ -1,11 +1,11 @@
{
"@timestamp": "2023-05-02T10:28:11.414Z",
"@timestamp": "2023-07-06T06:18:00.930Z",
"agent": {
"ephemeral_id": "f49b0637-5820-4155-bed9-519e4db4148a",
"id": "41c81fe5-7323-4e84-b501-ddad2fa3530a",
"ephemeral_id": "e291bf4e-e4fc-42c4-bb98-8acddc2e7af1",
"id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "8.7.0"
"version": "8.8.0"
},
"apache_tomcat": {
"request": {
Expand All @@ -21,8 +21,8 @@
"bytes": 11215
},
"time": {
"max": 1112,
"total": 1112
"max": 942,
"total": 942
}
}
},
Expand All @@ -35,18 +35,18 @@
"version": "8.7.0"
},
"elastic_agent": {
"id": "41c81fe5-7323-4e84-b501-ddad2fa3530a",
"id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
"snapshot": false,
"version": "8.7.0"
"version": "8.8.0"
},
"event": {
"agent_id_status": "verified",
"category": [
"web"
],
"dataset": "apache_tomcat.request",
"duration": 317506732,
"ingested": "2023-05-02T10:28:15Z",
"duration": 266759936,
"ingested": "2023-07-06T06:18:04Z",
"kind": "metric",
"module": "apache_tomcat",
"type": [
Expand All @@ -57,22 +57,22 @@
"architecture": "x86_64",
"containerized": true,
"hostname": "docker-fleet-agent",
"id": "cdea87653a5e4f29905ca04b74758604",
"id": "e8978f2086c14e13b7a0af9ed0011d19",
"ip": [
"172.31.0.4"
"172.27.0.7"
],
"mac": [
"02-42-AC-1F-00-04"
"02-42-AC-1B-00-07"
],
"name": "docker-fleet-agent",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "3.10.0-1160.88.1.el7.x86_64",
"kernel": "3.10.0-1160.90.1.el7.x86_64",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "20.04.5 LTS (Focal Fossa)"
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"metricset": {
Expand All @@ -84,7 +84,7 @@
"type": "prometheus"
},
"tags": [
"forwarded",
"apache_tomcat-request"
"apache_tomcat-request",
"forwarded"
]
}
10 changes: 8 additions & 2 deletions packages/apache_tomcat/data_stream/session/fields/ecs.yml
View file
Open in desktop
Expand Up @@ -2,14 +2,20 @@
name: agent.id
dimension: true
- external: ecs
name: cloud.instance.id
name: cloud.account.id
dimension: true
- external: ecs
name: cloud.availability_zone
dimension: true
- external: ecs
name: cloud.project.id
name: cloud.instance.id
dimension: true
- external: ecs
name: cloud.provider
dimension: true
- external: ecs
name: cloud.region
dimension: true
- external: ecs
name: container.id
dimension: true
Expand Down
4 changes: 2 additions & 2 deletions packages/apache_tomcat/data_stream/session/manifest.yml
View file
Open in desktop
@@ -1,7 +1,5 @@
type: metrics
title: Apache Tomcat Session metrics
elasticsearch:
index_mode: "time_series"
streams:
- input: prometheus/metrics
vars:
Expand Down Expand Up @@ -31,3 +29,5 @@ streams:
template_path: stream.yml.hbs
title: Apache Tomcat Session metrics
description: Collect Apache Tomcat Session metrics.
elasticsearch:
index_mode: "time_series"