diff --git a/packages/http_endpoint/_dev/deploy/docker/docker-compose.yml b/packages/http_endpoint/_dev/deploy/docker/docker-compose.yml index ba0b43149ae..f8a8a0ea52d 100644 --- a/packages/http_endpoint/_dev/deploy/docker/docker-compose.yml +++ b/packages/http_endpoint/_dev/deploy/docker/docker-compose.yml @@ -1,13 +1,29 @@ version: '2.3' services: test-webhook-http: - image: docker.elastic.co/observability/stream:v0.15.0 + image: docker.elastic.co/observability/stream:v0.16.0 volumes: - ./sample_logs:/sample_logs:ro environment: - STREAM_PROTOCOL=webhook - STREAM_ADDR=http://elastic-agent:9515/json - STREAM_WEBHOOK_HEADER=Content-Type=application/json - - STREAM_USERNAME=abc123 - - STREAM_PASSWORD=abc123 - command: log --start-signal=SIGHUP --webhook-username=abc123 --webhook-password=abc123 --delay=10s /sample_logs/test-webhook.log + - STREAM_WEBHOOK_USERNAME=abc123 + - STREAM_WEBHOOK_PASSWORD=abc123 + - STREAM_START_SIGNAL=SIGHUP + - STREAM_DELAY=10s + command: log /sample_logs/test-webhook.log + test-webhook-http-ack: + image: docker.elastic.co/observability/stream:v0.16.0 + volumes: + - ./sample_logs:/sample_logs:ro + environment: + - STREAM_PROTOCOL=webhook + - STREAM_ADDR=http://elastic-agent:9516/json?wait_for_completion_timeout=1m + - STREAM_WEBHOOK_HEADER=Content-Type=application/json + - STREAM_WEBHOOK_USERNAME=abc123 + - STREAM_WEBHOOK_PASSWORD=abc123 + - STREAM_START_SIGNAL=SIGHUP + - STREAM_DELAY=10s + - STREAM_WEBHOOK_TIMEOUT=2m + command: log /sample_logs/test-webhook.log diff --git a/packages/http_endpoint/_dev/test/system/test-http-acked-config.yml b/packages/http_endpoint/_dev/test/system/test-http-acked-config.yml new file mode 100644 index 00000000000..4ca597665f2 --- /dev/null +++ b/packages/http_endpoint/_dev/test/system/test-http-acked-config.yml @@ -0,0 +1,13 @@ +service: test-webhook-http-ack +service_notify_signal: SIGHUP +input: http_endpoint +vars: + data_stream.dataset: http_endpoint.http_endpoint + preserve_original_event: true + listen_address: 0.0.0.0 + url: /json + prefix: event + listen_port: 9516 + basic_auth: true + username: abc123 + password: abc123 diff --git a/packages/http_endpoint/changelog.yml b/packages/http_endpoint/changelog.yml index a836ac38062..bbe91c6d6d5 100644 --- a/packages/http_endpoint/changelog.yml +++ b/packages/http_endpoint/changelog.yml @@ -1,3 +1,8 @@ +- version: "2.0.0-next" # Merge into next version and delete this and the following line. + changes: + - description: Added test for end-to-end ACK behaviour. + type: enhancement + link: https://github.com/elastic/integrations/pull/9843 - version: "2.0.0" changes: - description: Converted package to input type.