Commit Graph

162 Commits

Author SHA1 Message Date
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
Tomas Karasek
bfcded79e8 Added flowdock notifier 2015-05-18 19:07:56 +03:00
Julius Volz
82ced0dc2a Merge pull request #52 from quinox/pathprefix
Path prefix to support reverse proxies
2015-05-12 13:39:49 +02:00
Björn Rabenstein
b9afdd5b98 Merge pull request #59 from prometheus/fabxc/authors
Update AUTHORS
2015-05-11 11:34:07 +02:00
Fabian Reinartz
c8fa9a1073 Update AUTHORS 2015-05-11 09:41:26 +02:00
Fabian Reinartz
70cc051e8e Merge pull request #57 from sdurrheimer/master
Add simple support for Slack notifications
2015-05-10 22:38:25 +02:00
Steve Durrheimer
df0ce42d42 Add simple support for Slack notifications 2015-05-10 22:21:18 +02:00
Julius Volz
6bfb2c3e18 Merge pull request #58 from prometheus/experimental-notice
Use stronger wording for "experimental" notice.
2015-05-10 21:11:20 +02:00
Julius Volz
0fe36a0033 Use stronger wording for "experimental" notice. 2015-05-10 20:47:11 +02:00
Julius Volz
1ef8e9ca57 Merge pull request #56 from prometheus/readd-config-target
Re-add config Makefile target.
2015-05-08 16:18:46 +02:00
Julius Volz
aceb489817 Correct paths in "web" Makefile target. 2015-05-06 11:50:39 +02:00
Julius Volz
ea231ad7b2 Move including of Makefile.COMMON to top of Makefile.
This fixes the Makefile's default target.
2015-05-06 11:44:01 +02:00
Julius Volz
91cd73b00a Re-add config Makefile target.
This was accidentally removed in
https://github.com/prometheus/alertmanager/pull/55
2015-05-06 11:16:20 +02:00
Johannes 'fish' Ziemke
2b6c5caf89 Merge pull request #55 from prometheus/update-makefile
Use Makefile.COMMON
2015-05-05 18:20:13 +02:00
Johannes 'fish' Ziemke
e38bb7c1c3 Use Makefile.COMMON and add generated files.go 2015-05-05 17:11:03 +02:00
Ceesjan Luiten
180f7dcf31 Path prefix to support reverse proxies 2015-04-29 22:10:21 +02:00
Julius Volz
fd2a1e6099 Update hosting location of protobuf package. 2015-04-29 22:05:32 +02:00
Julius Volz
cf2f1191e0 Merge pull request #53 from a86c6f7964/remove-deps-dockerbuild
we do not need the deps around after the executable is created
2015-04-28 01:14:31 +02:00
Julius Volz
b8260fc390 Merge pull request #54 from a86c6f7964/continue-inside-notifier
fix notifier, return means no other notifications will work.
2015-04-28 01:12:13 +02:00
Cameron Davison
fc6a513f7f fix notifier, return means no other notifications will work. instead continue in case other notifications should alert 2015-04-27 16:17:55 -05:00
Julius Volz
0a3a0a811c Merge pull request #51 from prometheus/add-resolved-notifications
Add support to notify for resolved alerts
2015-04-27 13:23:48 +02:00
Johannes 'fish' Ziemke
735e8075d2 Add support to notify for resolved alerts
Change-Id: I31fc51d2a47d92e9d7ac2ba224c7fce02b28444e
2015-04-24 19:29:52 +02:00
Julius Volz
ffff50027a Merge pull request #50 from quinox/hipchat
Visually distinguish alertname and summary
2015-04-21 19:50:53 +02:00
Ceesjan Luiten
c12fa13a06 Visually distinguish alertname and summary 2015-04-21 19:28:05 +02:00
Julius Volz
99636c0e55 Merge pull request #48 from quinox/mailfix
Add date header to please strict mail servers
2015-04-19 23:37:40 +02:00
Tobias Schmidt
507de53eb7 Add travis CI support 2015-04-17 18:28:07 -04:00
Ceesjan Luiten
d36de99079 Add date header to please strict mail servers 2015-04-17 21:56:53 +02:00
Julius Volz
624c9b636c Merge pull request #47 from prometheus/flag-cleanpus
Make notification flag names consistent with Prometheus style.
2015-04-14 14:28:34 +02:00