diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 22:48:27 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-31 18:19:00 +0200 |
commit | 478e7184f88db1364cc75107036f7c4decc0cc41 (patch) | |
tree | 5ff3d3a18e3aef9af4333c392a94751333754270 /nixos/modules/services/monitoring/graphite.nix | |
parent | 69d58ee24506e2b3b5aff347ae3b0791110340ec (diff) | |
download | nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.gz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.bz2 nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.lz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.xz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.zst nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.zip |
nixos/modules: Remove all usages of types.string
And replace them with a more appropriate type Also fix up some minor module problems along the way
Diffstat (limited to 'nixos/modules/services/monitoring/graphite.nix')
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index d6473220c14..64cb6c3da1e 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -11,7 +11,7 @@ let graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" { inherit graphiteLocalSettings; - preferLocalBuild = true; + preferLocalBuild = true; } '' mkdir -p $out ln -s $graphiteLocalSettings $out/graphite_local_settings.py @@ -215,7 +215,7 @@ in { storageAggregation = mkOption { description = "Defines how to aggregate data to lower-precision retentions."; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = '' [all_min] pattern = \.min$ @@ -227,7 +227,7 @@ in { storageSchemas = mkOption { description = "Defines retention rates for storing metrics."; default = ""; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = '' [apache_busyWorkers] pattern = ^servers\.www.*\.workers\.busyWorkers$ @@ -238,14 +238,14 @@ in { blacklist = mkOption { description = "Any metrics received which match one of the experssions will be dropped."; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = "^some\.noisy\.metric\.prefix\..*"; }; whitelist = mkOption { description = "Only metrics received which match one of the experssions will be persisted."; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = ".*"; }; @@ -255,7 +255,7 @@ in { in a search and replace fashion. ''; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = '' [post] _sum$ = @@ -272,7 +272,7 @@ in { relayRules = mkOption { description = "Relay rules are used to send certain metrics to a certain backend."; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = '' [example] pattern = ^mydata\.foo\..+ @@ -289,7 +289,7 @@ in { aggregationRules = mkOption { description = "Defines if and how received metrics will be aggregated."; default = null; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; example = '' <env>.applications.<app>.all.requests (60) = sum <env>.applications.<app>.*.requests <env>.applications.<app>.all.latency (60) = avg <env>.applications.<app>.*.latency |