From 83f579002b54fe156db2fb149ea1764650402452 Mon Sep 17 00:00:00 2001 From: Kees Bos Date: Fri, 30 Oct 2015 18:16:11 +0100 Subject: [PATCH] Add SLES (Suse) support --- sysstat/defaults.yml | 2 ++ sysstat/files/sysstat.suse | 9 +++++++++ sysstat/map.jinja | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 sysstat/files/sysstat.suse diff --git a/sysstat/defaults.yml b/sysstat/defaults.yml index d532a28..3a590ff 100644 --- a/sysstat/defaults.yml +++ b/sysstat/defaults.yml @@ -10,3 +10,5 @@ sysstat: enabled: "true" sa1_options: "-S DISK" sa2_options: "" + history: 60 + compressafter: 10 diff --git a/sysstat/files/sysstat.suse b/sysstat/files/sysstat.suse new file mode 100644 index 0000000..07dd14a --- /dev/null +++ b/sysstat/files/sysstat.suse @@ -0,0 +1,9 @@ +# sysstat-8.1.5 configuration file. + +# How long to keep log files (in days). +# If value is greater than 28, then log files are kept in +# multiple directories, one for each month. +HISTORY={{ history|default('', 60) }} + +# Compress (using gzip or bzip2) sa and sar files older than (in days): +COMPRESSAFTER={{ compressafter|default('', 10) }} diff --git a/sysstat/map.jinja b/sysstat/map.jinja index 7cd417f..2f9fd04 100644 --- a/sysstat/map.jinja +++ b/sysstat/map.jinja @@ -7,13 +7,24 @@ {## setup variable using grains['os_family'] based logic ##} {% set sysstat_settings = salt['grains.filter_by']({ 'Debian': default_settings.sysstat, + 'RedHat': default_settings.sysstat, + 'Suse': default_settings.sysstat, +}, merge=salt['grains.filter_by']({ 'RedHat': { "service": { "name": "sysstat", - "enabled": False - } - } + "enabled": False, + }, + }, + 'Suse': { + "service": { + "name": "boot.sysstat", + }, + "config": { + "path": "/etc/sysstat/sysstat" + }, + }, }, grain="os_family", default='Debian', merge=salt['pillar.get']('sysstat:lookup') -) +)) %}