Skip to content

Commit 1cbc5c9

Browse files
cocker-cccocker-cc
committed
Use Sensitive for Secrets
To not reveal Secrets, accept Datatype Sensitive. Render Templates as sensitive Content, if Secrets were given as Sensitive.
1 parent 0c2853d commit 1cbc5c9

File tree

18 files changed

+245
-176
lines changed

18 files changed

+245
-176
lines changed

‎REFERENCE.md‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ Default value: `$zabbix::params::server_api_user`
540540

541541
##### <a name="-zabbix--zabbix_api_pass"></a>`zabbix_api_pass`
542542

543-
Data type: `Any`
543+
Data type: `Variant[Sensitive[String], String]`
544544

545545
Password of the user which connects to the api. Default: zabbix
546546

@@ -654,7 +654,7 @@ Default value: `$zabbix::params::server_database_user`
654654

655655
##### <a name="-zabbix--database_password"></a>`database_password`
656656

657-
Data type: `Any`
657+
Data type: `Variant[Sensitive[String], String]`
658658

659659
Database password. ignored for sqlite.
660660

@@ -1869,7 +1869,16 @@ Default value: `$zabbix::params::agent_timeout`
18691869

18701870
##### <a name="-zabbix--agent--tlsaccept"></a>`tlsaccept`
18711871

1872-
Data type: `Optional[Variant[Array[Enum['unencrypted','psk','cert']],Enum['unencrypted','psk','cert']]]`
1872+
Data type:
1873+
1874+
```puppet
1875+
Optional[
1876+
Variant[
1877+
Array[Enum['unencrypted','psk','cert']],
1878+
Enum['unencrypted','psk','cert']
1879+
]
1880+
]
1881+
```
18731882

18741883
What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy.
18751884

@@ -2299,7 +2308,7 @@ Default value: `$zabbix::params::server_database_user`
22992308

23002309
##### <a name="-zabbix--database--database_password"></a>`database_password`
23012310

2302-
Data type: `Any`
2311+
Data type: `Variant[Sensitive[String], String]`
23032312

23042313
The password of the database_user.
23052314

@@ -2907,7 +2916,7 @@ Default value: `$zabbix::params::proxy_database_user`
29072916

29082917
##### <a name="-zabbix--proxy--database_password"></a>`database_password`
29092918

2910-
Data type: `Any`
2919+
Data type: `Variant[Sensitive[String], String]`
29112920

29122921
Database password. ignored for sqlite.
29132922

@@ -3288,7 +3297,16 @@ Default value: `$zabbix::params::proxy_timeout`
32883297

32893298
##### <a name="-zabbix--proxy--tlsaccept"></a>`tlsaccept`
32903299

3291-
Data type: `Optional[Variant[Array[Enum['unencrypted','psk','cert']],Enum['unencrypted','psk','cert']]]`
3300+
Data type:
3301+
3302+
```puppet
3303+
Optional[
3304+
Variant[
3305+
Array[Enum['unencrypted', 'psk', 'cert']],
3306+
Enum['unencrypted', 'psk', 'cert']
3307+
]
3308+
]
3309+
```
32923310

32933311
What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy.
32943312

@@ -3887,7 +3905,7 @@ API username.
38873905

38883906
##### <a name="-zabbix--resources--web--zabbix_pass"></a>`zabbix_pass`
38893907

3890-
Data type: `String[1]`
3908+
Data type: `Variant[Sensitive[String[1]], String[1]]`
38913909

38923910
API password.
38933911

@@ -4297,7 +4315,7 @@ Default value: `$zabbix::params::server_database_user`
42974315

42984316
##### <a name="-zabbix--server--database_password"></a>`database_password`
42994317

4300-
Data type: `Any`
4318+
Data type: `Variant[Sensitive[String], String]`
43014319

43024320
Database password. ignored for sqlite.
43034321

@@ -5290,7 +5308,7 @@ Default value: `$zabbix::params::server_api_user`
52905308

52915309
##### <a name="-zabbix--web--zabbix_api_pass"></a>`zabbix_api_pass`
52925310

5293-
Data type: `Any`
5311+
Data type: `Variant[Sensitive[String], String]`
52945312

52955313
Password of the user which connects to the api. Default: zabbix
52965314

@@ -5348,7 +5366,7 @@ Default value: `$zabbix::params::server_database_user`
53485366

53495367
##### <a name="-zabbix--web--database_password"></a>`database_password`
53505368

5351-
Data type: `Any`
5369+
Data type: `Variant[Sensitive[String], String]`
53525370

53535371
Database password. ignored for sqlite.
53545372

