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: 143e5f64dd3a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 57087ea28089
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 13, 2020

  1. alertmanager: implement HA clustering support

    @globin
    globin committed Apr 13, 2020
    1
    Copy the full SHA
    e484ca3 View commit details

Commits on Apr 14, 2020

  1. Merge pull request #85165 from mayflower/alertmanager-clustering 

    prometheus/alertmanager: implement HA clustering support
    @Ma27
    Ma27 authored Apr 14, 2020
    Copy the full SHA
    57087ea View commit details
Showing with 11 additions and 0 deletions.
  1. +11 −0 nixos/modules/services/monitoring/prometheus/alertmanager.nix
11 changes: 11 additions & 0 deletions nixos/modules/services/monitoring/prometheus/alertmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ let
"--config.file /tmp/alert-manager-substituted.yaml"
"--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
"--log.level ${cfg.logLevel}"
"--storage.path /var/lib/alertmanager"
(toString (map (peer: "--cluster.peer ${peer}:9094") cfg.clusterPeers))
] ++ (optional (cfg.webExternalUrl != null)
"--web.external-url ${cfg.webExternalUrl}"
) ++ (optional (cfg.logFormat != null)
@@ -120,6 +122,14 @@ in {
'';
};

clusterPeers = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Initial peers for HA cluster.
'';
};

extraFlags = mkOption {
type = types.listOf types.str;
default = [];
@@ -162,6 +172,7 @@ in {
'';
serviceConfig = {
Restart = "always";
StateDirectory = "alertmanager";
DynamicUser = true; # implies PrivateTmp
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
WorkingDirectory = "/tmp";