Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4883cb78ec9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 624285d02949
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 18, 2020

  1. nixos/telegraf: null value for environmentFiles is invalid 

    it's also not needed given that empty list covers all use cases.
    @Mic92
    Mic92 committed Nov 18, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 226A2D41EF5378C9
    Learn about vigilant mode
    Copy the full SHA
    69caedc View commit details

  2. nixos/telegraf: make example a bit more compact

    @Mic92
    Mic92 committed Nov 18, 2020
    Copy the full SHA
    0f84e08 View commit details

  3. nixos/telegraf: fix test

    @Mic92
    Mic92 committed Nov 18, 2020
    Copy the full SHA
    58bf9ed View commit details

  4. Merge pull request #104206 from Mic92/telegraf

    @Mic92
    Mic92 authored Nov 18, 2020
    Copy the full SHA
    624285d View commit details
Showing with 9 additions and 13 deletions.
  1. +7 −11 nixos/modules/services/monitoring/telegraf.nix
  2. +2 −2 nixos/tests/telegraf.nix
18 changes: 7 additions & 11 deletions nixos/modules/services/monitoring/telegraf.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ in {
};

environmentFiles = mkOption {
type = types.nullOr (types.listOf types.path);
type = types.listOf types.path;
default = [];
example = "/run/keys/telegraf.env";
description = ''
@@ -38,17 +38,13 @@ in {
description = "Extra configuration options for telegraf";
type = settingsFormat.type;
example = {
outputs = {
influxdb = {
urls = ["http://localhost:8086"];
database = "telegraf";
};
outputs.influxdb = {
urls = ["http://localhost:8086"];
database = "telegraf";
};
inputs = {
statsd = {
service_address = ":8125";
delete_timings = true;
};
inputs.statsd = {
service_address = ":8125";
delete_timings = true;
};
};
};
4 changes: 2 additions & 2 deletions nixos/tests/telegraf.nix
View file
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {

machine = { ... }: {
services.telegraf.enable = true;
services.telegraf.environmentFiles = [pkgs.writeText "secrets" ''
services.telegraf.environmentFiles = [(pkgs.writeText "secrets" ''
SECRET=example
''];
'')];
services.telegraf.extraConfig = {
agent.interval = "1s";
agent.flush_interval = "1s";