Skip to content

Commit 347b874

Browse files
committed
feat: added SMSDevices param
1 parent 76d4b3a commit 347b874

File tree

8 files changed

+52
-10
lines changed

8 files changed

+52
-10
lines changed

.github/workflows/prepare_release.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: 'Prepare Release'
6+
7+
on:
8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
12+
required: false
13+
14+
jobs:
15+
release_prep:
16+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
17+
with:
18+
version: ${{ github.event.inputs.version }}
19+
allowed_owner: 'voxpupuli'
20+
secrets:
21+
# Configure secrets here:
22+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
23+
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'

.github/workflows/release.yml

-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ jobs:
2121
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2222
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
2323
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}
24-
25-
create-github-release:
26-
name: Create GitHub Release
27-
runs-on: ubuntu-latest
28-
steps:
29-
- name: Create GitHub release
30-
uses: voxpupuli/gha-create-a-github-release@v1

.msync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '9.3.0'
5+
modulesync_config_version: '9.4.0'

REFERENCE.md

+18
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ The following parameters are available in the `zabbix` class:
158158
* [`starttimers`](#-zabbix--starttimers)
159159
* [`javagateway`](#-zabbix--javagateway)
160160
* [`javagatewayport`](#-zabbix--javagatewayport)
161+
* [`smsdevices`](#-zabbix--smsdevices)
161162
* [`startjavapollers`](#-zabbix--startjavapollers)
162163
* [`startlldprocessors`](#-zabbix--startlldprocessors)
163164
* [`startvmwarecollectors`](#-zabbix--startvmwarecollectors)
@@ -830,6 +831,14 @@ Port that zabbix java gateway listens on.
830831

831832
Default value: `$zabbix::params::server_javagatewayport`
832833

834+
##### <a name="-zabbix--smsdevices"></a>`smsdevices`
835+
836+
Data type: `Optional[Array[String]]`
837+
838+
Which devices to use for sms texting
839+
840+
Default value: `$zabbix::params::server_smsdevices`
841+
833842
##### <a name="-zabbix--startjavapollers"></a>`startjavapollers`
834843

835844
Data type: `Any`
@@ -4008,6 +4017,7 @@ The following parameters are available in the `zabbix::server` class:
40084017
* [`maxhousekeeperdelete`](#-zabbix--server--maxhousekeeperdelete)
40094018
* [`cachesize`](#-zabbix--server--cachesize)
40104019
* [`cacheupdatefrequency`](#-zabbix--server--cacheupdatefrequency)
4020+
* [`smsdevices`](#-zabbix--server--smsdevices)
40114021
* [`startdbsyncers`](#-zabbix--server--startdbsyncers)
40124022
* [`historycachesize`](#-zabbix--server--historycachesize)
40134023
* [`historyindexcachesize`](#-zabbix--server--historyindexcachesize)
@@ -4604,6 +4614,14 @@ How often zabbix will perform update of configuration cache, in seconds.
46044614

46054615
Default value: `$zabbix::params::server_cacheupdatefrequency`
46064616

4617+
##### <a name="-zabbix--server--smsdevices"></a>`smsdevices`
4618+
4619+
Data type: `Optional[Array[String[1]]]`
4620+
4621+
What devices to use for texting
4622+
4623+
Default value: `$zabbix::params::server_smsdevices`
4624+
46074625
##### <a name="-zabbix--server--startdbsyncers"></a>`startdbsyncers`
46084626

46094627
Data type: `Any`

manifests/init.pp

+3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
# @param starttimers Number of pre-forked instances of timers.
117117
# @param javagateway IP address (or hostname) of zabbix java gateway.
118118
# @param javagatewayport Port that zabbix java gateway listens on.
119+
# @param smsdevices Which devices to use for sms texting
119120
# @param startjavapollers Number of pre-forked instances of java pollers.
120121
# @param startlldprocessors Number of pre-forked instances of low-level discovery (LLD) workers.
121122
# @param startvmwarecollectors Number of pre-forked vmware collector instances.
@@ -304,6 +305,7 @@
304305
$cachesize = $zabbix::params::server_cachesize,
305306
$cacheupdatefrequency = $zabbix::params::server_cacheupdatefrequency,
306307
$startdbsyncers = $zabbix::params::server_startdbsyncers,
308+
Optional[Array[String]] $smsdevices = $zabbix::params::server_smsdevices,
307309
$historycachesize = $zabbix::params::server_historycachesize,
308310
Zabbix::Historyics $historyindexcachesize = $zabbix::params::server_historyindexcachesize,
309311
$trendcachesize = $zabbix::params::server_trendcachesize,
@@ -423,6 +425,7 @@
423425
database_port => $database_port,
424426
database_tlsconnect => $database_tlsconnect,
425427
database_tlscafile => $database_tlscafile,
428+
smsdevices => $smsdevices,
426429
startpollers => $startpollers,
427430
startipmipollers => $startipmipollers,
428431
startpollersunreachable => $startpollersunreachable,

manifests/params.pp

+1
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
$server_pacemaker_resource = undef
239239
$server_snmptrapperfile = '/tmp/zabbix_traps.tmp'
240240
$server_sourceip = undef
241+
$server_smsdevices = []
241242
$server_sshkeylocation = undef
242243
$server_sslcertlocation = '/usr/lib/zabbix/ssl/certs'
243244
$server_sslkeylocation = '/usr/lib/zabbix/ssl/keys'

manifests/server.pp

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
# if set to 0 then no limit is used at all. in this case you must know what you are doing!
8888
# @param cachesize Size of configuration cache, in bytes.
8989
# @param cacheupdatefrequency How often zabbix will perform update of configuration cache, in seconds.
90+
# @param smsdevices What devices to use for texting
9091
# @param startdbsyncers Number of pre-forked instances of db syncers.
9192
# @param historycachesize Size of history cache, in bytes.
9293
# @param historyindexcachesize Size of history index cache, in bytes.
@@ -204,6 +205,7 @@
204205
Optional[Stdlib::Absolutepath] $database_tlskeyfile = $zabbix::params::server_database_tlskeyfile,
205206
Optional[String[1]] $database_tlscipher = $zabbix::params::server_database_tlscipher,
206207
Optional[String[1]] $database_tlscipher13 = $zabbix::params::server_database_tlscipher13,
208+
Optional[Array[String[1]]] $smsdevices = $zabbix::params::server_smsdevices,
207209
$startpollers = $zabbix::params::server_startpollers,
208210
$startipmipollers = $zabbix::params::server_startipmipollers,
209211
Integer[0, 1000] $startodbcpollers = $zabbix::params::server_startodbcpollers,

templates/zabbix_server.conf.erb

+4-2
Original file line numberDiff line numberDiff line change
@@ -962,8 +962,10 @@ LoadModulePath=<%= @loadmodulepath %>
962962
# Mandatory: no
963963
# Default:
964964
# SMSDevices=
965+
<% if @smsdevices -%>
966+
SMSDevices=<%= @smsdevices.join(',') -%><% end -%>
967+
<% end -%>
965968

966-
<% end %>
967969
<% if @zabbix_version.to_f >= 5.4 %>
968970
####### For advanced users - TCP-related fine-tuning parameters #######
969971

@@ -1017,4 +1019,4 @@ LoadModulePath=<%= @loadmodulepath %>
10171019
# Default:
10181020
# StartBrowserPollers=1
10191021

1020-
<% end %>
1022+
<% end %>

0 commit comments

Comments
 (0)