[O11y][Apache Tomcat] Add TSDB enablement for request and cache data …

…streams and update ecs.yml file (#6788) * add tsdb enablement * update changelog.yml * address review comments for re-generate system test * update ecs.yml as per tsdb enablement * move index_mode lines to end of the file
elastic · Oct 18, 2023 · ffe9c35 · ffe9c35
1 parent 39eea2a
commit ffe9c35
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 64 deletions.
diff --git a/packages/apache_tomcat/changelog.yml b/packages/apache_tomcat/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.15.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.14.0
   changes:
     - description: Update the package format_version to 3.0.0.

diff --git a/packages/apache_tomcat/data_stream/cache/fields/ecs.yml b/packages/apache_tomcat/data_stream/cache/fields/ecs.yml
@@ -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

diff --git a/packages/apache_tomcat/data_stream/cache/manifest.yml b/packages/apache_tomcat/data_stream/cache/manifest.yml
@@ -28,3 +28,5 @@ streams:
     template_path: stream.yml.hbs
     title: Apache Tomcat Cache metrics
     description: Collect Apache Tomcat Cache metrics.
+elasticsearch:
+  index_mode: "time_series"
diff --git a/packages/apache_tomcat/data_stream/cache/sample_event.json b/packages/apache_tomcat/data_stream/cache/sample_event.json
@@ -1,11 +1,11 @@
 {
-    "@timestamp": "2023-09-27T19:08:44.142Z",
+    "@timestamp": "2023-07-06T06:19:25.324Z",
     "agent": {
-        "ephemeral_id": "14ae089b-1739-4809-bff2-0890caa003d0",
-        "id": "86a82f91-ff66-4d28-ab7c-eb9350f317ed",
+        "ephemeral_id": "dd4ae675-0ef8-49ba-9568-d7f989add4dd",
+        "id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
         "name": "docker-fleet-agent",
         "type": "metricbeat",
-        "version": "8.10.1"
+        "version": "8.8.0"
     },
     "apache_tomcat": {
         "cache": {
@@ -45,18 +45,18 @@
         "version": "8.7.0"
     },
     "elastic_agent": {
-        "id": "86a82f91-ff66-4d28-ab7c-eb9350f317ed",
+        "id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
         "snapshot": false,
-        "version": "8.10.1"
+        "version": "8.8.0"
     },
     "event": {
         "agent_id_status": "verified",
         "category": [
             "web"
         ],
         "dataset": "apache_tomcat.cache",
-        "duration": 163789208,
-        "ingested": "2023-09-27T19:08:47Z",
+        "duration": 253547035,
+        "ingested": "2023-07-06T06:19:29Z",
         "kind": "metric",
         "module": "apache_tomcat",
         "type": [
@@ -67,18 +67,18 @@
         "architecture": "aarch64",
         "containerized": false,
         "hostname": "docker-fleet-agent",
-        "id": "ddbe644fa129402e9d5cf6452db1422d",
+        "id": "e8978f2086c14e13b7a0af9ed0011d19",
         "ip": [
-            "172.31.0.7"
+            "172.27.0.7"
         ],
         "mac": [
-            "02-42-AC-1F-00-07"
+            "02-42-AC-1B-00-07"
         ],
         "name": "docker-fleet-agent",
         "os": {
             "codename": "focal",
             "family": "debian",
-            "kernel": "5.15.49-linuxkit",
+            "kernel": "3.10.0-1160.90.1.el7.x86_64",
             "name": "Ubuntu",
             "platform": "ubuntu",
             "type": "linux",

diff --git a/packages/apache_tomcat/data_stream/request/fields/ecs.yml b/packages/apache_tomcat/data_stream/request/fields/ecs.yml
@@ -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

diff --git a/packages/apache_tomcat/data_stream/request/manifest.yml b/packages/apache_tomcat/data_stream/request/manifest.yml
@@ -28,3 +28,5 @@ streams:
     template_path: stream.yml.hbs
     title: Apache Tomcat Request metrics
     description: Collect Apache Tomcat Request metrics.
+elasticsearch:
+  index_mode: "time_series"
diff --git a/packages/apache_tomcat/data_stream/request/sample_event.json b/packages/apache_tomcat/data_stream/request/sample_event.json
@@ -1,11 +1,11 @@
 {
-    "@timestamp": "2023-09-27T19:15:32.734Z",
+    "@timestamp": "2023-07-06T06:18:00.930Z",
     "agent": {
-        "ephemeral_id": "e33720a7-0747-406d-965f-2982572a47e5",
-        "id": "86a82f91-ff66-4d28-ab7c-eb9350f317ed",
+        "ephemeral_id": "e291bf4e-e4fc-42c4-bb98-8acddc2e7af1",
+        "id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
         "name": "docker-fleet-agent",
         "type": "metricbeat",
-        "version": "8.10.1"
+        "version": "8.8.0"
     },
     "apache_tomcat": {
         "request": {
@@ -21,8 +21,8 @@
                 "bytes": 22430
             },
             "time": {
-                "max": 889,
-                "total": 895
+                "max": 942,
+                "total": 942
             }
         }
     },
@@ -35,18 +35,18 @@
         "version": "8.7.0"
     },
     "elastic_agent": {
-        "id": "86a82f91-ff66-4d28-ab7c-eb9350f317ed",
+        "id": "c78eadae-edd0-4b88-ab24-f2fb84a98229",
         "snapshot": false,
-        "version": "8.10.1"
+        "version": "8.8.0"
     },
     "event": {
         "agent_id_status": "verified",
         "category": [
             "web"
         ],
         "dataset": "apache_tomcat.request",
-        "duration": 168350042,
-        "ingested": "2023-09-27T19:15:35Z",
+        "duration": 266759936,
+        "ingested": "2023-07-06T06:18:04Z",
         "kind": "metric",
         "module": "apache_tomcat",
         "type": [
@@ -57,18 +57,18 @@
         "architecture": "aarch64",
         "containerized": false,
         "hostname": "docker-fleet-agent",
-        "id": "ddbe644fa129402e9d5cf6452db1422d",
+        "id": "e8978f2086c14e13b7a0af9ed0011d19",
         "ip": [
-            "172.31.0.7"
+            "172.27.0.7"
         ],
         "mac": [
-            "02-42-AC-1F-00-07"
+            "02-42-AC-1B-00-07"
         ],
         "name": "docker-fleet-agent",
         "os": {
             "codename": "focal",
             "family": "debian",
-            "kernel": "5.15.49-linuxkit",
+            "kernel": "3.10.0-1160.90.1.el7.x86_64",
             "name": "Ubuntu",
             "platform": "ubuntu",
             "type": "linux",

diff --git a/packages/apache_tomcat/data_stream/session/fields/ecs.yml b/packages/apache_tomcat/data_stream/session/fields/ecs.yml
@@ -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

diff --git a/packages/apache_tomcat/data_stream/session/manifest.yml b/packages/apache_tomcat/data_stream/session/manifest.yml
@@ -1,7 +1,5 @@
 type: metrics
 title: Apache Tomcat Session metrics
-elasticsearch:
-  index_mode: "time_series"
 streams:
   - input: prometheus/metrics
     vars:
@@ -30,3 +28,5 @@ streams:
     template_path: stream.yml.hbs
     title: Apache Tomcat Session metrics
     description: Collect Apache Tomcat Session metrics.
+elasticsearch:
+  index_mode: "time_series"