From f793c085701c43d719a6e6b4a4855092f533c579 Mon Sep 17 00:00:00 2001
From: Elfranne <861038+elfranne@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:13:38 +0200
Subject: [PATCH] Agent timeout parameter
---
REFERENCE.md | 9 +++++++++
manifests/agent.pp | 15 +++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/REFERENCE.md b/REFERENCE.md
index b97e3eaa1..70eb0c18a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -333,6 +333,7 @@ The following parameters are available in the `sensu::agent` class:
* [`log_file`](#-sensu--agent--log_file)
* [`agent_entity_config_provider`](#-sensu--agent--agent_entity_config_provider)
* [`validate_entity`](#-sensu--agent--validate_entity)
+* [`timeout`](#-sensu--agent--timeout)
##### `version`
@@ -538,6 +539,14 @@ to configure the entity
Default value: `true`
+##### `timeout`
+
+Data type: `Integer`
+
+Sets the timeout for validate entity
+
+Default value: `10`
+
### `sensu::api`
Class to manage the Sensu API.
diff --git a/manifests/agent.pp b/manifests/agent.pp
index 5c4886c8e..0a9821206 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -77,6 +77,8 @@
# @param validate_entity
# Sets whether to validate the agent's entity before attempting
# to configure the entity
+# @param timeout
+# Sets the timeout for validate entity
#
class sensu::agent (
Optional[String] $version = undef,
@@ -102,8 +104,8 @@
Optional[Stdlib::Absolutepath] $log_file = undef,
Enum['sensuctl','sensu_api'] $agent_entity_config_provider = 'sensu_api',
Boolean $validate_entity = true,
+ Integer $timeout = 10,
) {
-
include sensu
include sensu::common
include sensu::api
@@ -208,8 +210,8 @@
before => Package['sensu-go-agent'],
}
} elsif $package_source {
- $package_provider = undef
- $_package_source = $package_source
+ $package_provider = undef
+ $_package_source = $package_source
} else {
include chocolatey
$package_provider = 'chocolatey'
@@ -284,9 +286,9 @@
systemd::dropin_file { 'sensu-agent-start.conf':
unit => 'sensu-agent.service',
content => join([
- '[Service]',
- 'ExecStart=',
- "ExecStart=${service_path} start -c ${sensu::agent_config_path}",
+ '[Service]',
+ 'ExecStart=',
+ "ExecStart=${service_path} start -c ${sensu::agent_config_path}",
], "\n"),
notify => Service['sensu-agent'],
}
@@ -304,6 +306,7 @@
ensure => 'present',
namespace => $config['namespace'],
provider => 'sensu_api',
+ timeout => $timeout,
}
}
}