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

Commits on Jan 3, 2021

  1. nixos/prometheus: update relabel_action list

    Phillip Cloud committed Jan 3, 2021
    Copy the full SHA
    287939e View commit details

  2. Merge pull request #107890 from cpcloud/prom-more-relabel-actions 

    nixos/prometheus: update relabel_action list
    @Ma27
    Ma27 authored Jan 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6e5071 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
View file
Original file line number Diff line number Diff line change
@@ -585,10 +585,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.
'';

};
};