Skip to content

Commit c6f6fc3

Browse files
ghormoonghormoon
committed
Merge branch 'master' of github.com:saltstack-formulas/zabbix-formula
2 parents 078ffdb + f727813 commit c6f6fc3

File tree

11 files changed

+349
-182
lines changed

11 files changed

+349
-182
lines changed

‎.gitlab-ci.yml‎

Lines changed: 60 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -140,64 +140,83 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140140
default-ubuntu-1604-master-py3: {extends: '.test_instance'}
141141
# default-centos-8-master-py3: {extends: '.test_instance'}
142142
# default-centos-7-master-py3: {extends: '.test_instance'}
143+
# default-fedora-34-master-py3: {extends: '.test_instance'}
143144
# default-fedora-33-master-py3: {extends: '.test_instance'}
144145
default-fedora-32-master-py3: {extends: '.test_instance'}
145146
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
146147
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
147148
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
148149
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
149150
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
151+
# default-arch-base-latest-master-py3: {extends: '.test_instance'}
150152
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
151153
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
152-
# default-debian-10-3002-5-py3: {extends: '.test_instance'}
153-
# default-debian-9-3002-5-py3: {extends: '.test_instance'}
154-
# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
155-
# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
156-
# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
157-
# default-centos-8-3002-5-py3: {extends: '.test_instance'}
158-
# default-centos-7-3002-5-py3: {extends: '.test_instance'}
159-
# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
160-
# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
161-
# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
162-
# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
163-
# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
164-
# default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
154+
# default-debian-10-3003-0-py3: {extends: '.test_instance'}
155+
# default-debian-9-3003-0-py3: {extends: '.test_instance'}
156+
# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
157+
# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
158+
# default-centos-8-3003-0-py3: {extends: '.test_instance'}
159+
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
160+
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
161+
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
162+
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
163+
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
164+
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
165+
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
166+
# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
167+
# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
168+
# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
169+
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
170+
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
171+
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
172+
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
173+
# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
174+
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
175+
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
176+
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
177+
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
178+
# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
179+
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
180+
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
181+
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
182+
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
165183
# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
166184
# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
167185
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
168186
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
169-
# default-debian-10-3001-6-py3: {extends: '.test_instance'}
170-
# default-debian-9-3001-6-py3: {extends: '.test_instance'}
171-
# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
172-
# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
173-
# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
174-
# default-centos-8-3001-6-py3: {extends: '.test_instance'}
175-
# default-centos-7-3001-6-py3: {extends: '.test_instance'}
176-
# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
177-
# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
178-
# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
179-
# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
180-
# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
181-
# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
182-
# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
183-
# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
187+
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
188+
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
189+
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
190+
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
191+
# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
192+
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
193+
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
194+
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
195+
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
196+
# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
197+
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
198+
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
199+
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
200+
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
201+
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
202+
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
184203
# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
185204
# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
186-
# default-debian-10-3000-8-py3: {extends: '.test_instance'}
187-
# default-debian-9-3000-8-py3: {extends: '.test_instance'}
188-
# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
189-
# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
190-
# default-centos-8-3000-8-py3: {extends: '.test_instance'}
191-
# default-centos-7-3000-8-py3: {extends: '.test_instance'}
192-
# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
193-
# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
194-
# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
195-
# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
205+
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
206+
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
207+
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
208+
# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
209+
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
210+
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
211+
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
212+
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
213+
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
214+
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
215+
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
216+
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
217+
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
196218
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
197219
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
198-
# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
199-
# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
200-
# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
201220

202221
###############################################################################
203222
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 60 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -100,64 +100,83 @@ jobs:
100100
- env: INSTANCE=default-ubuntu-1604-master-py3
101101
# - env: INSTANCE=default-centos-8-master-py3
102102
# - env: INSTANCE=default-centos-7-master-py3
103+
# - env: INSTANCE=default-fedora-34-master-py3
103104
# - env: INSTANCE=default-fedora-33-master-py3
104105
- env: INSTANCE=default-fedora-32-master-py3
105106
- env: INSTANCE=default-opensuse-leap-152-master-py3
106107
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
107108
# - env: INSTANCE=default-amazonlinux-2-master-py3
108109
# - env: INSTANCE=default-oraclelinux-8-master-py3
109110
# - env: INSTANCE=default-oraclelinux-7-master-py3
111+
# - env: INSTANCE=default-arch-base-latest-master-py3
110112
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
111113
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
112-
# - env: INSTANCE=default-debian-10-3002-5-py3
113-
# - env: INSTANCE=default-debian-9-3002-5-py3
114-
# - env: INSTANCE=default-ubuntu-2004-3002-5-py3
115-
# - env: INSTANCE=default-ubuntu-1804-3002-5-py3
116-
# - env: INSTANCE=default-ubuntu-1604-3002-5-py3
117-
# - env: INSTANCE=default-centos-8-3002-5-py3
118-
# - env: INSTANCE=default-centos-7-3002-5-py3
119-
# - env: INSTANCE=default-fedora-33-3002-5-py3
120-
# - env: INSTANCE=default-fedora-32-3002-5-py3
121-
# - env: INSTANCE=default-amazonlinux-2-3002-5-py3
122-
# - env: INSTANCE=default-oraclelinux-8-3002-5-py3
123-
# - env: INSTANCE=default-oraclelinux-7-3002-5-py3
124-
# - env: INSTANCE=default-arch-base-latest-3002-5-py3
114+
# - env: INSTANCE=default-debian-10-3003-0-py3
115+
# - env: INSTANCE=default-debian-9-3003-0-py3
116+
# - env: INSTANCE=default-ubuntu-2004-3003-0-py3
117+
# - env: INSTANCE=default-ubuntu-1804-3003-0-py3
118+
# - env: INSTANCE=default-centos-8-3003-0-py3
119+
# - env: INSTANCE=default-centos-7-3003-0-py3
120+
# - env: INSTANCE=default-fedora-34-3003-0-py3
121+
# - env: INSTANCE=default-fedora-33-3003-0-py3
122+
# - env: INSTANCE=default-fedora-32-3003-0-py3
123+
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
124+
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
125+
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
126+
# - env: INSTANCE=default-arch-base-latest-3003-0-py3
127+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3
128+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3
129+
# - env: INSTANCE=default-debian-10-3002-6-py3
130+
# - env: INSTANCE=default-debian-9-3002-6-py3
131+
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
132+
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
133+
# - env: INSTANCE=default-ubuntu-1604-3002-6-py3
134+
# - env: INSTANCE=default-centos-8-3002-6-py3
135+
# - env: INSTANCE=default-centos-7-3002-6-py3
136+
# - env: INSTANCE=default-fedora-34-3002-6-py3
137+
# - env: INSTANCE=default-fedora-33-3002-6-py3
138+
# - env: INSTANCE=default-fedora-32-3002-6-py3
139+
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
140+
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
141+
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
142+
# - env: INSTANCE=default-arch-base-latest-3002-6-py3
125143
# - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
126144
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
127145
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
128146
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
129-
# - env: INSTANCE=default-debian-10-3001-6-py3
130-
# - env: INSTANCE=default-debian-9-3001-6-py3
131-
# - env: INSTANCE=default-ubuntu-2004-3001-6-py3
132-
# - env: INSTANCE=default-ubuntu-1804-3001-6-py3
133-
# - env: INSTANCE=default-ubuntu-1604-3001-6-py3
134-
# - env: INSTANCE=default-centos-8-3001-6-py3
135-
# - env: INSTANCE=default-centos-7-3001-6-py3
136-
# - env: INSTANCE=default-fedora-33-3001-6-py3
137-
# - env: INSTANCE=default-fedora-32-3001-6-py3
138-
# - env: INSTANCE=default-opensuse-leap-152-3001-6-py3
139-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3
140-
# - env: INSTANCE=default-amazonlinux-2-3001-6-py3
141-
# - env: INSTANCE=default-oraclelinux-8-3001-6-py3
142-
# - env: INSTANCE=default-oraclelinux-7-3001-6-py3
143-
# - env: INSTANCE=default-arch-base-latest-3001-6-py3
147+
# - env: INSTANCE=default-debian-10-3001-7-py3
148+
# - env: INSTANCE=default-debian-9-3001-7-py3
149+
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
150+
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
151+
# - env: INSTANCE=default-ubuntu-1604-3001-7-py3
152+
# - env: INSTANCE=default-centos-8-3001-7-py3
153+
# - env: INSTANCE=default-centos-7-3001-7-py3
154+
# - env: INSTANCE=default-fedora-34-3001-7-py3
155+
# - env: INSTANCE=default-fedora-33-3001-7-py3
156+
# - env: INSTANCE=default-fedora-32-3001-7-py3
157+
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
158+
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
159+
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
160+
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
161+
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
162+
# - env: INSTANCE=default-arch-base-latest-3001-7-py3
144163
# - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3
145164
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3
146-
# - env: INSTANCE=default-debian-10-3000-8-py3
147-
# - env: INSTANCE=default-debian-9-3000-8-py3
148-
# - env: INSTANCE=default-ubuntu-1804-3000-8-py3
149-
# - env: INSTANCE=default-ubuntu-1604-3000-8-py3
150-
# - env: INSTANCE=default-centos-8-3000-8-py3
151-
# - env: INSTANCE=default-centos-7-3000-8-py3
152-
# - env: INSTANCE=default-opensuse-leap-152-3000-8-py3
153-
# - env: INSTANCE=default-amazonlinux-2-3000-8-py3
154-
# - env: INSTANCE=default-oraclelinux-8-3000-8-py3
155-
# - env: INSTANCE=default-oraclelinux-7-3000-8-py3
165+
# - env: INSTANCE=default-debian-10-3000-9-py3
166+
# - env: INSTANCE=default-debian-9-3000-9-py3
167+
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
168+
# - env: INSTANCE=default-ubuntu-1604-3000-9-py3
169+
# - env: INSTANCE=default-centos-8-3000-9-py3
170+
# - env: INSTANCE=default-centos-7-3000-9-py3
171+
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
172+
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
173+
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
174+
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
175+
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
176+
# - env: INSTANCE=default-ubuntu-1604-3000-9-py2
177+
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
156178
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
157179
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
158-
# - env: INSTANCE=default-ubuntu-1804-3000-8-py2
159-
# - env: INSTANCE=default-ubuntu-1604-3000-8-py2
160-
# - env: INSTANCE=default-arch-base-latest-3000-8-py2
161180

162181
## Define the release stage that runs `semantic-release`
163182
- stage: 'release'

‎AUTHORS.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord
44

55
Avatar|Contributor|Contributions
66
:-:|---|:-:
7-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|86
7+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|89
88
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3899078?v=4' width='36' height='36' alt='@moreda'>|[@moreda](https://github.com/moreda)|52
99
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12057348?v=4' width='36' height='36' alt='@xenadmin'>|[@xenadmin](https://github.com/xenadmin)|34
1010
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/904839?v=4' width='36' height='36' alt='@landergate'>|[@landergate](https://github.com/landergate)|27
1111
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|22
12-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>|[@hatifnatt](https://github.com/hatifnatt)|19
12+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>|[@hatifnatt](https://github.com/hatifnatt)|21
1313
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13771180?v=4' width='36' height='36' alt='@absmith82'>|[@absmith82](https://github.com/absmith82)|6
1414
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1566437?v=4' width='36' height='36' alt='@bkmit'>|[@bkmit](https://github.com/bkmit)|4
1515
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/571226?v=4' width='36' height='36' alt='@ninjix'>|[@ninjix](https://github.com/ninjix)|4
@@ -45,4 +45,4 @@ Avatar|Contributor|Contributions
4545

4646
---
4747

48-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-16.
48+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-11.

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## [1.2.1](https://github.com/saltstack-formulas/zabbix-formula/compare/v1.2.0...v1.2.1) (2021-05-11)
4+
5+
6+
### Bug Fixes
7+
8+
* **pgsql:** do not try to create db and user with schema ([058a800](https://github.com/saltstack-formulas/zabbix-formula/commit/058a800be2a9f1cc1aad58c4dae6b82474bdf188))
9+
10+
# [1.2.0](https://github.com/saltstack-formulas/zabbix-formula/compare/v1.1.0...v1.2.0) (2021-05-11)
11+
12+
13+
### Continuous Integration
14+
15+
* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([95523a9](https://github.com/saltstack-formulas/zabbix-formula/commit/95523a9df12d511e69f00faecdd55d478540a7cd))
16+
* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([1d237e8](https://github.com/saltstack-formulas/zabbix-formula/commit/1d237e8fcf14bd81126c5ab7cf38d0a5fd701cc9))
17+
* **travis:** maintain sync with GitLab CI [skip ci] ([5c81ca1](https://github.com/saltstack-formulas/zabbix-formula/commit/5c81ca16808d3541690be282a1f96e410d68d848)), closes [#146](https://github.com/saltstack-formulas/zabbix-formula/issues/146)
18+
19+
20+
### Features
21+
22+
* **agent:** allow use of string Server and ServerActive ([59dff0a](https://github.com/saltstack-formulas/zabbix-formula/commit/59dff0ace5ff83fd6996845e554dfbce7c9d1a75))
23+
324
# [1.1.0](https://github.com/saltstack-formulas/zabbix-formula/compare/v1.0.5...v1.1.0) (2021-04-16)
425

526

‎FORMULA‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: zabbix
22
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, FreeBSD, Windows
33
os_family: Debian, RedHat, FreeBSD, Windows
4-
version: 1.1.0
4+
version: 1.2.1
55
release: 1
66
minimum_version: 2018.3
77
summary: Formula for installing Zabbix

‎docs/AUTHORS.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
1515
- Contributions
1616
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
1717
- `@myii <https://github.com/myii>`_
18-
- 86
18+
- 89
1919
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3899078?v=4' width='36' height='36' alt='@moreda'>`
2020
- `@moreda <https://github.com/moreda>`_
2121
- 52
@@ -30,7 +30,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
3030
- 22
3131
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>`
3232
- `@hatifnatt <https://github.com/hatifnatt>`_
33-
- 19
33+
- 21
3434
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13771180?v=4' width='36' height='36' alt='@absmith82'>`
3535
- `@absmith82 <https://github.com/absmith82>`_
3636
- 6
@@ -131,4 +131,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
131131

132132
----
133133

134-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-04-16.
134+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-05-11.

0 commit comments

Comments
 (0)