Commit Graph

2341 Commits

Author SHA1 Message Date
Tyler Reid 009f8b17e9 Use 1024 rather than 1000 for KB size, fix target arn, handle large SMS messages correctly
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
2021-06-14 10:21:33 -05:00
Tyler Reid 74d15273c0 Add support for role arn, truncation, dedupe key and env auth
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
2021-06-11 16:21:15 -05:00
Tyler Reid 5dcf4f5f91 ARN Auth start
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
2021-06-11 10:30:44 -05:00
Tyler Reid 19e74f9ce7 WIP - SNS receiver
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
2021-06-09 21:14:07 -05:00
Julien Pivotto 7301451eb9
Merge pull request #2576 from owen-d/standardize/common
bump common to 0.24.0
2021-05-12 01:22:18 +02:00
Julien Pivotto 670fd98cea
Merge pull request #2563 from pracucci/fix-issue-2562
Fix race condition causing 1st alert to not be immediately delivered when group_wait is 0s
2021-05-11 21:09:23 +02:00
Owen Diehl e071242db2 bump common to 0.24.0
Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
2021-05-11 15:02:09 -04:00
Marco Pracucci f84af78693
Lowered number of alert groups
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-05-11 16:15:46 +02:00
Marco Pracucci 1ad22c808f
Added unit test
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-05-11 15:48:02 +02:00
Marco Pracucci 72ef6e04e1
Fix race condition causing 1st alert to not be immediately delivered when group_wait is 0s
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-05-11 15:15:53 +02:00
maxbrodin 1f3796c5cc
Lift moratorium on AlertManager receivers with long-term maintenance plan (#2561)
* Lift moratorium on AlertManager notifiers

Signed-off-by: Max Brodin <mbrodin@amazon.com>
2021-05-04 16:59:03 +02:00
Levi Harrison f4b176fa5e
Add OAuth 2.0 Config (#2560)
* Upgraded common to v0.23.0

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Added oauth2 to configuration doc

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Fix go.sum

Signed-off-by: Levi Harrison <git@leviharrison.dev>
2021-04-29 13:31:54 +02:00
Björn Rabenstein 9a2df8024f
Merge pull request #2557 from QuentinBisson/fix-flapping-acceptance-test
Fix flapping acceptance test
2021-04-29 12:41:04 +02:00
QuentinBisson 9c4ebab07f
Add missing EOL
Signed-off-by: QuentinBisson <quentin@giantswarm.io>
2021-04-29 10:44:16 +02:00
QuentinBisson 4aea4560ce
Fix flapping acceptance test
Signed-off-by: QuentinBisson <quentin@giantswarm.io>
2021-04-28 15:04:37 +02:00
Björn Rabenstein 88f32c5926
Merge pull request #2558 from grafana/bugfix/unlock-mutex
Dispatch: Make sure mutex gets unlocked on call to Stop
2021-04-27 22:40:36 +02:00
Arve Knudsen 87b1cc6637 Unlock at specific points instead of deferring
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-04-27 10:44:18 +02:00
Arve Knudsen bd543f1345 Dispatch: Make sure mutex gets unlocked on call to Stop
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-04-27 09:25:16 +02:00
Andrey Kuzmin 194f1cfd7c
Integrate elm-review in CI (#2555)
* Run elm-review from CI

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Use the jfmengels/elm-review-simplify rule

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Make assets

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
2021-04-27 07:14:00 +02:00
Ben Kochie 87915dc652
Merge pull request #2551 from prometheus/superq/bump_stuff
Update build
2021-04-22 23:39:42 +02:00
SuperQ 99f64e944b
Update build
* Drop /vendor.
* Update Go to 1.16.
* Update djfarrelly/maildev to 1.1.0.
* Update protoc to 3.15.8.
* Update mixin test for Go 1.16.
* Bump Go modules.

Signed-off-by: SuperQ <superq@gmail.com>
2021-04-22 13:11:44 +02:00
Goutham Veeramachaneni 8176f78a70
Merge pull request #2543 from gotjosh/concurrent-access
Clustering: Fix unsynchronised access
2021-04-22 12:17:24 +02:00
Julien Pivotto cb8a467cfc
Merge pull request #2547 from pracucci/allow-to-customize-http-client-in-receiver-integrations
Add HTTP client options to receiver integrations
2021-04-22 11:38:09 +02:00
Marco Pracucci 04d683e880
Upgrade prometheus/common
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-04-21 12:01:34 +02:00
Marco Pracucci 37f4742922
Add HTTP client options to receiver integrations
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-04-21 11:56:20 +02:00
Björn Rabenstein 699439b021
Merge pull request #2481 from aSquare14/docs-1
docs for negative matchers for route, inhibition
2021-04-20 00:28:08 +02:00
Björn Rabenstein fc8271eb9c
Merge pull request #2548 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-04-20 00:14:22 +02:00
aSquare14 fc42013dad fixup examples
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
2021-04-18 22:18:51 +05:30
prombot 1f8aea7cee Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-04-17 00:01:26 +00:00
Björn Rabenstein 22ac6dff21
Merge pull request #2534 from julienduchesne/add-slack-url-file
Add support to set the Slack URL in a file
2021-04-13 17:12:36 +02:00
Julien Duchesne f33427c96e Updated docs. Fixed YAML newlines
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
2021-04-13 10:59:15 -04:00
gotjosh 473cf4e8f7
Remove whitespace
Signed-off-by: gotjosh <josue@grafana.com>
2021-04-13 14:07:44 +01:00
gotjosh d0406d6295
Clustering: Fix unsynchronised access
Signed-off-by: gotjosh <josue@grafana.com>
2021-04-13 14:03:43 +01:00
aSquare14 b103eff7d5 add yaml
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
2021-04-11 17:09:57 +05:30
aSquare14 74445fcb39 Add examples
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
2021-04-11 14:13:32 +05:30
Andrey Kuzmin 54431be888
UI cleanup dead code with elm-review (#2528)
* Add elm-review

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* elm-review --fix-all

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Update vfsdata

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
2021-04-08 21:04:09 +02:00
Julien Pivotto d4169dcd63
Merge pull request #2531 from roidelapluie/maintainer-aku
Add Andrey as maintainer
2021-04-03 17:57:19 +02:00
Julien Pivotto eae02bdb03 Add Andrey as maintainer
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-04-03 17:56:12 +02:00
Julien Duchesne 59c7fd5053 Add support to set the Slack URL in a file
- Added support for the file in both the global and the lower level
- Tried to follow configuration patterns I saw in prometheus
- The slack file is read on every request as mentioned in the prometheus issue to enable seamless switches

https://github.com/prometheus/alertmanager/issues/2498
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
2021-04-01 21:59:49 -04:00
gotjosh bc7b16d61a
API: Make conversion functions public (#2530)
* API: Make conversion functions public

All types are public so it makes sense to make these functions also
public for ease of downstream consumption.

Signed-off-by: gotjosh <josue@grafana.com>

* Add the license header to the new file

Signed-off-by: gotjosh <josue@grafana.com>

* Fix tests

Signed-off-by: gotjosh <josue@grafana.com>

* Make two more helper functions public

Signed-off-by: gotjosh <josue@grafana.com>
2021-03-31 13:28:06 +05:30
Ganesh Vernekar 10757eb5fb
Export newMetrics function and metrics struct (#2523)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-03-24 12:37:58 +05:30
Julien Pivotto 72deec44a8
Merge pull request #2521 from roidelapluie/enable-new-build
Enable new build
2021-03-21 16:47:06 +01:00
Julien Pivotto f4a5ca74a9 Enable parallel circleci build
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-21 15:21:23 +01:00
prombot 7652f32104 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-20 00:01:20 +00:00
aSquare14 f194f15481 Update the docs
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
2021-03-18 08:46:55 +05:30
Björn Rabenstein 319c8a918e
Merge pull request #2511 from codesome/upgrad-uuid
Replace satori/go.uuid with gofrs/uuid
2021-03-16 22:55:44 +01:00
Goutham Veeramachaneni b0975cb528
Merge pull request #2516 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-16 22:27:39 +01:00
Ben Kochie 53535551f5
Fix up golangci-lint errors.
Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-16 10:43:45 +01:00
prombot 8be6fd79d9
Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-16 09:08:28 +01:00
Ganesh Vernekar bf9c43b57d
Merge remote-tracking branch 'upstream/master' into upgrad-uuid
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2021-03-15 19:41:18 +05:30