Let's print more container logs to figure out what is happening.

Author: mashhurs

.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

@@ -197,8 +197,8 @@ def run_elastic_stack(self, skip_setup=False) -> None:
             self.__scan_for_unsupported_processors()
             self.__setup_elastic_package_profile()
         self.__spin_stack()
-        self.__install_plugin()
-        self.__reload_container()
+        #self.__install_plugin()
+        #self.__reload_container()
         self.__update_pipeline_config()
 
     def stop_elastic_stack(self) -> None:

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

@@ -41,6 +41,11 @@ def main(skip_setup=False, integrations=[]):
     with BootstrapContextManager(skip_setup) as bootstrap:
         working_dir = os.getcwd()
         test_plugin = PluginTest()
+
+        util.show_container_logs("logstash-")
+        util.show_container_logs("elasticsearch-")
+        util.show_container_logs("elastic-agent-")
+
         packages = integrations or INTEGRATION_PACKAGES_TO_TEST
         for package in packages:
             try:
@@ -50,9 +55,9 @@ def main(skip_setup=False, integrations=[]):
                 print(f"Test failed for {package} with {e}.")
                 failed_packages.append(package)
 
-    util.show_container_logs("elastic-package-stack-e2e-logstash-1")
-    util.show_container_logs("elastic-package-stack-e2e-elasticsearch-1")
-    util.show_container_logs("elastic-package-stack-e2e-elastic-agent-1")
+    util.show_container_logs("logstash-")
+    util.show_container_logs("elasticsearch-")
+    util.show_container_logs("elastic-agent-")
 
     if len(failed_packages) > 0:
         raise Exception(f"Following packages failed: {failed_packages}")

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

@@ -18,15 +18,26 @@ 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 show_container_logs(container_name: str):
+def show_container_logs(container_prefix: str):
     client = docker.from_env()
-    container = client.containers.get(container_name)
+    containers = client.containers.list(all=True)
+    print(f"Available container names: {[c.name for c in containers]}")
+    matching_containers = [c for c in containers if container_prefix in c.name]
 
-    # pretty printing
-    print(f"{container_name} docker container logs..")
-    container_logs = container.logs().decode('utf-8')
-    for log_line in container_logs.splitlines():
-        print(log_line)
+    if not matching_containers:
+        print(f"No containers found with prefix '{container_prefix}'")
+        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)