Unverified Commit bed09b73 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #226923 from Drakonis/prometheus/agent-mode 

nixos/prometheus: add `enableAgentMode` option
parents 7cb7b7f9 5c6c35d0

nixos/modules/services/monitoring/prometheus/default.nix

+13 −6
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ let 
  # This becomes the main config file for Prometheus

  promConfig = {

    global = filterValidPrometheus cfg.globalConfig;

    rule_files = map (promtoolCheck "check rules" "rules") (cfg.ruleFiles ++ [

      (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))

    ]);

    scrape_configs = filterValidPrometheus cfg.scrapeConfigs;

    remote_write = filterValidPrometheus cfg.remoteWrite;

    remote_read = filterValidPrometheus cfg.remoteRead;

    rule_files = optionals (!(cfg.enableAgentMode)) (map (promtoolCheck "check rules" "rules") (cfg.ruleFiles ++ [

      (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))

    ]));

    alerting = {

      inherit (cfg) alertmanagers;

    };
@@ -62,15 +62,20 @@ let 
    promtoolCheck "check config ${lib.optionalString (cfg.checkConfig == "syntax-only") "--syntax-only"}" "prometheus.yml" yml;



  cmdlineArgs = cfg.extraFlags ++ [

    "--storage.tsdb.path=${workingDir}/data/"

    "--config.file=${

      if cfg.enableReload

      then "/etc/prometheus/prometheus.yaml"

      else prometheusYml

    }"

    "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"

  ] ++ (

    if (cfg.enableAgentMode) then [

      "--enable-feature=agent"

    ] else [

       "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity }"

  ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"

       "--storage.tsdb.path=${workingDir}/data/"

    ])

    ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"

    ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"

    ++ optional (cfg.webConfigFile != null) "--web.config.file=${cfg.webConfigFile}";
@@ -1612,6 +1617,8 @@ in 
      '';

    };



    enableAgentMode = mkEnableOption (lib.mdDoc "agent mode");



    configText = mkOption {

      type = types.nullOr types.lines;

      default = null;