Merge remote-tracking branch 'lass/master'

1 files changed, 28 insertions, 11 deletions

diff --git a/lass/3modules/telegraf.nix b/lass/3modules/telegraf.nix
index 64b323460..0b3be2d69 100644
--- a/lass/3modules/telegraf.nix
+++ b/lass/3modules/telegraf.nix
@@ -21,26 +21,43 @@ let
       type = types.str;
       default = "telegraf";
     };
+    outputs = mkOption {
+      type = types.str;
+      default = ''
+        [outputs.influxdb]
+          urls = ["http://localhost:8086"]
+          database = "telegraf_db"
+          user_agent = "telegraf"
+      '';
+    };
+    inputs = mkOption {
+      type = with types; listOf str;
+      default = [
+        ''
+          [cpu]
+            percpu = false
+            totalcpu = true
+            drop = ["cpu_time"]
+        ''
+      ];
+    };
+    interval = mkOption {
+      type = types.str;
+      default = "10s";
+    };
     config = mkOption {
       type = types.str;
       #TODO: find a good default
       default = ''
         [agent]
-            interval = "1s"
+            interval = "${cfg.interval}"
 
         [outputs]
 
-        # Configuration to send data to InfluxDB.
-        [outputs.influxdb]
-            urls = ["http://localhost:8086"]
-            database = "kapacitor_example"
-            user_agent = "telegraf"
+        ${cfg.outputs}
+
+        ${concatStringsSep "\n" cfg.inputs}
 
-        # Collect metrics about cpu usage
-        [cpu]
-            percpu = false
-            totalcpu = true
-            drop = ["cpu_time"]
       '';
       description = "configuration telegraf is started with";
     };