Skip to content

[Logstash] Update manifest format_version to 3.0.0 for logstash integ… #8166

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
robbavey merged 2 commits into from
Oct 17, 2023
Merged

[Logstash] Update manifest format_version to 3.0.0 for logstash integ… #8166

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
341adc4
[Logstash] Update manifest format_version to 3.0.0 for logstash integ…
robbavey Oct 10, 2023
170b78d
Fix up changelog link
robbavey Oct 11, 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
7 changes: 6 additions & 1 deletion packages/logstash/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# newer versions go on top
- version: "2.3.5"
changes:
- description: Update manifest format version to 3.0.0 for logstash integration package
type: enhancement
link: https://github.com/elastic/integrations/pull/8166
- version: "2.3.4"
changes:
- description: Introduce Logstash pipelines plugin retrieval and dashboards
type: enhancement
link: https://github.com/elastic/integrations/pull/7704
link: https://github.com/elastic/integrations/pull/8098
- version: "2.3.3"
changes:
- description: Introduce Logstash node dashboards into integration package
Expand Down
8 changes: 4 additions & 4 deletions packages/logstash/data_stream/log/_dev/test/pipeline/test-log-json.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"created": "2022-09-13T16:00:34.955Z",
"ingested": "2022-09-20T13:49:39.087356123Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "WARN"
Expand All @@ -28,7 +28,7 @@
"created": "2022-09-13T16:00:34.958Z",
"ingested": "2022-09-20T13:49:39.087384421Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand All @@ -50,7 +50,7 @@
"created": "2022-09-13T16:00:34.961Z",
"ingested": "2022-09-20T13:49:39.087390447Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "WARN"
Expand All @@ -72,7 +72,7 @@
"created": "2022-09-13T16:00:34.963Z",
"ingested": "2022-09-20T13:49:39.087395138Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand Down
8 changes: 4 additions & 4 deletions packages/logstash/data_stream/log/_dev/test/pipeline/test-log-plain.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"created": "2022-09-14T09:31:20.934Z",
"ingested": "2022-09-20T13:49:39.150272446Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand All @@ -25,7 +25,7 @@
"created": "2022-09-14T09:31:20.934Z",
"ingested": "2022-09-20T13:49:39.150301050Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand All @@ -44,7 +44,7 @@
"created": "2022-09-14T09:31:20.936Z",
"ingested": "2022-09-20T13:49:39.150307033Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand All @@ -63,7 +63,7 @@
"created": "2022-09-14T09:31:20.946Z",
"ingested": "2022-09-20T13:49:39.150342613Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"log": {
"level": "INFO"
Expand Down
4 changes: 2 additions & 2 deletions packages/logstash/data_stream/log/elasticsearch/ingest_pipeline/pipeline-json.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ processors:
def errorLevels = ["ERROR", "FATAL"];
if (ctx?.log?.level != null) {
if (errorLevels.contains(ctx.log.level)) {
ctx.event.type = "error";
ctx.event.type = ["error"];
} else {
ctx.event.type = "info";
ctx.event.type = ["info"];
}
}
4 changes: 2 additions & 2 deletions packages/logstash/data_stream/log/elasticsearch/ingest_pipeline/pipeline-plaintext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ processors:
def errorLevels = ["ERROR", "FATAL"];
if (ctx?.log?.level != null) {
if (errorLevels.contains(ctx.log.level)) {
ctx.event.type = "error";
ctx.event.type = ["error"];
} else {
ctx.event.type = "info";
ctx.event.type = ["info"];
}
}
2 changes: 1 addition & 1 deletion packages/logstash/data_stream/log/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dataset": "logstash.log",
"ingested": "2023-03-02T15:56:12Z",
"kind": "event",
"type": "info"
"type": ["info"]
},
"host": {
"architecture": "x86_64",
Expand Down
4 changes: 2 additions & 2 deletions packages/logstash/data_stream/node/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
type: group
fields:
- name: edges
type: object
type: nested
- name: vertices
type: object
type: nested
2 changes: 1 addition & 1 deletion packages/logstash/data_stream/node_stats/fields/package-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
type: group
fields:
- name: stat
type: object
type: group
fields:
- name: number_of_elapsed_periods
type: alias
Expand Down
Loading