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.

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

Migrate obs-infraobs-integrations to package-spec v3 #2 #8171

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a139b92
[hadoop]: migration with yq
shmsr Oct 12, 2023
b88025c
[haproxy]: migration with yq
shmsr Oct 12, 2023
892ecef
[ibmmq]: migration with yq
shmsr Oct 12, 2023
3830cd0
[iis]: migration with yq
shmsr Oct 12, 2023
07ab0ed
[influxdb]: migration with yq
shmsr Oct 12, 2023
78ef472
[kafka]: migration with yq
shmsr Oct 12, 2023
6fddcb3
[kafka_log]: migration with yq
shmsr Oct 12, 2023
40ed0aa
[memcached]: migration with yq
shmsr Oct 12, 2023
7bda6ac
[microsoft_sqlserver]: migration with yq
shmsr Oct 12, 2023
d5ad826
[mongodb]: migration with yq
shmsr Oct 12, 2023
859bd5d
[mysql]: migration with yq
shmsr Oct 12, 2023
c33aa3c
[nagios_xi]: migration with yq
shmsr Oct 12, 2023
f871e68
[nginx]: migration with yq
shmsr Oct 12, 2023
8be70d2
[golang] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
0f27c86
[hadoop] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
b35a369
[jolokia] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
9b63a38
[kafka_log] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
2019076
[memcached] - change to format_version 3.0.0
shmsr Oct 12, 2023
01ef133
[iis] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
90e15c0
[influxdb] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
1337ccc
[kafka] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
dbf3db7
[microsoft_sqlserver]: migration with yq
shmsr Oct 12, 2023
e1bc770
[microsoft_sqlserver] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
c39a827
[mongodb] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
37f7144
[mysql] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
7001583
[nginx] - removed dotted YAML keys from manifest
shmsr Oct 12, 2023
4a710b9
Add validation.yml
shmsr Oct 12, 2023
f237620
Format packages and quote fields where necessary
shmsr Oct 12, 2023
62e3ac9
revert changes for packages for which v3 migration failed
shmsr Oct 12, 2023
dede288
[hadoop,haproxy,iis,mongodb]: remove duplicates from agent.yml instea…
shmsr Oct 12, 2023
76a5e4a
Fix PR number in changelog
shmsr Oct 12, 2023
4bc1aea
Fix inconsistency w/ elastic-build
shmsr Oct 12, 2023
564854d
[mongodb]: Add dimension field which was removed during dedup of fields
shmsr Oct 16, 2023
ec8e5d2
quote fields where necessary
shmsr Oct 16, 2023
732461a
Add release field to data stream's manifest if removed from fields
shmsr Oct 17, 2023
3ad6d2f
Quote index.mapping.dimension_fields.limit to avoid getting changed b…
shmsr Oct 17, 2023
5c870ca
Revert "Quote index.mapping.dimension_fields.limit to avoid getting c…
shmsr Oct 17, 2023
1566860
Add comment
shmsr Oct 17, 2023
62ea6c9
[mongodb]: revert changes package-spec v3 migration
shmsr Oct 18, 2023
c20f205
[influxdb]: revert changes package-spec v3 migration
shmsr Oct 18, 2023
da314b4
remove validation.yml for package which are not migrated to v3
shmsr Oct 18, 2023
9856790
remove comment
shmsr Oct 18, 2023
4c5ffae
[hadoop]: update definition for tags
shmsr Oct 18, 2023
cd8da6a
remove release: beta
shmsr Oct 19, 2023
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/golang/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: 1.1.0
changes:
- description: Update the package format_version to 3.0.0.
type: enhancement
link: https://github.com/elastic/integrations/pull/8171
- version: "1.0.0"
changes:
- description: Make Golang GA.
Expand Down
11 changes: 7 additions & 4 deletions packages/golang/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
format_version: 2.0.0
format_version: "3.0.0"
name: golang
title: Golang
version: "1.0.0"
version: "1.1.0"
description: This Elastic integration collects metrics from Golang applications.
type: integration
categories:
- observability
conditions:
kibana.version: ^8.7.1
elastic.subscription: basic
kibana:
version: ^8.7.1
elastic:
subscription: basic
screenshots:
- src: /img/golang-heap-dashboard.png
title: Golang Heap dashboard
Expand Down Expand Up @@ -96,3 +98,4 @@ policy_templates:
# -----END CERTIFICATE-----
owner:
github: elastic/obs-infraobs-integrations
type: elastic
3 changes: 3 additions & 0 deletions packages/golang/validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
errors:
exclude_checks:
- SVR00002
5 changes: 5 additions & 0 deletions packages/hadoop/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: 1.3.0
changes:
- description: Update the package format_version to 3.0.0.
type: enhancement
link: https://github.com/elastic/integrations/pull/8171
- version: "1.2.1"
changes:
- description: Remove forwarded tag from metrics data streams.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"module": "httpjson",
"original": "{\"allocatedMB\":-1,\"allocatedVCores\":-1,\"amContainerLogs\":\"http://localhost:8042/node/containerlogs/container_1646029193591_0003_01_000001/bhagyaraj\",\"amHostHttpAddress\":\"localhost:8042\",\"amNodeLabelExpression\":\"\",\"amRPCAddress\":\"localhost:38279\",\"applicationTags\":\"\",\"applicationType\":\"MAPREDUCE\",\"clusterId\":1646029193591,\"clusterUsagePercentage\":0,\"diagnostics\":\"\",\"elapsedTime\":35114,\"finalStatus\":\"SUCCEEDED\",\"finishedTime\":1646030395258,\"id\":\"application_1646029193591_0003\",\"launchTime\":1646030360297,\"logAggregationStatus\":\"DISABLED\",\"masterNodeId\":\"localhost:45960\",\"memorySeconds\":103467,\"name\":\"wordcount\",\"numAMContainerPreempted\":0,\"numNonAMContainerPreempted\":0,\"preemptedMemorySeconds\":0,\"preemptedResourceMB\":0,\"preemptedResourceSecondsMap\":{},\"preemptedResourceVCores\":0,\"preemptedVcoreSeconds\":0,\"priority\":0,\"progress\":100,\"queue\":\"default\",\"queueUsagePercentage\":0,\"reservedMB\":-1,\"reservedVCores\":-1,\"resourceSecondsMap\":{\"entry\":{\"key\":\"vcores\",\"value\":\"57\"}},\"runningContainers\":-1,\"startedTime\":1646030360144,\"state\":\"FINISHED\",\"timeouts\":{\"timeout\":[{\"expiryTime\":\"UNLIMITED\",\"remainingTimeInSeconds\":-1,\"type\":\"LIFETIME\"}]},\"trackingUI\":\"History\",\"trackingUrl\":\"http://localhost:8088/proxy/application_1646029193591_0003/\",\"unmanagedApplication\":false,\"user\":\"bhagyaraj\",\"vcoreSeconds\":57}",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"application": {
Expand Down Expand Up @@ -38,11 +42,15 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"module": "httpjson",
"original": "{\"allocatedMB\":-1,\"allocatedVCores\":-1,\"amContainerLogs\":\"http://localhost:8042/node/containerlogs/container_1646029193591_0001_02_000001/bhagyaraj\",\"amHostHttpAddress\":\"localhost:8042\",\"amNodeLabelExpression\":\"\",\"applicationTags\":\"\",\"applicationType\":\"MAPREDUCE\",\"clusterId\":1646029193591,\"clusterUsagePercentage\":0,\"diagnostics\":\"Application application_1646029193591_0001 failed 2 times due to AM Container for appattempt_1646029193591_0001_000002 exited with exitCode: 1\\\\nFailing this attempt.Diagnostics: [2022-02-28 12:03:43.814]Exception from container-launch.\\\\nContainer id: container_1646029193591_0001_02_000001\\\\nExit code: 1\\\\n\\\\n[2022-02-28 12:03:43.822]Container exited with a non-zero exit code 1. Error file: prelaunch.err.\\\\nLast 4096 bytes of prelaunch.err :\\\\nLast 4096 bytes of stderr :\\\\nError: Could not find or load main class org.apache.hadoop.mapreduce.v2.app.MRAppMaster\\\\nCaused by: java.lang.ClassNotFoundException: org.apache.hadoop.mapreduce.v2.app.MRAppMaster\\\\n\\\\nPlease check whether your \\\\u003cHADOOP_HOME\\\\u003e/etc/hadoop/mapred-site.xml contains the below configuration:\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003eyarn.app.mapreduce.am.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003emapreduce.map.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003emapreduce.reduce.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\n[2022-02-28 12:03:43.823]Container exited with a non-zero exit code 1. Error file: prelaunch.err.\\\\nLast 4096 bytes of prelaunch.err :\\\\nLast 4096 bytes of stderr :\\\\nError: Could not find or load main class org.apache.hadoop.mapreduce.v2.app.MRAppMaster\\\\nCaused by: java.lang.ClassNotFoundException: org.apache.hadoop.mapreduce.v2.app.MRAppMaster\\\\n\\\\nPlease check whether your \\\\u003cHADOOP_HOME\\\\u003e/etc/hadoop/mapred-site.xml contains the below configuration:\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003eyarn.app.mapreduce.am.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003emapreduce.map.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\u003cproperty\\\\u003e\\\\n \\\\u003cname\\\\u003emapreduce.reduce.env\\\\u003c/name\\\\u003e\\\\n \\\\u003cvalue\\\\u003eHADOOP_MAPRED_HOME=${full path of your hadoop distribution directory}\\\\u003c/value\\\\u003e\\\\n\\\\u003c/property\\\\u003e\\\\n\\\\nFor more detailed output, check the application tracking page: http://localhost:8088/cluster/app/application_1646029193591_0001 Then click on links to logs of each attempt.\\\\n. Failing the application.\",\"elapsedTime\":9925,\"finalStatus\":\"FAILED\",\"finishedTime\":1646030023835,\"id\":\"application_1646029193591_0001\",\"launchTime\":1646030016899,\"logAggregationStatus\":\"DISABLED\",\"masterNodeId\":\"localhost:45960\",\"memorySeconds\":15708,\"name\":\"wordcount\",\"numAMContainerPreempted\":0,\"numNonAMContainerPreempted\":0,\"preemptedMemorySeconds\":0,\"preemptedResourceMB\":0,\"preemptedResourceSecondsMap\":{},\"preemptedResourceVCores\":0,\"preemptedVcoreSeconds\":0,\"priority\":0,\"progress\":0,\"queue\":\"default\",\"queueUsagePercentage\":0,\"reservedMB\":-1,\"reservedVCores\":-1,\"resourceSecondsMap\":{\"entry\":{\"key\":\"vcores\",\"value\":\"7\"}},\"runningContainers\":-1,\"startedTime\":1646030013910,\"state\":\"FAILED\",\"timeouts\":{\"timeout\":[{\"expiryTime\":\"UNLIMITED\",\"remainingTimeInSeconds\":-1,\"type\":\"LIFETIME\"}]},\"trackingUI\":\"History\",\"trackingUrl\":\"http://localhost:8088/cluster/app/application_1646029193591_0001\",\"unmanagedApplication\":false,\"user\":\"bhagyaraj\",\"vcoreSeconds\":7}",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"application": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dynamic_fields:
event.ingested: ".*"
"event.ingested": ".*"
fields:
tags:
- preserve_original_event
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ processors:
value: '8.5.1'
- set:
field: event.type
value: info
value: [info]
- set:
field: event.kind
value: metric
Expand All @@ -15,7 +15,7 @@ processors:
value: httpjson
- set:
field: event.category
value: database
value: [database]
- rename:
field: message
target_field: event.original
Expand Down
3 changes: 0 additions & 3 deletions packages/hadoop/data_stream/application/fields/beats.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
- name: input.type
description: Type of Filebeat input.
type: keyword
- name: tags
type: keyword
description: User defined tags
tommyers-elastic marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions packages/hadoop/data_stream/application/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
name: host.ip
- external: ecs
name: tags
description: User defined tags.
8 changes: 6 additions & 2 deletions packages/hadoop/data_stream/application/sample_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
},
"event": {
"agent_id_status": "verified",
"category": "database",
"category": [
"database"
],
"created": "2023-02-02T12:03:41.178Z",
"dataset": "hadoop.application",
"ingested": "2023-02-02T12:03:42Z",
"kind": "metric",
"module": "httpjson",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"application": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"cluster": {
Expand All @@ -34,9 +38,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"cluster": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ processors:
value: '8.5.1'
- set:
field: event.type
value: info
value: [info]
- set:
field: event.kind
value: metric
- set:
field: event.category
value: database
value: [database]
- rename:
field: http
target_field: hadoop
Expand Down
2 changes: 1 addition & 1 deletion packages/hadoop/data_stream/cluster/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
dimension: true
- external: ecs
name: host.name
dimension: true
dimension: true
1 change: 1 addition & 0 deletions packages/hadoop/data_stream/cluster/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ streams:
show_user: false
description: >
Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.

elasticsearch:
index_mode: "time_series"
8 changes: 6 additions & 2 deletions packages/hadoop/data_stream/cluster/sample_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
},
"event": {
"agent_id_status": "verified",
"category": "database",
"category": [
"database"
],
"dataset": "hadoop.cluster",
"duration": 50350559,
"ingested": "2022-04-04T17:22:25Z",
"kind": "metric",
"module": "http",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"cluster": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"datanode": {
Expand Down Expand Up @@ -42,9 +46,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"datanode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ processors:
value: '8.5.1'
- set:
field: event.type
value: info
value: [info]
- set:
field: event.kind
value: metric
- set:
field: event.category
value: database
value: [database]
- rename:
field: http
target_field: hadoop
Expand Down
2 changes: 1 addition & 1 deletion packages/hadoop/data_stream/datanode/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
dimension: true
- external: ecs
name: host.name
dimension: true
dimension: true
1 change: 1 addition & 0 deletions packages/hadoop/data_stream/datanode/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ streams:
show_user: false
description: >
Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.

elasticsearch:
index_mode: "time_series"
8 changes: 6 additions & 2 deletions packages/hadoop/data_stream/datanode/sample_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
},
"event": {
"agent_id_status": "verified",
"category": "database",
"category": [
"database"
],
"dataset": "hadoop.datanode",
"duration": 241651987,
"ingested": "2023-02-02T12:05:05Z",
"kind": "metric",
"module": "http",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"datanode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"namenode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ processors:
value: '8.5.1'
- set:
field: event.type
value: info
value: [info]
- set:
field: event.kind
value: metric
- set:
field: event.category
value: database
value: [database]
- rename:
field: http
target_field: hadoop
Expand Down
2 changes: 1 addition & 1 deletion packages/hadoop/data_stream/namenode/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
dimension: true
- external: ecs
name: host.name
dimension: true
dimension: true
1 change: 0 additions & 1 deletion packages/hadoop/data_stream/namenode/fields/fields.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
- name: hadoop.namenode
type: group
release: beta
tommyers-elastic marked this conversation as resolved.
Show resolved Hide resolved
fields:
- name: blocks
type: group
Expand Down
1 change: 1 addition & 0 deletions packages/hadoop/data_stream/namenode/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ streams:
show_user: false
description: >
Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.

elasticsearch:
index_mode: "time_series"
8 changes: 6 additions & 2 deletions packages/hadoop/data_stream/namenode/sample_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
},
"event": {
"agent_id_status": "verified",
"category": "database",
"category": [
"database"
],
"dataset": "hadoop.namenode",
"duration": 341259289,
"ingested": "2022-03-28T11:36:09Z",
"kind": "metric",
"module": "http",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"namenode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"version": "8.5.1"
},
"event": {
"category": "database",
"category": [
"database"
],
"kind": "metric",
"type": "info"
"type": [
"info"
]
},
"hadoop": {
"node_manager": {
Expand Down
Loading