diff --git a/docs/configuration.md b/docs/configuration.md index a63122fff1..c177ad0f70 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -256,6 +256,7 @@ A notification is a chained action to perform. The chaining continues until the * next: name of next notification to execute after timeout. Can be itself. * timeout: duration to wait until next is executed. If not specified, will happen immediately. * contentType: If your body for a POST notification requires a different Content-Type header than the default of `application/x-www-form-urlencoded`, you may set the contentType variable. +* runOnActions: Exclude this notification from action notifications. Notifications will be sent on ack/close/forget actions using a built-in template to all root level notifications for an alert, *unless* the notification specifies `runOnActions = false`. #### actions diff --git a/docs/expressions.md b/docs/expressions.md index da2b841dd0..c11b6b7ad3 100644 --- a/docs/expressions.md +++ b/docs/expressions.md @@ -386,6 +386,10 @@ Returns the first key from the given lookup table with matching tags. Change the NaN value during binary operations (when joining two queries) of unknown groups to the scalar. This is useful to prevent unknown group and other errors from bubbling up. +## rename(seriesSet, string) seriesSet + +Accepts a series and a set of tags to rename in `Key1=NewK1,Key2=NewK2` format. All data points will have the tag keys renamed according to the spec provided, in order. This can be useful for combining results from seperate queries that have similar tagsets with different tag keys. + ## sort(numberSet, (asc|desc) string) numberSet Returns the results sorted by value in ascending ("asc") or descending ("desc")