Merge pull request #2599 from prometheus/release-0.22

Merge back release 0.22

CHANGELOG.md

@@ -1,3 +1,32 @@
+## 0.22.0 / 2021-05-21
+
+* [CHANGE] Amtool and Alertmanager binaries help now prints to stdout. #2505
+* [CHANGE] Use path relative to the configuration file for certificates and password files. #2502
+* [CHANGE] Display Silence and Alert dates in ISO8601 format. #2363
+* [FEATURE] Add date picker to silence form views. #2262
+* [FEATURE] Add support for negative matchers. #2434 #2460 and many more.
+* [FEATURE] Add time-based muting to routing tree. #2393
+* [FEATURE] Support TLS and basic authentication on the web server. #2446
+* [FEATURE] Add OAuth 2.0 client support in HTTP client. #2560
+* [ENHANCEMENT] Add composite durations in the configuration (e.g. 2h20m). #2353
+* [ENHANCEMENT] Add follow_redirect option to disable following redirects. #2551
+* [ENHANCEMENT] Add metric for permanently failed notifications. #2383
+* [ENHANCEMENT] Add support for custom authorization scheme. #2499
+* [ENHANCEMENT] Add support for not following HTTP redirects. #2499
+* [ENHANCEMENT] Add support to set the Slack URL from a file. #2534
+* [ENHANCEMENT] amtool: Add alert status to extended and simple output. #2324
+* [ENHANCEMENT] Do not omit false booleans in the configuration page. #2317
+* [ENHANCEMENT] OpsGenie: Propagate labels to Opsgenie details. #2276
+* [ENHANCEMENT] PagerDuty: Filter out empty images and links. #2379
+* [ENHANCEMENT] WeChat: add markdown support. #2309
+* [BUGFIX] Fix a possible deadlock on shutdown. #2558
+* [BUGFIX] UI: Fix extended printing of regex sign. #2445
+* [BUGFIX] UI: Fix the favicon when using a path prefix. #2392
+* [BUGFIX] Make filter labels consistent with Prometheus. #2403
+* [BUGFIX] alertmanager_config_last_reload_successful takes templating failures into account. #2373
+* [BUGFIX] amtool: avoid nil dereference in silence update. #2427
+* [BUGFIX] VictorOps: Catch routing_key templating errors. #2467
+
 ## 0.21.0 / 2020-06-16
 
 This release removes the HipChat integration as it is discontinued by Atlassian on June 30th 2020.

VERSION

@@ -1 +1 @@
-0.21.0
+0.22.0

cmd/alertmanager/main.go

@@ -335,11 +335,19 @@ func run() int {
 		return disp.Groups(routeFilter, alertFilter)
 	}
 
