diff --git a/packages/logstash/_dev/deploy/docker/config/logstash.yml b/packages/logstash/_dev/deploy/docker/config/logstash.yml index 3eebf1c15249..bca9d0b618b9 100644 --- a/packages/logstash/_dev/deploy/docker/config/logstash.yml +++ b/packages/logstash/_dev/deploy/docker/config/logstash.yml @@ -1,7 +1,7 @@ http.host: "0.0.0.0" config.reload.automatic: true path.logs: /usr/share/logstash/logs -log.format: json +log.format: plain slowlog.threshold.warn: 1nanos slowlog.threshold.info: 1nanos slowlog.threshold.debug: 1nanos diff --git a/packages/logstash/_dev/deploy/docker/docker-compose.yml b/packages/logstash/_dev/deploy/docker/docker-compose.yml index 635700be1587..a6fccdfafc2d 100644 --- a/packages/logstash/_dev/deploy/docker/docker-compose.yml +++ b/packages/logstash/_dev/deploy/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.3" services: logstash: user: root - image: "docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.7.0}" + image: "docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.12.2}" healthcheck: test: ["CMD", "curl", "-f", "-u", "elastic:changeme", "http://127.0.0.1:9600/"] retries: 300 diff --git a/packages/logstash/_dev/deploy/variants.yml b/packages/logstash/_dev/deploy/variants.yml index f3861a8841d7..d526cafd260e 100644 --- a/packages/logstash/_dev/deploy/variants.yml +++ b/packages/logstash/_dev/deploy/variants.yml @@ -1,4 +1,5 @@ variants: - logstash_8.7.0: - ELASTIC_VERSION: 8.7.0 -default: logstash_8.7.0 + logstash_8.12.2: + ELASTIC_VERSION: 8.12.2 + +default: logstash_8.12.2 diff --git a/packages/logstash/changelog.yml b/packages/logstash/changelog.yml index 6775dcdba85b..52405b652b53 100644 --- a/packages/logstash/changelog.yml +++ b/packages/logstash/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.4.4" + changes: + - description: Fix type checking issue with latest version of beats/cel-go + type: bugfix + link: https://github.com/elastic/integrations/pull/9556 - version: "2.4.3" changes: - description: Add missing queue.capacity.* mappings diff --git a/packages/logstash/data_stream/log/_dev/test/system/test-default-config.yml b/packages/logstash/data_stream/log/_dev/test/system/test-default-config.yml index 1f44a2a92a01..b9f1540b6656 100644 --- a/packages/logstash/data_stream/log/_dev/test/system/test-default-config.yml +++ b/packages/logstash/data_stream/log/_dev/test/system/test-default-config.yml @@ -2,4 +2,4 @@ input: logfile data_stream: vars: paths: - - "{{SERVICE_LOGS_DIR}}/logstash-json.log" + - "{{SERVICE_LOGS_DIR}}/logstash-plain.log" diff --git a/packages/logstash/data_stream/node_cel/agent/stream/cel.yml.hbs b/packages/logstash/data_stream/node_cel/agent/stream/cel.yml.hbs index 359f20e27453..1f088ed054aa 100644 --- a/packages/logstash/data_stream/node_cel/agent/stream/cel.yml.hbs +++ b/packages/logstash/data_stream/node_cel/agent/stream/cel.yml.hbs @@ -24,7 +24,7 @@ program: | "events":body.events, "jvm":{ "uptime_in_millis":body.jvm.uptime_in_millis, - "mem":body.jvm['mem'].drop("pools"), + "mem":[body.jvm['mem']].drop("pools")[0], "threads":body.jvm.threads }, "queue":body.queue, diff --git a/packages/logstash/data_stream/slowlog/_dev/test/system/test-default-config.yml b/packages/logstash/data_stream/slowlog/_dev/test/system/test-default-config.yml index 1869dd612990..8e3689e275a1 100644 --- a/packages/logstash/data_stream/slowlog/_dev/test/system/test-default-config.yml +++ b/packages/logstash/data_stream/slowlog/_dev/test/system/test-default-config.yml @@ -2,4 +2,4 @@ input: logfile data_stream: vars: paths: - - "{{SERVICE_LOGS_DIR}}/logstash-slowlog-json.log" + - "{{SERVICE_LOGS_DIR}}/logstash-slowlog-plain.log" diff --git a/packages/logstash/manifest.yml b/packages/logstash/manifest.yml index 6368ddcad3da..a1a1cf4a72c4 100644 --- a/packages/logstash/manifest.yml +++ b/packages/logstash/manifest.yml @@ -1,6 +1,6 @@ name: logstash title: Logstash -version: 2.4.3 +version: 2.4.4 description: Collect logs and metrics from Logstash with Elastic Agent. type: integration icons: