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: 743311f51406
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b03d74001b45
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 3, 2021

  1. nixos/prometheus: update relabel_action list

    (cherry picked from commit 287939e)
    Phillip Cloud authored and Ma27 committed Jan 3, 2021
    Copy the full SHA
    b03d740 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/monitoring/prometheus/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/monitoring/prometheus/default.nix
Original file line number Diff line number Diff line change
@@ -432,10 +432,10 @@ let
regular expression matches.
'';

action = mkDefOpt (types.enum ["replace" "keep" "drop"]) "replace" ''
action =
mkDefOpt (types.enum ["replace" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep"]) "replace" ''
Action to perform based on regex matching.
'';

};
};