Play around with E2E tests to improve.

.buildkite/scripts/e2e-pipeline/README.md

@@ -44,11 +44,11 @@ pip install -r .buildkite/scripts/e2e-pipeline/requirements.txt
 ### Run on local
 Run the following command from the repo dir:
 ```bash
-python3 .buildkite/scripts/e2e-pipeline/main.py --skip-setup=true --integrations='apache','nginx'
+python3 .buildkite/scripts/e2e-pipeline/main.py --skip-setup --integrations='apache','nginx'
 ```
 
 This will run entire ELK docker containers.
-Remove `--skip-setup` or use `--skip-setup=true` if you are running the script for the first time, where it needs to set up elastic-package and integrations. 
+Do not use `--skip-setup` if you are running the script for the first time, where it needs to set up elastic-package and integrations. 
 
 ## Troubleshooting
 - The project retries on some operations to overcome timeout issues, uses [`retry` tool](https://formulae.brew.sh/formula/retry). If you get `retry` undefined error, make sure to install it.

.buildkite/scripts/e2e-pipeline/bootstrap.py

@@ -38,6 +38,7 @@ def __init__(self, stack_version: str, project_type: str) -> None:
         Returns:
             Validates and sets stack version, project type and resolves elastic package distro based on running OS (sys.platform)
         """
+        print(f"Stack version: {stack_version}")
         self.stack_version = stack_version
         self.__validate_and_set_project_type(project_type)
         self.__resolve_distro()

.buildkite/scripts/e2e-pipeline/generate-steps.py

@@ -59,7 +59,7 @@ def generate_steps_for_main_branch(versions) -> list:
     structure = {
         "agents": {
             "provider": "gcp",
-            "machineType": "n2-standard-4",
+            "machineType": "n2-standard-16",
             "imageProject": "elastic-images-prod",
             "image": "family/platform-ingest-logstash-multi-jdk-ubuntu-2204",
             "diskSizeGb": 120

.buildkite/scripts/e2e-pipeline/main.py

@@ -8,7 +8,7 @@
 from plugin_test import PluginTest
 import util
 
-INTEGRATION_PACKAGES_TO_TEST = ["apache", "m365_defender", "nginx", "tomcat"]
+INTEGRATION_PACKAGES_TO_TEST = ["m365_defender"]
 
 
 class BootstrapContextManager:
@@ -41,6 +41,7 @@ def main(skip_setup=False, integrations=[]):
     with BootstrapContextManager(skip_setup) as bootstrap:
         working_dir = os.getcwd()
         test_plugin = PluginTest()
+
         packages = integrations or INTEGRATION_PACKAGES_TO_TEST
         for package in packages:
             try:
@@ -50,13 +51,7 @@ def main(skip_setup=False, integrations=[]):
                 print(f"Test failed for {package} with {e}.")
                 failed_packages.append(package)
 
-        container = util.get_logstash_container()
-
-        # pretty printing
-        print(f"Logstash docker container logs..")
-        ls_container_logs = container.logs().decode('utf-8')
-        for log_line in ls_container_logs.splitlines():
-            print(log_line)
+        util.show_containers_logs(["logstash-", "elasticsearch-", "elastic-agent-"])
 
     if len(failed_packages) > 0:
         raise Exception(f"Following packages failed: {failed_packages}")

.buildkite/scripts/e2e-pipeline/plugin_test.py

@@ -2,9 +2,9 @@
 A class to validate the Integration Plugin with a given integration package
 """
 import subprocess
+import time
 from logstash_stats import LogstashStats
 
-
 class PluginTest:
     logstash_stats_api = LogstashStats()
     LAST_PROCESSED_EVENTS = {"in": 0, "out": 0}
@@ -58,4 +58,5 @@ def on(self, package: str) -> None:
                 for result_line in result.stdout.splitlines(): print(f"{result_line}")
 
         # although there was an error, le's check how LS performed and make sure errors weren't because of Logstash
+        time.sleep(2) # make sure LS processes the event way to downstream ES
         self.__analyze_logstash_throughput(package, result)

.buildkite/scripts/e2e-pipeline/util.py

@@ -18,11 +18,30 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
     session.mount(schema, HTTPAdapter(max_retries=retries))
     return session.get(url)
 
-
-def get_logstash_container() -> Container:
+def show_containers_logs(container_prefixes):
     client = docker.from_env()
-    return client.containers.get("elastic-package-stack-e2e-logstash-1")
-
+    containers = client.containers.list(all=True)
+    print(f"Available container names: {[c.name for c in containers]}")
+    matching_containers = []
+    for container in containers:
+        if any(prefix in container.name for prefix in container_prefixes):
+            matching_containers.append(container)
+
+    if not matching_containers:
+        prefixes_str = ", ".join(container_prefixes)
+        print(f"No containers found with prefixes: {prefixes_str}")
+        return
+
+    for container in matching_containers:
+        # pretty printing with clear separators
+        separator = "=" * 80
+        print(f"\n{separator}")
+        print(f"Container: {container.name}")
+        print(f"{separator}")
+        container_logs = container.logs().decode('utf-8')
+        for log_line in container_logs.splitlines():
+            print(f"  {log_line}")
+        print(f"{separator}\n")
 
 def run_or_raise_error(commands: list, error_message):
     result = subprocess.run(commands, universal_newlines=True, stdout=subprocess.PIPE)

src/test/java/co/elastic/logstash/filters/elasticintegration/ElasticsearchRestClientWireMockTest.java

@@ -175,7 +175,10 @@ void setupMock() {
 
             try (RestClient restClient = rcb.build()) {
                 final SSLHandshakeException ex = assertThrows(SSLHandshakeException.class, () -> restClient.performRequest(new Request("GET", "/")));
-                assertThat(ex.getMessage(), stringContainsInOrder("fatal", "bad_certificate"));
+                assertThat(ex.getMessage(), allOf(
+                    containsString("fatal"),
+                    anyOf(containsString("bad_certificate"), containsString("certificate_required"))
+                ));
             }
         }