IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Add support for TTL for pushover for Mimir Alertmanager (#78687)

Browse Source
This commit is contained in:
Gilles De Mey 2024-01-08 15:48:36 +01:00 committed by GitHub
parent 890d6a960f
commit d2b023076b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/CODEOWNERS vendored
View File

@ -462,6 +462,7 @@ cypress.config.js @grafana/grafana-frontend-platform
/public/app/routes/ @grafana/grafana-frontend-platform /public/app/routes/ @grafana/grafana-frontend-platform
/public/app/store/ @grafana/grafana-frontend-platform /public/app/store/ @grafana/grafana-frontend-platform
/public/app/types/ @grafana/grafana-frontend-platform /public/app/types/ @grafana/grafana-frontend-platform
/public/app/types/alerting.ts @grafana/alerting-frontend
/public/dashboards/ @grafana/dashboards-squad /public/dashboards/ @grafana/dashboards-squad
/public/fonts/ @grafana/alerting-frontend /public/fonts/ @grafana/alerting-frontend
/public/gazetteer/ @ryantxu /public/gazetteer/ @ryantxu

2
docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
View File

@ -355,6 +355,8 @@ settings:
retry: '30' retry: '30'
# <string> # <string>
expire: '120' expire: '120'
# <string> the number of seconds before a message expires and is deleted automatically. Examples: 10s, 5m30s, 8h.
ttl:
# <string> # <string>
sound: siren sound: siren
# <string> # <string>

1
docs/sources/old-alerting/notifications.md
View File

@ -183,6 +183,7 @@ To set up Pushover, you must provide a user key and an API token. Refer to [What
| OK priority | The priority OK notifications are sent; if not set, then OK notifications are sent with the priority set for alerting notifications | | OK priority | The priority OK notifications are sent; if not set, then OK notifications are sent with the priority set for alerting notifications |
| Retry | How often (in seconds) the Pushover servers send the same notification to the user. (minimum 30 seconds) | | Retry | How often (in seconds) the Pushover servers send the same notification to the user. (minimum 30 seconds) |
| Expire | How many seconds your notification will continue to be retried for (maximum 86400 seconds) | | Expire | How many seconds your notification will continue to be retried for (maximum 86400 seconds) |
| TTL | The number of seconds before a message expires and is deleted automatically. Examples: 10s, 5m30s, 8h. |
| Alerting sound | The sound for alerting notifications | | Alerting sound | The sound for alerting notifications |
| OK sound | The sound for OK notifications | | OK sound | The sound for OK notifications |

10
public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
View File

@ -175,6 +175,16 @@ export const cloudNotifierTypes: Array<NotifierDTO<CloudNotifierType>> = [
placeholder: '1h', placeholder: '1h',
} }
), ),
option(
'ttl',
'TTL',
'The number of seconds before a message expires and is deleted automatically. Examples: 10s, 5m30s, 8h.',
{
// allow 30s, 4m30s, etc
validationRule: '^(\\d+[s|m|h])+$|^$',
element: 'input',
}
),
httpConfigOption, httpConfigOption,
], ],
}, },