Skip to content
Permalink
Browse files

Merge #584

584: Avoid reference on globals from monitoring-exporters.nix r=jbgi a=jbgi

 so that it can be used outside cardano specific deployments.

Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
  • Loading branch information...
iohk-bors and jbgi committed May 15, 2019
2 parents db5d5cf + da755b1 commit 8bd6426a0c214a4cf1270f4d75fc142a23919082
Showing with 9 additions and 3 deletions.
  1. +2 −0 modules/devops.nix
  2. +1 −3 modules/monitoring-exporters.nix
  3. +2 −0 modules/production.nix
  4. +2 −0 modules/staging.nix
  5. +2 −0 modules/testnet.nix
@@ -14,6 +14,8 @@ with import ./../lib.nix;

# DEVOPS-64: disable log bursting
journald.rateLimitBurst = 0;

monitoring-exporters.graylogHost = "${config.deployment.arguments.globals.monitoringNV.name}-ip:5044";
};

};
@@ -4,8 +4,6 @@ with lib;

let
cfg = config.services.monitoring-exporters;
monitoring = config.deployment.arguments.globals.monitoringNV;

in {

options = {
@@ -20,7 +18,7 @@ in {

graylogHost = mkOption {
type = types.nullOr types.str;
default = "${monitoring.name}-ip:5044";
default = null;
example = "graylog:5044";
description = ''
The host port under which Graylog is externally reachable.
@@ -14,6 +14,8 @@ with import ../lib.nix;

# DEVOPS-64: disable log bursting
journald.rateLimitBurst = 0;

monitoring-exporters.graylogHost = "${config.deployment.arguments.globals.monitoringNV.name}-ip:5044";
};

};
@@ -14,6 +14,8 @@ with import ./../lib.nix;

# DEVOPS-64: disable log bursting
journald.rateLimitBurst = 0;

monitoring-exporters.graylogHost = "${config.deployment.arguments.globals.monitoringNV.name}-ip:5044";
};

};
@@ -14,6 +14,8 @@ with import ./../lib.nix;

# DEVOPS-64: disable log bursting
journald.rateLimitBurst = 0;

monitoring-exporters.graylogHost = "${config.deployment.arguments.globals.monitoringNV.name}-ip:5044";
};

};

0 comments on commit 8bd6426

Please sign in to comment.
You can’t perform that action at this time.