mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #8626 from roidelapluie/go-to-am-api-v2

Browse source 
Switch to alertmanager api v2
This commit is contained in:
Julien Pivotto 2021-03-21 19:37:57 +01:00 committed by GitHub
parent 2ddecf92a2 49016994ac
commit 31a518faab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.go
View file

@ -117,7 +117,7 @@ var (
DefaultAlertmanagerConfig = AlertmanagerConfig{ DefaultAlertmanagerConfig = AlertmanagerConfig{
Scheme: "http", Scheme: "http",
Timeout: model.Duration(10 * time.Second), Timeout: model.Duration(10 * time.Second),
APIVersion: AlertmanagerAPIVersionV1, APIVersion: AlertmanagerAPIVersionV2,
HTTPClientConfig: config.DefaultHTTPClientConfig, HTTPClientConfig: config.DefaultHTTPClientConfig,
} }

2
config/config_test.go
View file

@ -785,7 +785,7 @@ var expectedConf = &Config{
{ {
Scheme: "https", Scheme: "https",
Timeout: model.Duration(10 * time.Second), Timeout: model.Duration(10 * time.Second),
APIVersion: AlertmanagerAPIVersionV1, APIVersion: AlertmanagerAPIVersionV2,
HTTPClientConfig: config.DefaultHTTPClientConfig, HTTPClientConfig: config.DefaultHTTPClientConfig,
ServiceDiscoveryConfigs: discovery.Configs{ ServiceDiscoveryConfigs: discovery.Configs{
discovery.StaticConfig{ discovery.StaticConfig{

2
docs/configuration/configuration.md
View file

@ -1755,7 +1755,7 @@ through the `__alerts_path__` label.
[ timeout: <duration> | default = 10s ] [ timeout: <duration> | default = 10s ]
# The api version of Alertmanager. # The api version of Alertmanager.
[ api_version: <string> | default = v1 ] [ api_version: <string> | default = v2 ]
# Prefix for the HTTP path alerts are pushed to. # Prefix for the HTTP path alerts are pushed to.
[ path_prefix: <path> | default = / ] [ path_prefix: <path> | default = / ]

4
notifier/notifier_test.go
View file

@ -454,7 +454,7 @@ func TestReload(t *testing.T) {
}, },
}, },
}, },
out: "http://alertmanager:9093/api/v1/alerts", out: "http://alertmanager:9093/api/v2/alerts",
}, },
} }
@ -504,7 +504,7 @@ func TestDroppedAlertmanagers(t *testing.T) {
}, },
}, },
}, },
out: "http://alertmanager:9093/api/v1/alerts", out: "http://alertmanager:9093/api/v2/alerts",
}, },
} }