From 9d3903330cdf9d24e93838587f395132b20bc4b3 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 10 Oct 2019 22:43:20 +0100
Subject: [PATCH] feat(formula): add `zabbix-formula`

---
 pillar.example                                |  1 +
 ssf/defaults.yaml                             |  5 ++-
 .../docs/CONTRIBUTING.rst                     |  1 +
 ssf/formulas.yaml                             | 42 +++++++++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/pillar.example b/pillar.example
index 860211ba..fc8ab83f 100644
--- a/pillar.example
+++ b/pillar.example
@@ -116,6 +116,7 @@ ssf:
       - vault
       - vim
       - vsftpd
+      - zabbix
     semrel_files:
       - bin/kitchen
       - docs/CONTRIBUTING.rst
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index f5cb6858..ca914528 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -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
@@ -445,3 +445,4 @@ ssf:
             name: ''
     vim: *formula_default
     vsftpd: *formula_default
+    zabbix: *formula_default
diff --git a/ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst b/ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
index 13cdc38d..c154ea65 100644
--- a/ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
+++ b/ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
@@ -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
 -------------
diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
index 4957cc72..dedb75d9 100644
--- a/ssf/formulas.yaml
+++ b/ssf/formulas.yaml
@@ -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