Adding Versioning, reflected in pillar.example

.kitchen.yml

@@ -0,0 +1,38 @@
+---
+driver:
+    name: docker
+    use_sudo: false
+    privileged: true
+
+provisioner:
+    name: salt_solo
+    formula: beats
+    salt_install: bootstrap
+    salt_bootstrap_options: -X stable
+    salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
+    require_chef: false
+    state_top:
+        base:
+            "*":
+                - beats.repository
+                - beats.filebeat.install
+                - beats.filebeat.config
+                - beats.filebeat.service
+                - beats.filebeat.purge
+                - beats.metricbeat.install
+                - beats.metricbeat.config
+                - beats.metricbeat.service
+                - beats.metricbeat.purge
+                - beats.purge
+
+platforms:
+    - name: debian-jessie
+    - name: ubuntu-14.04
+    - name: ubuntu-16.04
+    - name: centos-6
+    - name: centos-7
+      driver_config:
+        run_command: /usr/lib/systemd/systemd
+
+suites:
+    - name: default

.travis.yml

@@ -0,0 +1,11 @@
+sudo: required
+
+language: ruby
+
+services:
+    - docker
+
+before_install:
+    - pip install -r requirements.txt
+
+script: bundle exec kitchen verify

CHANGELOG.rst

@@ -2,6 +2,11 @@
 beats-formula
 =============
 
+0.0.3 (2017-09-06)
+
+- State to manage [File, Metric]beat daemon (c28c185)
+- Testing with Travis/Kitchen (ba2bbe8)
+
 0.0.2 (2017-06-14)
 
 - Added Metricbeat configuration state (8eb5ce9)

Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "test-kitchen"
+gem "kitchen-docker"
+gem "kitchen-salt"

README.rst

@@ -23,12 +23,17 @@ Installs the Elastic repository for version 5.x packages.
 ``beats.filebeat.install``
 --------------------------
 
-Installs the Filebeat package and enables the relative systemd unit.
+Installs the Filebeat package.
 
 ``beats.filebeat.config``
 -------------------------
 
-Configure Filebeat by reading from ``beats:filebeat:config`` pillar key.
+Configures Filebeat by reading from ``beats:filebeat:config`` pillar key.
+
+``beats.filebeat.service``
+--------------------------
+
+Runs and enables the Filebeat service.
 
 ``beats.filebeat.purge``
 ------------------------
@@ -38,12 +43,17 @@ Purges the environment created by ``beats.filebeat.*`` states.
 ``beats.metricbeat.install``
 ----------------------------
 
-Installs the Metricbeat package and enables the relative systemd unit.
+Installs the Metricbeat package.
 
 ``beats.metricbeat.config``
 ---------------------------
 
-Configure Metricbeat by reading from ``beats:metricbeat:config`` pillar key.
+Configures Metricbeat by reading from ``beats:metricbeat:config`` pillar key.
+
+``beats.metricbeat.service``
+----------------------------
+
+Runs and enables the Metricbeat service.
 
 ``beats.metricbeat.purge``
 --------------------------

VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

beats/filebeat/config.sls

@@ -1,6 +1,11 @@
+include:
+    - beats.filebeat.install
+
 {% if salt['pillar.get']('beats:filebeat:config', {}) %}
 /etc/filebeat/filebeat.yml:
     file.serialize:
         - dataset_pillar: 'beats:filebeat:config'
         - formatter: yaml
+        - require:
+            - sls: beats.filebeat.install
 {% endif %}

beats/filebeat/install.sls

@@ -5,12 +5,6 @@ include:
 filebeat_install:
     pkg.installed:
         - name: filebeat
+        - version: {{ salt['pillar.get']('beats:filebeat:version', '6.1.2') }}
         - require:
             - sls: beats.repository
-
-# Enable the filebeat systemd unit
-filebeat_enabled:
-    service.enabled:
-        - name: filebeat
-        - require:
-            - pkg: filebeat_install

beats/filebeat/service.sls

@@ -0,0 +1,16 @@
+include:
+    - beats.filebeat.install
+    - beats.filebeat.config
+
+# Enable and run Filebeat daemon
+filebeat_running:
+    service.running:
+        - name: filebeat
+          enable: True
+          require:
+            - sls: beats.filebeat.install
+{%- if salt['pillar.get']('beats:filebeat:config') %}
+            - sls: beats.filebeat.config
+          watch:
+            - file: /etc/filebeat/filebeat.yml
+{% endif %}

beats/metricbeat/config.sls

@@ -1,6 +1,11 @@
+include:
+    - beats.metricbeat.install
+
 {% if salt['pillar.get']('beats:metricbeat:config', {}) %}
 /etc/metricbeat/metricbeat.yml:
     file.serialize:
         - dataset_pillar: 'beats:metricbeat:config'
         - formatter: yaml
+        - require:
+            - sls: beats.metricbeat.install
 {% endif %}

beats/metricbeat/install.sls

@@ -5,12 +5,6 @@ include:
 metricbeat_install:
     pkg.installed:
         - name: metricbeat
+        - version: {{ salt['pillar.get']('beats:metricbeat:version', '6.1.2') }}
         - require:
             - sls: beats.repository
-
-# Enable the metricbeat systemd unit
-metricbeat_enabled:
-    service.enabled:
-        - name: metricbeat
-        - require:
-            - pkg: metricbeat_install

beats/metricbeat/service.sls

@@ -0,0 +1,16 @@
+include:
+    - beats.metricbeat.install
+    - beats.metricbeat.config
+
+# Enable and run Metricbeat daemon
+metricbeat_running:
+    service.running:
+        - name: metricbeat
+          enable: True
+          require:
+            - sls: beats.metricbeat.install
+{%- if salt['pillar.get']('beats:metricbeat:config') %}
+            - sls: beats.metricbeat.config
+          watch:
+            - file: /etc/metricbeat/metricbeat.yml
+{% endif %}

pillar.example

@@ -1,5 +1,6 @@
 beats:
     filebeat:
+        version: latest
         config:
             filebeat.prospectors:
                 - input_type: log
@@ -14,6 +15,7 @@ beats:
                 rotateeverybytes: 10485760
                 keepfiles: 7
     metricbeat:
+        version: latest
         config:
             cbeat.config.modules:
                 path: ${path.config}/conf.d/*.yml

requirements.txt

@@ -0,0 +1 @@
+testinfra