RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-01 02:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
189 Commits 66 Branches 77 Tags 218 MiB
412d63a6dc
Commit Graph

189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius Volz
412d63a6dc Merge pull request #104 from farcaller/patch-3 
Fixed pushover api call with retry and expire flags
 2015-07-27 11:41:20 +02:00
Vladimir Pouzanov
74cf7b4000 Fixed pushover api call with retry and expire flags 
Fixes #100
 2015-07-25 08:49:24 +01:00
Julius Volz
c60e6fae14 Merge pull request #102 from pdf/gh_95 
Add web.external-url flag
 2015-07-25 01:49:11 +02:00
Peter Fern
ee3dc4804c Add web.external-url flag 
Allows setting the full external URL for accessing Alertmanager, takes
precedence over web.hostname.

Fixes #95
 2015-07-24 15:34:10 +10:00
Julius Volz
80743177b8 Merge pull request #80 from t0mk/html_template 
HTML template for notifications with FlowDock
 2015-07-22 12:58:25 +02:00
Björn Rabenstein
c8da387a1f Merge pull request #96 from miekg/invalid-channel 
Slack notification: add channel
 2015-07-21 11:18:06 +02:00
Miek Gieben
abacb716f5 Slack notification: add channel 
Currently a failure is logged as:
 msg="Sent Slack notification: 17555453829685976206: HTTP 500: Invalid channel specified"

 Add the actual channel in there to aid in debugging.
 2015-07-21 09:57:08 +01:00
Tomas Karasek
b0a879d416 add test for Flowdock notification 2015-07-15 16:24:57 +03:00
Tomas Karasek
355565defc html template defined and plugged to FlowDock notifier 2015-07-15 16:24:41 +03:00
Julius Volz
7859ccb570 Merge pull request #92 from sdurrheimer/master 
New Dockerfile using alpine-golang-make-onbuild base image
 2015-07-12 13:16:48 -06:00
Steve Durrheimer
778bc4fc24 Add Docker instructions to the README 2015-07-11 13:14:02 +02:00
Steve Durrheimer
a7b8977220 New Dockerfile using alpine-golang-make-onbuild base image 2015-07-09 08:56:45 +02:00
Steve Durrheimer
0aa7f442f8 Update Makefile.COMMON from prometheus/utils 2015-07-09 08:56:45 +02:00
Julius Volz
b7919b338b Merge pull request #90 from prometheus/pushover-priority 
Set Pushover notification priority to "emergency".
 2015-07-09 00:10:01 -06:00
Julius Volz
e484620a63 Set Pushover notification priority to "emergency". 
Fixes https://github.com/prometheus/alertmanager/issues/89
 2015-07-08 18:11:47 -06:00
Julius Volz
d91ac2ef11 Merge pull request #84 from prometheus/runbook-amurl 
Add runbook and alertmanager URLs to PD+email notifications.
 2015-06-25 18:53:28 +02:00
Julius Volz
35b3741756 Add runbook and alertmanager URLs to PD+email notifications. 
I don't have a way to test all the other notification mechanisms, which
is something we should fix in general. For now, only PagerDuty and email
have the new runbook and alertmanager URL information.

Not very happy with the overall cleanliness of this, and the codebase
overall, of course, but since we need this urgently tomorrow, I hope
this is fine for now.
 2015-06-25 18:18:08 +02:00
Julius Volz
8d455091fc Merge pull request #78 from wrouesnel/master 
Add a GET api to /api/alerts which pulls JSON formatted AlertAggregates.
 2015-06-16 15:52:04 +02:00
William Rouesnel
34434fefd3 Add a GET api to /api/alerts which pulls JSON formatted AlertAggregates. 2015-06-16 09:05:48 +10:00
Julius Volz
982c968f73 Merge pull request #76 from prometheus/v0.0.3 
Cut bugfix release 0.0.3.
 2015-06-10 17:07:18 +02:00
Julius Volz
53c131c535 Cut bugfix release 0.0.3. 2015-06-10 17:05:02 +02:00
Brian Brazil
de00240d66 Merge pull request #75 from wrouesnel/master 
Fix email template body writer being called with parameters in wrong order
 2015-06-10 10:09:46 +01:00
William Rouesnel
03bc356197 Fix email template body writer being called with parameters in wrong order. 2015-06-10 15:00:09 +10:00
Julius Volz
7988e1112e Merge pull request #73 from prometheus/version-0.0.2 
Cut Alertmanager version 0.0.2.
 2015-06-09 18:57:22 +02:00
