Skip to content

ECS version update #4797

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
muthu-mps merged 2 commits into from
Jan 9, 2023
Merged

ECS version update #4797

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
dfd200d
ECS version update
muthu-mps Dec 9, 2022
762bac1
updated the changelog entry
muthu-mps Dec 9, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/activemq/_dev/build/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies:
ecs:
reference: git@1.12
reference: git@v8.5.1
5 changes: 5 additions & 0 deletions packages/activemq/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.6.0"
changes:
- description: Update ECS version to 8.5.1.
type: enhancement
link: https://github.com/elastic/integrations/pull/4797
- version: "0.5.0"
changes:
- description: Added infrastructure category.
Expand Down
16 changes: 8 additions & 8 deletions packages/activemq/data_stream/audit/_dev/test/pipeline/test-audit.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
}
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"event": {
"ingested": "2022-09-15T08:36:15.107072383Z",
"ingested": "2022-12-08T15:06:10.692324051Z",
"kind": "event",
"module": "activemq",
"original": "INFO | anonymous called org.apache.activemq.broker.jmx.QueueView.retryMessages[] at 27-11-2019 08:45:57,213 | qtp443290224-47",
Expand All @@ -38,10 +38,10 @@
}
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"event": {
"ingested": "2022-09-15T08:36:15.107087694Z",
"ingested": "2022-12-08T15:06:10.692336343Z",
"kind": "event",
"module": "activemq",
"original": "INFO | admin called org.apache.activemq.broker.jmx.QueueView.retryMessages[] at 27-11-2019 08:45:57,229 | qtp443290224-45",
Expand All @@ -68,10 +68,10 @@
}
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"event": {
"ingested": "2022-09-15T08:36:15.107091313Z",
"ingested": "2022-12-08T15:06:10.692337760Z",
"kind": "event",
"module": "activemq",
"original": "WARN | admin requested /admin/createDestination.action [JMSDestination='test' JMSDestinationType='queue' secret='4eb0bc3e-9d7a-4256-844c-24f40fda98f1' ] from 127.0.0.1 | qtp12205619-39",
Expand All @@ -98,10 +98,10 @@
}
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"event": {
"ingested": "2022-09-15T08:36:15.107094261Z",
"ingested": "2022-12-08T15:06:10.692338926Z",
"kind": "event",
"module": "activemq",
"original": "INFO | guest requested /admin/purgeDestination.action [JMSDestination='test' JMSDestinationType='queue' secret='eff6a932-1b58-45da-a64a-1b30b246cfc9' ] from 127.0.0.1 | qtp12205619-36",
Expand Down
2 changes: 1 addition & 1 deletion packages/activemq/data_stream/audit/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ processors:
ignore_failure: true
- set:
field: ecs.version
value: 8.2.0
value: 8.5.1
ignore_empty_value: true
ignore_failure: true
- script:
Expand Down
16 changes: 8 additions & 8 deletions packages/activemq/data_stream/audit/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{
"@timestamp": "2022-09-15T08:37:04.078Z",
"@timestamp": "2022-12-09T04:17:31.785Z",
"activemq": {
"audit": {
"thread": "RMI TCP Connection(1)-127.0.0.1"
}
},
"agent": {
"ephemeral_id": "15ca0b7d-0d28-4688-abd6-0b827bc3fa0f",
"id": "abd9aa75-4cf4-40e6-ac3c-8a1f152d8fa9",
"ephemeral_id": "34b01ecd-6dff-4bc4-b2e2-a7388b1e20b2",
"id": "46343e0c-0d8c-464b-a216-cacf63027d6f",
"name": "docker-fleet-agent",
"type": "filebeat",
"version": "8.3.3"
"version": "8.5.0"
},
"data_stream": {
"dataset": "activemq.audit",
"namespace": "ep",
"type": "logs"
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"elastic_agent": {
"id": "abd9aa75-4cf4-40e6-ac3c-8a1f152d8fa9",
"id": "46343e0c-0d8c-464b-a216-cacf63027d6f",
"snapshot": false,
"version": "8.3.3"
"version": "8.5.0"
},
"event": {
"agent_id_status": "verified",
"dataset": "activemq.audit",
"ingested": "2022-09-15T08:37:07Z",
"ingested": "2022-12-09T04:17:32Z",
"kind": "event",
"module": "activemq",
"type": [
Expand Down
2 changes: 1 addition & 1 deletion packages/activemq/data_stream/broker/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Pipeline for parsing ActiveMQ broker metrics.
processors:
- set:
field: ecs.version
value: 8.2.0
value: 8.5.1
- set:
field: event.category
value: [web]
Expand Down
35 changes: 18 additions & 17 deletions packages/activemq/data_stream/broker/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"@timestamp": "2022-09-15T08:40:01.593Z",
"@timestamp": "2022-12-09T04:18:21.069Z",
"activemq": {
"broker": {
"connections": {
"count": 18
"count": 9
},
"consumers": {
"count": 0
Expand All @@ -21,12 +21,12 @@
}
},
"messages": {
"count": 18,
"count": 9,
"dequeue": {
"count": 0
},
"enqueue": {
"count": 38
"count": 20
}
},
"name": "localhost",
Expand All @@ -36,33 +36,33 @@
}
},
"agent": {
"ephemeral_id": "610c5ccb-2a67-4fcc-83fc-aa5904971538",
"id": "abd9aa75-4cf4-40e6-ac3c-8a1f152d8fa9",
"ephemeral_id": "04f37e48-28d9-4b56-a226-c480f4a8a5ae",
"id": "46343e0c-0d8c-464b-a216-cacf63027d6f",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "8.3.3"
"version": "8.5.0"
Copy link
Member

@ishleenk17 ishleenk17 Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ecs version is 8.5.1 and here it says 8.5.0
Copy link
Contributor Author

@muthu-mps muthu-mps Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ishleenk17 - This is agent version and not the ECS version.
},
"data_stream": {
"dataset": "activemq.broker",
"namespace": "ep",
"type": "metrics"
},
"ecs": {
"version": "8.2.0"
"version": "8.5.1"
},
"elastic_agent": {
"id": "abd9aa75-4cf4-40e6-ac3c-8a1f152d8fa9",
"id": "46343e0c-0d8c-464b-a216-cacf63027d6f",
"snapshot": false,
"version": "8.3.3"
"version": "8.5.0"
},
"event": {
"agent_id_status": "verified",
"category": [
"web"
],
"dataset": "activemq.broker",
"duration": 14118688,
"ingested": "2022-09-15T08:40:05Z",
"duration": 22293625,
"ingested": "2022-12-09T04:18:22Z",
"kind": "metric",
"module": "activemq",
"type": [
Expand All @@ -71,31 +71,32 @@
},
"host": {
"architecture": "x86_64",
"containerized": true,
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "66392b0697b84641af8006d87aeb89f1",
"ip": [
"172.18.0.7"
],
"mac": [
"02:42:ac:12:00:07"
"02-42-AC-12-00-07"
],
"name": "docker-fleet-agent",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "3.10.0-1160.71.1.el7.x86_64",
"kernel": "5.15.49-linuxkit",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "20.04.4 LTS (Focal Fossa)"
"version": "20.04.5 LTS (Focal Fossa)"
}
},
"metricset": {
"name": "broker",
"period": 10000
},
"service": {
"address": "http://elastic-package-service_activemq_1:8161/api/jolokia/%3FignoreErrors=true\u0026canonicalNaming=false",
"address": "http://elastic-package-service-activemq-1:8161/api/jolokia/%3FignoreErrors=true\u0026canonicalNaming=false",
"type": "activemq"
},
"tags": [
Expand Down
Loading