Skip to content

Commit

Permalink
feat(formula): add zabbix-formula
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Oct 12, 2019
1 parent e8afcc4 commit 9d39033
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 2 deletions.
1 change: 1 addition & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ ssf:
- vault
- vim
- vsftpd
- zabbix
semrel_files:
- bin/kitchen
- docs/CONTRIBUTING.rst
Expand Down
5 changes: 3 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'ci(travis): merge `rubocop` linter into main `lint` job'
body: '* Semi-automated using /~https://github.com/myii/ssf-formula/pull/64'
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using /~https://github.com/myii/ssf-formula/pull/66'
# yamllint enable rule:line-length
github:
owner: saltstack-formulas
Expand Down Expand Up @@ -445,3 +445,4 @@ ssf:
name: ''
vim: *formula_default
vsftpd: *formula_default
zabbix: *formula_default
1 change: 1 addition & 0 deletions ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ These formulas are already compatible with semantic-release:
* `vault-formula </~https://github.com/saltstack-formulas/vault-formula>`_
* `vim-formula </~https://github.com/saltstack-formulas/vim-formula>`_
* `vsftpd-formula </~https://github.com/saltstack-formulas/vsftpd-formula>`_
* `zabbix-formula </~https://github.com/saltstack-formulas/zabbix-formula>`_

Documentation
-------------
Expand Down
42 changes: 42 additions & 0 deletions ssf/formulas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1762,3 +1762,45 @@ ssf:
- .sls: test/salt/pillar/vsftpd.sls
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
zabbix:
context:
git:
github:
repo: zabbix-formula
inspec_suites_kitchen:
0:
inspec_yml:
summary: >-
Verify that the zabbix formula is setup and configured correctly
provisioner:
pillars_from_files:
- .sls: test/salt/pillar/default.sls
state_top:
- '*':
- .agent.repo
- .agent.conf
- .server.repo
- .server.conf
- .frontend.repo
- .frontend.conf
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , develop, 3, default]
- [debian , 9 , 2019.2, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [fedora , 30 , 2019.2, 3, default]
- [ubuntu , 16.04, 2018.3, 2, default]
# - [fedora , 29 , 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
rubocop:
Cops:
Metrics/BlockLength:
Max: 28
# Enable this in a subsequent PR, since it's an old version,
# which is already active (needs to be checked for regressions)
# use_tofs: true
yamllint:
rules:
key-duplicates:
ignore: *ignore_pillar_example
semrel_files: *semrel_files_default

0 comments on commit 9d39033

Please sign in to comment.