Skip to content

Commit

Permalink
feat(formula): add icinga2-formula
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Dec 10, 2019
1 parent 98c7c8d commit f055e2f
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 1 deletion.
1 change: 1 addition & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ssf:
- firewalld
- golang
- grafana
- icinga2
- influxdb
- iptables
- iscsi
Expand Down
3 changes: 2 additions & 1 deletion ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ssf_node_anchors:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using https://github.com/myii/ssf-formula/pull/108'
body: '* Automated using https://github.com/myii/ssf-formula/pull/109'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -277,6 +277,7 @@ ssf:
firewalld: *formula_default
golang: *formula_default
grafana: *formula_default
icinga2: *formula_default
influxdb: *formula_default
iptables:
<<: *formula_default
Expand Down
17 changes: 17 additions & 0 deletions ssf/files/tofs_icinga2-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths: []
rules:
206: # Jinja variables should have spaces before and after
ignore: |
icinga2/files/xmpp.conf.jinja
skip_list:
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
- 205 # Use ".sls" as a Salt State file extension
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
- 207 # File modes should always be encapsulated in quotation marks
- 208 # File modes should always contain a leading zero
tags: []
verbosity: 1
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 @@ -181,6 +181,7 @@ These formulas are already compatible with semantic-release:
#. `firewalld-formula <https://github.com/saltstack-formulas/firewalld-formula>`_
#. `golang-formula <https://github.com/saltstack-formulas/golang-formula>`_
#. `grafana-formula <https://github.com/saltstack-formulas/grafana-formula>`_
#. `icinga2-formula <https://github.com/saltstack-formulas/icinga2-formula>`_
#. `influxdb-formula <https://github.com/saltstack-formulas/influxdb-formula>`_
#. `iptables-formula <https://github.com/saltstack-formulas/iptables-formula>`_
#. `iscsi-formula <https://github.com/saltstack-formulas/iscsi-formula>`_
Expand Down
31 changes: 31 additions & 0 deletions ssf/formulas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,37 @@ ssf:
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files: *semrel_files_default
icinga2:
context:
git:
github:
repo: 'icinga2-formula'
inspec_suites_kitchen:
0:
inspec_yml:
summary: >-
Verify that the icinga2 formula is setup and configured correctly
provisioner:
dependencies:
- name: 'postgres'
repo: 'git'
source: 'https://github.com/saltstack-formulas/postgres-formula.git'
pillars:
- '*':
# - postgres
- .
pillars_from_files:
# - postgres.sls: 'test/salt/pillar/postgres.sls'
- .sls: 'test/salt/pillar/default.sls'
state_top:
- '*':
- .icinga-web2
platforms_matrix: *platforms_matrix_osfamily_debian
yamllint:
ignore:
additional:
- icinga2/osfamilymap.yaml
semrel_files: *semrel_files_default
influxdb:
context:
git:
Expand Down

0 comments on commit f055e2f

Please sign in to comment.