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: prometheus/alertmanager
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: sourcegraph/alertmanager
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sourcegraph-alertmanager
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 2, 2020

  1. add MarshalSecret flag 

    Signed-off-by: Robert Lin <robert@bobheadxi.dev>
    @bobheadxi
    bobheadxi committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    a941b13 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. config: add constructor for regexp

    @bobheadxi
    bobheadxi committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    3e856a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2021

  1. Merge branch 'prometheus:main' into master

    @bobheadxi
    bobheadxi authored Aug 9, 2021
    Configuration menu
    Copy the full SHA
    aa1d14d View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v0.22.2' of github.com:prometheus/alertmanager into source… 

    …graph-alertmanager

v0.22.2
    @bobheadxi
    bobheadxi committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    88b656a View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Merge tag 'v0.23.0' into sourcegraph-alertmanager 

    v0.23.0
    @keegancsmith
    keegancsmith committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    863f5b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Merge branch 'prometheus:main' into master

    @bobheadxi
    bobheadxi authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    d9dd8f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bobheadxi:master' into sourcegraph-alertmanager

    @bobheadxi
    bobheadxi authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    902d888 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Merge tag 'v0.25.0' of github.com:prometheus/alertmanager into source… 

    …graph-alertmanager

v0.25.0
    @bobheadxi
    bobheadxi committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    affee7f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Release: Cut 0.27.0-rc.0 

    Signed-off-by: gotjosh <josue.abreu@gmail.com>
    @gotjosh
    gotjosh committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    824de35 View commit details
    Browse the repository at this point in the history

  2. small fixes 

    - typo in respond
- add PR numbers for UTF-8

Signed-off-by: gotjosh <josue.abreu@gmail.com>
    @gotjosh
    gotjosh committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    6d52bcf View commit details
    Browse the repository at this point in the history

  3. more worthsmithing 

    Signed-off-by: gotjosh <josue.abreu@gmail.com>
    @gotjosh
    gotjosh committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    b379b29 View commit details
    Browse the repository at this point in the history

  4. Fix flaky test TestClusterJoinAndReconnect/TestTLSConnection (#3722) 

    wait until `p2.Status()` returns because it blocks until we're ready - that way, we're guaranteed to know that the cluster size is 2.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
    @gotjosh
    gotjosh committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0fbd018 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into release-0.27

    @gotjosh
    gotjosh authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    1234193 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Cut Alertmanager version 0.27 from the rc.0 (#3740) 

    Signed-off-by: gotjosh <josue.abreu@gmail.com>
    @gotjosh
    gotjosh authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0aa3c2a View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge tag 'v0.27.0' of github.com:prometheus/alertmanager into source… 

    …graph-alertmanager

v0.27.0
    @bobheadxi
    bobheadxi committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    3695ef8 View commit details
    Browse the repository at this point in the history
Loading