+	// An interface value that holds a nil concrete value is non-nil.
+	// Therefore we explicly pass an empty interface, to detect if the
+	// cluster is not enabled in notify.
+	var clusterPeer cluster.ClusterPeer
+	if peer != nil {
+		clusterPeer = peer
+	}
+
 	api, err := api.New(api.Options{
 		Alerts:      alerts,
 		Silences:    silences,
 		StatusFunc:  marker.Status,
-		Peer:        peer,
+		Peer:        clusterPeer,
 		Timeout:     *httpTimeout,
 		Concurrency: *getConcurrency,
 		Logger:      log.With(logger, "component", "api"),
@@ -426,6 +434,15 @@ func run() int {
 
 		inhibitor = inhibit.NewInhibitor(alerts, conf.InhibitRules, marker, logger)
 		silencer := silence.NewSilencer(silences, marker, logger)
+
+		// An interface value that holds a nil concrete value is non-nil.
+		// Therefore we explicly pass an empty interface, to detect if the
+		// cluster is not enabled in notify.
+		var pipelinePeer notify.Peer
+		if peer != nil {
+			pipelinePeer = peer
+		}
+
 		pipeline := pipelineBuilder.New(
 			receivers,
 			waitFunc,
@@ -433,7 +450,7 @@ func run() int {
 			silencer,
 			muteTimes,
 			notificationLog,
-			peer,
+			pipelinePeer,
 		)
 		configuredReceivers.Set(float64(len(activeReceivers)))
 		configuredIntegrations.Set(float64(integrationsNum))

doc/examples/simple.yml

@@ -47,39 +47,39 @@ route:
   routes:
   # This routes performs a regular expression match on alert labels to
   # catch alerts that are related to a list of services.
-  - match_re:
-      service: ^(foo1|foo2|baz)$
+  - matchers:
+    - service=~"foo1|foo2|baz"
     receiver: team-X-mails
     # The service has a sub-route for critical alerts, any alerts
     # that do not match, i.e. severity != critical, fall-back to the
     # parent node and are sent to 'team-X-mails'
     routes:
-    - match:
-        severity: critical
+    - matchers:
+      - severity="critical"
       receiver: team-X-pager
-  - match:
-      service: files
+  - matchers:
+    - service="files"
     receiver: team-Y-mails
 
     routes:
-    - match:
-        severity: critical
+    - matchers:
+      - severity="critical"
       receiver: team-Y-pager
 
   # This route handles all alerts coming from a database service. If there's
   # no team to handle it, it defaults to the DB team.
-  - match:
-      service: database
+  - matchers:
+    - service="database"
     receiver: team-DB-pager
     # Also group alerts by affected database.
     group_by: [alertname, cluster, database]
     routes:
-    - match:
-        owner: team-X
+    - matchers:
+      - owner="team-X"
       receiver: team-X-pager
       continue: true
-    - match:
-        owner: team-Y
+    - matchers:
+      - owner="team-Y"
       receiver: team-Y-pager
 
 
@@ -88,16 +88,14 @@ route:
 # We use this to mute any warning-level notifications if the same alert is
 # already critical.
 inhibit_rules:
-- source_match:
-    severity: 'critical'
-  target_match:
-    severity: 'warning'
+- source_matchers: [ severity="critical" ]
+  target_matchers: [ severity="warning" ]
   # Apply inhibition if the alertname is the same.
   # CAUTION:
   #   If all label names listed in `equal` are missing
   #   from both the source and target alerts,
   #   the inhibition rule will apply!
-  equal: ['alertname', 'cluster', 'service']
+  equal: [ alertname, cluster, service ]
 
 
 receivers:

docs/configuration.md

@@ -211,15 +211,15 @@ route:
   # are dispatched to the database pager.
   - receiver: 'database-pager'
     group_wait: 10s
-    match_re:
-      service: mysql|cassandra
+    matchers:
+    - service=~"mysql|cassandra"
   # All alerts with the team=frontend label match this sub-route.
   # They are grouped by product and environment rather than cluster
   # and alertname.
   - receiver: 'frontend-pager'
     group_by: [product, environment]
-    match:
-      team: frontend
+    matchers:
+    - team="frontend"
 ```
 
 ## `<mute_time_interval>`
@@ -326,7 +326,7 @@ source_match_re:
 # A list of matchers for which one or more alerts have 
 # to exist for the inhibition to take effect.
 source_matchers:
-   [ - <matcher> ... ]
+  [ - <matcher> ... ]
 
 # Labels that must have an equal value in the source and target
 # alert for the inhibition to take effect.
@@ -707,12 +707,12 @@ The 3rd token may be the empty string. Within the 3rd token, OpenMetrics escapin
 
 In the configuration, multiple matchers are combined in a YAML list. However, it is also possible to combine multiple matchers within a single YAML string, again using syntax inspired by PromQL. In such a string, a leading `{` and/or a trailing `}` is optional and will be trimmed before further parsing. Individual matchers are separated by commas outside of quoted parts of the string. Those commas may be surrounded by whitespace. Parts of the string inside unescaped double quotes `"…"` are considered quoted (and commas don't act as separators there). If double quotes are escaped with a single backslash `\`, they are ignored for the purpose of identifying quoted parts of the input string. If the input string, after trimming the optional trailing `}`, ends with a comma, followed by optional whitespace, this comma and whitespace will be trimmed.
 
-Here are some examples of valid string matchers :
+Here are some examples of valid string matchers:
 
 1. Shown below are two equality matchers combined in a long form YAML list.
 
 ```yaml
-  matchers :
+  matchers:
    - foo = bar
    - dings !=bums 
 ```

docs/https.md

@@ -8,7 +8,7 @@ sort_rank: 11
 Alertmanager supports basic authentication and TLS.
 This is **experimental** and might change in the future.
 
-Currentlu TLS is only supported for the HTTP traffic. Gossip traffic does not
+Currently TLS is only supported for the HTTP traffic. Gossip traffic does not
 support encryption yet.
 
 To specify which web configuration file to load, use the `--web.config.file` flag.