Commit Graph

194 Commits

Author SHA1 Message Date
Fabian Reinartz b4755b0046 remove old AggrConfig 2015-07-04 14:40:32 +02:00
Fabian Reinartz 330bb05f9f store creation and resolve times in alert 2015-07-04 14:05:04 +02:00
Fabian Reinartz 3314ffe833 return GetAll alerts sorted by time 2015-07-04 13:02:49 +02:00
Fabian Reinartz 4aa5dcccf3 fix aggregation group handling and state 2015-07-04 12:52:53 +02:00
Fabian Reinartz dba2b85318 add group interval to route options 2015-07-04 12:51:47 +02:00
Fabian Reinartz 41c9dcc383 improve dispatcher code and fix concurrency 2015-07-02 20:48:21 +02:00
Fabian Reinartz 2bb6233dd8 add initial dispatcher and config storage 2015-07-02 18:38:05 +02:00
Fabian Reinartz 238981366e add memory alert state and alert API endpoints 2015-07-01 18:36:37 +02:00
Fabian Reinartz fa751b4b5e fix continue route bug, add tests 2015-07-01 18:24:08 +02:00
Fabian Reinartz bbe679b432 initial alert routing tree 2015-07-01 17:56:53 +02:00
Fabian Reinartz 59b28fedda ignore YAML files 2015-07-01 17:56:38 +02:00
Fabian Reinartz d4c90e9e28 Add silence API and memory storage 2015-07-01 13:17:08 +02:00
Fabian Reinartz e730242749 initial commit with basic files and types 2015-06-30 14:29:30 +02:00
Fabian Reinartz 4c58dc90e6 wipe everything 2015-06-30 12:34:45 +02:00
Fabian Reinartz 6b487252a0 Merge pull request #86 from prometheus/fabxc/clnp
Use common/model and common/route
2015-06-30 12:12:11 +02:00
Fabian Reinartz a266cb5afb switch to common/route wrapper 2015-06-30 12:10:13 +02:00
Fabian Reinartz 47967ba6e9 switch to common/model types 2015-06-30 08:43:38 +02:00
Fabian Reinartz b8b6905447 Merge pull request #85 from prometheus/fabxc/ymlcfg
switch to YAML config
2015-06-29 18:55:15 +02:00
Fabian Reinartz 2e1a01b2fa switch to YAML config. 2015-06-29 18:53:47 +02:00
Fabian Reinartz cb9c85ea5a config: add new YMAL config 2015-06-29 17:25:47 +02: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