Julius Volz
d5aa4039cb Cut Alertmanager version 0.0.2. 2015-06-09 18:53:24 +02:00
Johannes 'fish' Ziemke
5b78ab6c58 Merge pull request #72 from sdurrheimer/master 
Fix silences.json permission error with docker image
 2015-06-03 12:33:33 +02:00
Steve Durrheimer
acb4ab7ab6 Fix silences.json permission error with docker image 2015-06-03 00:16:22 +02:00
Brian Brazil
30dc9f7325 Merge pull request #71 from prometheus/alert-json-case 
Change case of alert json to initial lower letter.
 2015-06-01 14:13:56 +01:00
Brian Brazil
5de8fccdb4 Change case of alert json to initial lower letter. 
Matching change to what's on the prometheus server side.
 2015-05-30 14:37:26 +01:00
Julius Volz
6f0fa88489 Merge pull request #62 from SQiShER/master 
Added support for @mentions in HipChat notifications
 2015-05-28 14:55:28 +02:00
Fabian Reinartz
b66f938840 Merge pull request #70 from prometheus/webhook 
Add a generic webhook notifier.
 2015-05-28 01:04:45 +02:00
Brian Brazil
89b13e1c73 Add a generic webhook notifier. 
This allows for use cases such as kicking off shell scripts,
logging notifications, or anything else the alertmanager doesn't
directly support.
 2015-05-27 23:57:18 +01:00
Fabian Reinartz
41323765d6 Merge pull request #69 from benley/master 
Update fsnotify to its new source location
 2015-05-24 12:25:49 +02:00
Benjamin Staffin
ff4763ea37 Update fsnotify to its new source location 2015-05-23 16:04:34 -07:00
Daniel Bechler
2d7992a59b Added support for @mentions in HipChat notifications 2015-05-24 00:11:13 +02:00
Julius Volz
ba4e53343c Merge pull request #68 from prometheus/migrate-logging 
Migrate logging to use `prometheus/log`.
 2015-05-23 23:22:52 +02:00
Julius Volz
b4648a9e33 Migrate logging to use prometheus/log. 2015-05-23 23:21:44 +02:00
Julius Volz
6f3870a2af Merge pull request #67 from prometheus/improve-redirections 
Improve web redirection and 404 behavior.
 2015-05-23 16:16:37 +02:00
Julius Volz
d0ae5a3f1d Improve web redirection and 404 behavior. 
Previously we redirected any non-existent path to the root (or path
prefix).

The new behavior:

With no path prefix:

- "" -> "/"
- "/biz" -> 404

With path prefix of "/foo/bar":

- "" -> "/foo/bar/"
- "/" -> "/foo/bar/"
- "/foo/bar" -> "/foo/bar/"
- "/biz" -> /foo/bar/biz"
  (anything not starting with the path prefix gets the prefix prepended)
- "/foo/bar/biz" -> 404

This fixes https://github.com/prometheus/alertmanager/issues/66
 2015-05-23 12:45:38 +02:00
Fabian Reinartz
5b0e343ec4 Merge pull request #64 from novilabs/pushover-status-notification 
add status to pushover title
 2015-05-23 09:14:03 +02:00
Julius Volz
6e57acbd8c Merge pull request #65 from novilabs/update-file-blob 
`make web` closes #63
 2015-05-23 01:17:15 +02:00
Cameron Davison
5a77789945 make web closes #63 2015-05-22 15:47:01 -05:00
Fabian Reinartz
8d205b2a27 Merge pull request #61 from brunoqc/patch-1 
Fix a sentence in README
 2015-05-22 16:29:40 +02:00
Bruno Bigras
a864e1703a Fix a sentence in README 2015-05-22 09:04:20 -04:00
Julius Volz
db402c8c8d Merge pull request #60 from t0mk/flowdock 
Flowdock notifications
 2015-05-19 14:55:04 +02:00
Tomas Karasek
5b1c59f0cc rewrote to better fit in exisitng code 2015-05-19 14:31:06 +03:00
Tomas Karasek
9632bf24f8 more readable HTTP response logging 2015-05-19 11:38:28 +03:00
Tomas Karasek
48cdc777ce improve Flowdock PR based on julius' comments 2015-05-19 11:37:22 +03:00
Cameron Davison
ac2e3be7b7 add status to title, and Assume that the summary is the message, and that the alertname is a very short concise name for the alert 2015-05-18 15:53:28 -05:00
Tomas Karasek
ffd54a3ee6 added flowdock block to sample config 2015-05-18 19:17:19 +03:00