From c6bfffc619207edac4be28881e13a4f89563e433 Mon Sep 17 00:00:00 2001 From: Nenad Noveljic <18366081+nenadnoveljic@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:10:20 +0200 Subject: [PATCH] docker compose output --- datadog_checks_dev/datadog_checks/dev/docker.py | 8 +------- sqlserver/datadog_checks/sqlserver/deadlocks.py | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/docker.py b/datadog_checks_dev/datadog_checks/dev/docker.py index 991f9a2189b47..9b853e7f4de31 100644 --- a/datadog_checks_dev/datadog_checks/dev/docker.py +++ b/datadog_checks_dev/datadog_checks/dev/docker.py @@ -243,13 +243,7 @@ def __init__(self, compose_file, build=False, service_name=None): self.command.append(self.service_name) def __call__(self): - try: - return run_command(self.command, check=True, capture=True) - except SubprocessError as e: - compose_error = str(e) - log_command = ['docker', 'compose', '-f', self.compose_file, 'logs'] - compose_logs = run_command(log_command, check=True, capture=True) - raise SubprocessError(f"compose error: {compose_error} | compose logs: {compose_logs}") + return run_command(self.command, check=True, capture=True) class ComposeFileLogs(LazyFunction): diff --git a/sqlserver/datadog_checks/sqlserver/deadlocks.py b/sqlserver/datadog_checks/sqlserver/deadlocks.py index 117a3649a1278..edc922cbd753a 100644 --- a/sqlserver/datadog_checks/sqlserver/deadlocks.py +++ b/sqlserver/datadog_checks/sqlserver/deadlocks.py @@ -42,7 +42,6 @@ def agent_check_getter(self): class Deadlocks(DBMAsyncJob): def __init__(self, check, config: SQLServerConfig): - # force ci self.tags = [t for t in check.tags if not t.startswith('dd.internal')] self._check = check self._log = self._check.log