Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to adjust checkmk agent exec timeout to prevent crashes #26

Closed
wants to merge 1 commit into from
Closed

Add option to adjust checkmk agent exec timeout to prevent crashes #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/checkmk_kube_agent/send_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,12 +302,18 @@ def parse_arguments(argv: Sequence[str]) -> argparse.Namespace:
default="warning",
help="Collector log level.",
)
parser.add_argument(
"--agent-timeout",
type=int,
help="Checkmk Agent execution timeout in seconds",
)
parser.set_defaults(
host=os.environ.get("CLUSTER_COLLECTOR_SERVICE_HOST", "127.0.0.1"),
port=os.environ.get("CLUSTER_COLLECTOR_SERVICE_PORT_API", "10050"),
max_retries=10,
polling_interval=60,
ca_cert="/etc/ca-certificates/checkmk-ca-cert.pem",
agent_timeout=5,
)

return parser.parse_args(argv)
Expand All @@ -318,6 +324,7 @@ def container_metrics_worker(
cluster_collector_base_url: Url,
headers: RequestHeaders,
verify: SslVerify,
args: argparse.Namespace, # pylint: disable=unused-argument
) -> None: # pragma: no cover
"""
Query cadvisor api, send metrics to cluster collector
Expand Down Expand Up @@ -364,6 +371,7 @@ def machine_sections_worker(
cluster_collector_base_url: Url,
headers: RequestHeaders,
verify: SslVerify,
args: argparse.Namespace,
) -> None: # pragma: no cover
"""
Call check_mk_agent, send sections to cluster collector
Expand All @@ -373,7 +381,7 @@ def machine_sections_worker(
["/usr/local/bin/check_mk_agent"],
stdout=subprocess.PIPE,
) as process:
returncode = process.wait(5)
returncode = process.wait(args.agent_timeout)
if returncode != 0:
# we don't capture stderr so it's printed to stderr of this process
# and hopefully contains a helpful error message...
Expand Down Expand Up @@ -437,7 +445,9 @@ def _setup_logging(verbosity: Literal["info", "debug"]) -> None: # pragma: no c


def _main(
worker: Callable[[Session, Url, RequestHeaders, SslVerify], None],
worker: Callable[
[Session, Url, RequestHeaders, SslVerify, argparse.Namespace], None
],
argv: Optional[Sequence[str]] = None,
) -> None: # pragma: no cover
"""Run in infinite loop and execute worker function"""
Expand Down Expand Up @@ -468,7 +478,7 @@ def _main(
headers = {
"Authorization": f"Bearer {read_node_collector_token()}",
}
worker(session, cluster_collector_base_url, headers, verify)
worker(session, cluster_collector_base_url, headers, verify, args)
process_duration = time.time() - start_time
logger.info("Worker finished in %.2f seconds", process_duration)

Expand Down
Loading