about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2023-09-23 18:17:41 +0200
committerJörg Thalheim <Mic92@users.noreply.github.com>2023-11-26 20:26:48 +0100
commit501680a656e23465a379ad0732a0aec0d434db5c (patch)
tree355d8e219d5c2d4482fc90e9e6b960275de90104
parent8ae9c8640cec51fcfa76b07f8cce2280716b72ce (diff)
downloadnixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar.gz
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar.bz2
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar.lz
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar.xz
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.tar.zst
nixlib-501680a656e23465a379ad0732a0aec0d434db5c.zip
nixos/telegraf: include procps if procstat input is configured
-rw-r--r--nixos/modules/services/monitoring/telegraf.nix5
-rw-r--r--nixos/tests/telegraf.nix1
2 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 913e599c189a..a957ef4d81db 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -53,6 +53,10 @@ in {
 
   ###### implementation
   config = mkIf config.services.telegraf.enable {
+    services.telegraf.extraConfig = {
+      inputs = {};
+      outputs = {};
+    };
     systemd.services.telegraf = let
       finalConfigFile = if config.services.telegraf.environmentFiles == []
                         then configFile
@@ -61,6 +65,7 @@ in {
       description = "Telegraf Agent";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
+      path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps;
       serviceConfig = {
         EnvironmentFile = config.services.telegraf.environmentFiles;
         ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != [])
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index c3cdb1645213..af9c5c387a5d 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     services.telegraf.extraConfig = {
       agent.interval = "1s";
       agent.flush_interval = "1s";
+      inputs.procstat = {};
       inputs.exec = {
         commands = [
           "${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'"