‎manifests/agent.pp‎

Lines changed: 86 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -147,88 +147,93 @@
147147
#
148148
# @author Werner Dijkerman [email protected]
149149
class zabbix::agent (
150-
$zabbix_version = $zabbix::params::zabbix_version,
151-
$zabbix_package_state = $zabbix::params::zabbix_package_state,
152-
$zabbix_package_agent = $zabbix::params::zabbix_package_agent,
153-
Optional[String[1]] $zabbix_package_provider = $zabbix::params::zabbix_package_provider,
154-
Optional[Stdlib::Windowspath] $zabbix_package_source = undef,
155-
Boolean $manage_choco = $zabbix::params::manage_choco,
156-
Boolean $manage_firewall = $zabbix::params::manage_firewall,
157-
Boolean $manage_repo = $zabbix::params::manage_repo,
158-
Boolean $manage_resources = $zabbix::params::manage_resources,
159-
$monitored_by_proxy = $zabbix::params::monitored_by_proxy,
160-
$agent_use_ip = $zabbix::params::agent_use_ip,
161-
Variant[String[1],Array[String[1]]] $zbx_groups = $zabbix::params::agent_zbx_groups,
162-
$zbx_group_create = $zabbix::params::agent_zbx_group_create,
163-
$zbx_templates = $zabbix::params::agent_zbx_templates,
164-
Array[Hash] $zbx_macros = [],
165-
Integer[1,4] $zbx_interface_type = 1,
166-
Variant[Array, Hash] $zbx_interface_details = [],
167-
$agent_configfile_path = $zabbix::params::agent_configfile_path,
168-
$pidfile = $zabbix::params::agent_pidfile,
169-
$servicename = $zabbix::params::agent_servicename,
170-
Enum['console', 'file', 'system'] $logtype = $zabbix::params::agent_logtype,
171-
Optional[Stdlib::Absolutepath] $logfile = $zabbix::params::agent_logfile,
172-
$logfilesize = $zabbix::params::agent_logfilesize,
173-
$debuglevel = $zabbix::params::agent_debuglevel,
174-
$sourceip = $zabbix::params::agent_sourceip,
175-
Optional[String[1]] $allowkey = $zabbix::params::agent_allowkey,
176-
Optional[String[1]] $denykey = $zabbix::params::agent_denykey,
177-
$enableremotecommands = $zabbix::params::agent_enableremotecommands,
178-
$logremotecommands = $zabbix::params::agent_logremotecommands,
179-
$server = $zabbix::params::agent_server,
180-
$listenport = $zabbix::params::agent_listenport,
181-
$listenip = $zabbix::params::agent_listenip,
182-
$startagents = $zabbix::params::agent_startagents,
183-
$serveractive = $zabbix::params::agent_serveractive,
184-
Stdlib::Ensure::Service $service_ensure = $zabbix::params::agent_service_ensure,
185-
Boolean $service_enable = $zabbix::params::agent_service_enable,
186-
$hostname = $zabbix::params::agent_hostname,
187-
$hostnameitem = $zabbix::params::agent_hostnameitem,
188-
$hostmetadata = $zabbix::params::agent_hostmetadata,
189-
$hostmetadataitem = $zabbix::params::agent_hostmetadataitem,
190-
Optional[Stdlib::Fqdn] $hostinterface = $zabbix::params::agent_hostinterface,
191-
Optional[Stdlib::Fqdn] $hostinterfaceitem = $zabbix::params::agent_hostinterfaceitem,
192-
$refreshactivechecks = $zabbix::params::agent_refreshactivechecks,
193-
$buffersend = $zabbix::params::agent_buffersend,
194-
$buffersize = $zabbix::params::agent_buffersize,
195-
$maxlinespersecond = $zabbix::params::agent_maxlinespersecond,
196-
Optional[Array] $zabbix_alias = $zabbix::params::agent_zabbix_alias,
197-
$timeout = $zabbix::params::agent_timeout,
198-
$allowroot = $zabbix::params::agent_allowroot,
199-
Optional[String[1]] $zabbix_user = $zabbix::params::agent_zabbix_user,
200-
$include_dir = $zabbix::params::agent_include,
201-
$include_dir_purge = $zabbix::params::agent_include_purge,
202-
$unsafeuserparameters = $zabbix::params::agent_unsafeuserparameters,
203-
$userparameter = $zabbix::params::agent_userparameter,
204-
Optional[String[1]] $loadmodulepath = $zabbix::params::agent_loadmodulepath,
205-
$loadmodule = $zabbix::params::agent_loadmodule,
206-
Optional[Variant[Array[Enum['unencrypted','psk','cert']],Enum['unencrypted','psk','cert']]] $tlsaccept = $zabbix::params::agent_tlsaccept,
207-
$tlscafile = $zabbix::params::agent_tlscafile,
208-
$tlscertfile = $zabbix::params::agent_tlscertfile,
209-
Optional[String[1]] $tlscertissuer = undef,
210-
Optional[String[1]] $tlscertsubject = undef,
211-
Optional[String[1]] $tlscipherall = $zabbix::params::agent_tlscipherall,
212-
Optional[String[1]] $tlscipherall13 = $zabbix::params::agent_tlscipherall13,
213-
Optional[String[1]] $tlsciphercert = $zabbix::params::agent_tlsciphercert,
214-
Optional[String[1]] $tlsciphercert13 = $zabbix::params::agent_tlsciphercert13,
215-
Optional[String[1]] $tlscipherpsk = $zabbix::params::agent_tlscipherpsk,
216-
Optional[String[1]] $tlscipherpsk13 = $zabbix::params::agent_tlscipherpsk13,
150+
$zabbix_version = $zabbix::params::zabbix_version,
151+
$zabbix_package_state = $zabbix::params::zabbix_package_state,
152+
$zabbix_package_agent = $zabbix::params::zabbix_package_agent,
153+
Optional[String[1]] $zabbix_package_provider = $zabbix::params::zabbix_package_provider,
154+
Optional[Stdlib::Windowspath] $zabbix_package_source = undef,
155+
Boolean $manage_choco = $zabbix::params::manage_choco,
156+
Boolean $manage_firewall = $zabbix::params::manage_firewall,
157+
Boolean $manage_repo = $zabbix::params::manage_repo,
158+
Boolean $manage_resources = $zabbix::params::manage_resources,
159+
$monitored_by_proxy = $zabbix::params::monitored_by_proxy,
160+
$agent_use_ip = $zabbix::params::agent_use_ip,
161+
Variant[String[1],Array[String[1]]] $zbx_groups = $zabbix::params::agent_zbx_groups,
162+
$zbx_group_create = $zabbix::params::agent_zbx_group_create,
163+
$zbx_templates = $zabbix::params::agent_zbx_templates,
164+
Array[Hash] $zbx_macros = [],
165+
Integer[1,4] $zbx_interface_type = 1,
166+
Variant[Array, Hash] $zbx_interface_details = [],
167+
$agent_configfile_path = $zabbix::params::agent_configfile_path,
168+
$pidfile = $zabbix::params::agent_pidfile,
169+
$servicename = $zabbix::params::agent_servicename,
170+
Enum['console', 'file', 'system'] $logtype = $zabbix::params::agent_logtype,
171+
Optional[Stdlib::Absolutepath] $logfile = $zabbix::params::agent_logfile,
172+
$logfilesize = $zabbix::params::agent_logfilesize,
173+
$debuglevel = $zabbix::params::agent_debuglevel,
174+
$sourceip = $zabbix::params::agent_sourceip,
175+
Optional[String[1]] $allowkey = $zabbix::params::agent_allowkey,
176+
Optional[String[1]] $denykey = $zabbix::params::agent_denykey,
177+
$enableremotecommands = $zabbix::params::agent_enableremotecommands,
178+
$logremotecommands = $zabbix::params::agent_logremotecommands,
179+
$server = $zabbix::params::agent_server,
180+
$listenport = $zabbix::params::agent_listenport,
181+
$listenip = $zabbix::params::agent_listenip,
182+
$startagents = $zabbix::params::agent_startagents,
183+
$serveractive = $zabbix::params::agent_serveractive,
184+
Stdlib::Ensure::Service $service_ensure = $zabbix::params::agent_service_ensure,
185+
Boolean $service_enable = $zabbix::params::agent_service_enable,
186+
$hostname = $zabbix::params::agent_hostname,
187+
$hostnameitem = $zabbix::params::agent_hostnameitem,
188+
$hostmetadata = $zabbix::params::agent_hostmetadata,
189+
$hostmetadataitem = $zabbix::params::agent_hostmetadataitem,
190+
Optional[Stdlib::Fqdn] $hostinterface = $zabbix::params::agent_hostinterface,
191+
Optional[Stdlib::Fqdn] $hostinterfaceitem = $zabbix::params::agent_hostinterfaceitem,
192+
$refreshactivechecks = $zabbix::params::agent_refreshactivechecks,
193+
$buffersend = $zabbix::params::agent_buffersend,
194+
$buffersize = $zabbix::params::agent_buffersize,
195+
$maxlinespersecond = $zabbix::params::agent_maxlinespersecond,
196+
Optional[Array] $zabbix_alias = $zabbix::params::agent_zabbix_alias,
197+
$timeout = $zabbix::params::agent_timeout,
198+
$allowroot = $zabbix::params::agent_allowroot,
199+
Optional[String[1]] $zabbix_user = $zabbix::params::agent_zabbix_user,
200+
$include_dir = $zabbix::params::agent_include,
201+
$include_dir_purge = $zabbix::params::agent_include_purge,
202+
$unsafeuserparameters = $zabbix::params::agent_unsafeuserparameters,
203+
$userparameter = $zabbix::params::agent_userparameter,
204+
Optional[String[1]] $loadmodulepath = $zabbix::params::agent_loadmodulepath,
205+
$loadmodule = $zabbix::params::agent_loadmodule,
206+
Optional[
207+
Variant[
208+
Array[Enum['unencrypted','psk','cert']],
209+
Enum['unencrypted','psk','cert']
210+
]
211+
] $tlsaccept = $zabbix::params::agent_tlsaccept,
212+
$tlscafile = $zabbix::params::agent_tlscafile,
213+
$tlscertfile = $zabbix::params::agent_tlscertfile,
214+
Optional[String[1]] $tlscertissuer = undef,
215+
Optional[String[1]] $tlscertsubject = undef,
216+
Optional[String[1]] $tlscipherall = $zabbix::params::agent_tlscipherall,
217+
Optional[String[1]] $tlscipherall13 = $zabbix::params::agent_tlscipherall13,
218+
Optional[String[1]] $tlsciphercert = $zabbix::params::agent_tlsciphercert,
219+
Optional[String[1]] $tlsciphercert13 = $zabbix::params::agent_tlsciphercert13,
220+
Optional[String[1]] $tlscipherpsk = $zabbix::params::agent_tlscipherpsk,
221+
Optional[String[1]] $tlscipherpsk13 = $zabbix::params::agent_tlscipherpsk13,
217222
Optional[Enum['unencrypted','psk','cert']] $tlsconnect = $zabbix::params::agent_tlsconnect,
218-
$tlscrlfile = $zabbix::params::agent_tlscrlfile,
219-
$tlskeyfile = $zabbix::params::agent_tlskeyfile,
220-
$tlspskfile = $zabbix::params::agent_tlspskfile,
221-
$tlspskidentity = $zabbix::params::agent_tlspskidentity,
222-
$tlsservercertissuer = $zabbix::params::agent_tlsservercertissuer,
223-
$tlsservercertsubject = $zabbix::params::agent_tlsservercertsubject,
224-
Optional[String[1]] $agent_config_owner = $zabbix::params::agent_config_owner,
225-
Optional[String[1]] $agent_config_group = $zabbix::params::agent_config_group,
226-
Boolean $manage_selinux = $zabbix::params::manage_selinux,
227-
Array[String] $selinux_require = $zabbix::params::selinux_require,
228-
Hash[String, Array] $selinux_rules = $zabbix::params::selinux_rules,
229-
String $additional_service_params = $zabbix::params::additional_service_params,
230-
String $service_type = $zabbix::params::service_type,
231-
Boolean $manage_startup_script = $zabbix::params::manage_startup_script,
223+
$tlscrlfile = $zabbix::params::agent_tlscrlfile,
224+
$tlskeyfile = $zabbix::params::agent_tlskeyfile,
225+
$tlspskfile = $zabbix::params::agent_tlspskfile,
226+
$tlspskidentity = $zabbix::params::agent_tlspskidentity,
227+
$tlsservercertissuer = $zabbix::params::agent_tlsservercertissuer,
228+
$tlsservercertsubject = $zabbix::params::agent_tlsservercertsubject,
229+
Optional[String[1]] $agent_config_owner = $zabbix::params::agent_config_owner,
230+
Optional[String[1]] $agent_config_group = $zabbix::params::agent_config_group,
231+
Boolean $manage_selinux = $zabbix::params::manage_selinux,
232+
Array[String] $selinux_require = $zabbix::params::selinux_require,
233+
Hash[String, Array] $selinux_rules = $zabbix::params::selinux_rules,
234+
String $additional_service_params = $zabbix::params::additional_service_params,
235+
String $service_type = $zabbix::params::service_type,
236+
Boolean $manage_startup_script = $zabbix::params::manage_startup_script,
232237
) inherits zabbix::params {
233238
$agent2 = $zabbix_package_agent == 'zabbix-agent2'
234239

0 commit comments

Comments
 (0)