NixOS · Jul 6, 2019 · Jul 6, 2019 · Jul 6, 2019 · Jul 6, 2019 · Jul 6, 2019
diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix
@@ -1,16 +1,32 @@
 { config, lib, ... }:
 
-{
-  options.hardware.enableKSM = lib.mkEnableOption "Kernel Same-Page Merging";
+with lib;
 
-  config = lib.mkIf config.hardware.enableKSM {
+let
+  cfg = config.hardware.ksm;
+
+in {
+  options.hardware.ksm = {
+    enable = mkEnableOption "Kernel Same-Page Merging";
+    sleep = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        How many milliseconds ksmd should sleep between scans.
+        Setting it to <literal>null</literal> uses the kernel's default time.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
     systemd.services.enable-ksm = {
       description = "Enable Kernel Same-Page Merging";
       wantedBy = [ "multi-user.target" ];
       after = [ "systemd-udev-settle.service" ];
       script = ''
         if [ -e /sys/kernel/mm/ksm ]; then
           echo 1 > /sys/kernel/mm/ksm/run
+          ${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''}
         fi
       '';
     };

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
@@ -241,6 +241,9 @@ with lib;
     # binfmt
     (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
 
+    # KSM
+    (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
@@ -141,11 +141,18 @@ in {
       path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable
         (pkgs.python3.withPackages cfg.python.extraPackages);
       serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
         Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";
-        ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}";
+        ExecStart = "${pkgs.netdata}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
+        ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
         TimeoutStopSec = 60;
+        # User and group
+        User = cfg.user;
+        Group = cfg.group;
+        # Runtime directory and mode
+        RuntimeDirectory = "netdata";
+        RuntimeDirectoryMode = "0755";
+        # Performance
+        LimitNOFILE = "30000";
       };
     };
 
@@ -165,6 +172,11 @@ in {
       permissions = "u+rx,g+rx,o-rwx";
     };
 
+    security.pam.loginLimits = [
+      { domain = "netdata"; type = "soft"; item = "nofile"; value = "10000"; }
+      { domain = "netdata"; type = "hard"; item = "nofile"; value = "30000"; }
+    ];
+
     users.users = optional (cfg.user == defaultUser) {
       name = defaultUser;
     };

diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
@@ -0,0 +1,27 @@
+{ buildGoModule, fetchgit, stdenv }:
+
+buildGoModule rec {
+  pname = "cue";
+  version = "0.0.3";
+
+  src = fetchgit {
+    url = "https://cue.googlesource.com/cue";
+    rev = "v${version}";
+    sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7";
+  };
+
+  modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6";
+
+  subPackages = [ "cmd/cue" ];
+
+  buildFlagsArray = [
+    "-ldflags=-X cuelang.org/go/cmd/cue/cmd.version=${version}"
+  ];
+
+  meta = {
+    description = "A data constraint language which aims to simplify tasks involving defining and using data.";
+    homepage = https://cue.googlesource.com/cue;
+    maintainers = with stdenv.lib.maintainers; [ solson ];
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
@@ -1,12 +1,13 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   name = "kustomize-${version}";
-  version = "2.0.3";
-  # rev is the 2.0.3 commit, mainly for kustomize version command output
-  rev = "a6f65144121d1955266b0cd836ce954c04122dc8";
+  version = "3.0.0";
+  # rev is the 3.0.0 commit, mainly for kustomize version command output
+  rev = "e0bac6ad192f33d993f11206e24f6cda1d04c4ec";
 
   goPackagePath = "sigs.k8s.io/kustomize";
+  subPackages = [ "cmd/kustomize" ];
 
   buildFlagsArray = let t = "${goPackagePath}/pkg/commands/misc"; in ''
     -ldflags=
@@ -16,12 +17,14 @@ buildGoPackage rec {
   '';
 
   src = fetchFromGitHub {
-    sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb";
+    sha256 = "1ywppn97gfgrwlq1nrj4kdvrdanq5ahqaa636ynyp9yiv9ibziq6";
     rev = "v${version}";
     repo = "kustomize";
     owner = "kubernetes-sigs";
   };
 
+  modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1";
+
   meta = with lib; {
     description = "Customization of kubernetes YAML configurations";
     longDescription = ''