Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd

pillar.example

@@ -157,6 +157,20 @@ salt:
             type: runner
             cmd: jobs.list_jobs
 
+    # optional beacons configuration
+    beacons:
+      load:
+        1m:
+          - 0.0
+          - 2.0
+        5m:
+          - 0.0
+          - 1.5
+        15m:
+          - 0.1
+          - 1.0
+        interval: 10
+
 
   # salt cloud config
   cloud:

salt/files/minion.d/beacons.conf

@@ -0,0 +1,9 @@
+#
+# This file is managed by Salt! Do not edit by hand!
+#
+{%- set beacons = salt['pillar.get']('salt:beacons') -%}
+{%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%}
+{%- if beacons %}
+beacons:
+  {{ beacons | yaml(False) | indent(2) }}
+{%- endif -%}

salt/files/minion.d/f_defaults.conf

@@ -1,7 +1,7 @@
 # This file managed by Salt, do not edit by hand!!
 #  Based on salt version 2015.8.7 default config
 #
-{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines'] -%}
+{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons'] -%}
 {% set cfg_salt = pillar.get('salt', {}) -%}
 {% set cfg_minion = cfg_salt.get('minion', {}) -%}
 {% set default_keys = [] -%}