diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
commit | 446fec8c2dda7ab24783713f16092803b7b1e464 (patch) | |
tree | bda175eabb91dd480448aa3c24875de73640e8a4 /nixos/modules/services | |
parent | 99de1a8ebb9df72642c259de63c4f0d2d1c770e7 (diff) | |
parent | 97da2d22fed6b55d331c565a5817e97d74063397 (diff) | |
download | nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.gz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.bz2 nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.lz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.xz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.zst nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.zip |
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/monitoring/sysstat.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nixos/modules/services/monitoring/sysstat.nix b/nixos/modules/services/monitoring/sysstat.nix index d668faa53cc3..ca2cff827232 100644 --- a/nixos/modules/services/monitoring/sysstat.nix +++ b/nixos/modules/services/monitoring/sysstat.nix @@ -5,15 +5,10 @@ let in { options = { services.sysstat = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable sar system activity collection. - ''; - }; + enable = mkEnableOption "sar system activity collection"; collect-frequency = mkOption { + type = types.str; default = "*:00/10"; description = '' OnCalendar specification for sysstat-collect @@ -21,6 +16,7 @@ in { }; collect-args = mkOption { + type = types.str; default = "1 1"; description = '' Arguments to pass sa1 when collecting statistics @@ -33,13 +29,13 @@ in { systemd.services.sysstat = { description = "Resets System Activity Logs"; wantedBy = [ "multi-user.target" ]; - preStart = "test -d /var/log/sa || mkdir -p /var/log/sa"; serviceConfig = { User = "root"; RemainAfterExit = true; Type = "oneshot"; ExecStart = "${pkgs.sysstat}/lib/sa/sa1 --boot"; + LogsDirectory = "sa"; }; }; |