Fabian Reinartz
00b8a2ad03
Make resolve timeout configurable
2015-11-27 15:41:22 +01:00
Fabian Reinartz
9fbc76a52f
Improve PagerDuty templating
2015-11-27 14:02:34 +01:00
Fabian Reinartz
921c4b8b55
Merge pull request #160 from prometheus/slacktmpl
...
Iterate over templating
2015-11-26 13:37:27 +01:00
Fabian Reinartz
38b6ed118d
Iterate over templating
2015-11-26 12:56:09 +01:00
Fabian Reinartz
3d46aedb9f
Merge pull request #159 from prometheus/recvui
...
Sync alert filtering with URL.
2015-11-25 16:01:35 +01:00
Fabian Reinartz
12585e91c0
Sync alert filtering with URL.
...
This commit keeps the alert filters synchronized with URL search parameters
so they can be shared.
2015-11-25 12:43:40 +01:00
Fabian Reinartz
9807a631e0
Merge pull request #158 from jimmidyson/opsgenie
...
Add OpsGenie notifier
2015-11-25 11:46:36 +01:00
Jimmi Dyson
7c9700e76c
Correct error message for missing OpsGenie API key
2015-11-25 10:38:29 +00:00
Jimmi Dyson
3e7d614eb2
Add opsgenie notifier
2015-11-24 22:29:25 +00:00
Jimmi Dyson
ab2a66c6b7
Add space between labels in default subject
2015-11-24 22:29:07 +00:00
Björn Rabenstein
a4ffa9a64b
Merge pull request #156 from prometheus/beorn7/review-dev
...
PR with changes after code review
2015-11-23 18:27:32 +01:00
beorn7
93ffa534a5
PR with changes after code review
...
Now to be reverse-reveiewed.
2015-11-23 18:24:57 +01:00
Brian Brazil
d090400d3d
Merge pull request #153 from prometheus/subject
...
Improve default subject template
2015-11-23 16:40:45 +00:00
Fabian Reinartz
1951593cc9
Always have alertname in first position
2015-11-23 17:20:02 +01:00
Fabian Reinartz
4a9d4de80c
Improve default subject template
2015-11-23 17:20:02 +01:00
Fabian Reinartz
bdc341b36b
Merge pull request #155 from prometheus/mkf
...
Remove 'assets' from default target
2015-11-23 16:34:18 +01:00
Fabian Reinartz
f974dfa91f
Remove 'assets' from default target
...
There are issues with changing timestamps for unmodified files
in go-bindata+git.
2015-11-23 16:16:07 +01:00
Fabian Reinartz
c7247c2531
Merge pull request #152 from prometheus/race
...
Remove data races
2015-11-21 11:26:48 +01:00
Fabian Reinartz
2d8829d751
Remove data race from alert subscription
2015-11-19 13:49:32 +01:00
Fabian Reinartz
913c17c254
Remove data races from dispatcher state
2015-11-19 13:47:31 +01:00
Fabian Reinartz
769275b235
Merge pull request #150 from prometheus/anchor
...
Anchor config regexes
2015-11-19 12:42:34 +01:00
Fabian Reinartz
7b6b971518
Recompile bindata
2015-11-19 08:53:53 +01:00
Fabian Reinartz
3386cea9df
Anchor config regexes
2015-11-19 08:53:29 +01:00
Fabian Reinartz
a94c0f4e82
Merge pull request #147 from prometheus/new-email
...
First-pass at improving template system.
2015-11-18 17:08:52 +01:00
Brian Brazil
faa88831f4
First-pass at improving template system.
...
- Cut back to bare minimum to make the rest simpler
- Consistency in config naming
- Have one data strucutre that's the same for all templates
- Pass in common labels to templates
- Support templates almost everywhere
- Support multiple SMTP recipients
- Support non-ASCII SMTP headers
- Handle colour logic via templates
- Make $subjects have consistent output, go maps aren't sorted.
- Make tests pass when v6 is disabled
2015-11-18 14:59:05 +00:00
Brian Brazil
4b6e0f4134
Ensure data directory exists
2015-11-18 14:58:36 +00:00
Fabian Reinartz
5770d3ec60
Make silences editable in UI
2015-11-16 21:45:28 +01:00
Fabian Reinartz
c5d77252e6
Improve button visibility in UI
2015-11-16 14:47:03 +01:00
Fabian Reinartz
0c27b08a05
Add example config file
2015-11-12 15:15:12 +01:00
Fabian Reinartz
d80fd26902
Add Dockerfile and target, change flag
2015-11-12 15:03:09 +01:00
Fabian Reinartz
d6611651c4
Fix unused import
2015-11-12 15:02:33 +01:00
Fabian Reinartz
0d8ee0b3ec
Fix golint issues in notify/
2015-11-12 13:18:36 +01:00
Fabian Reinartz
3e685642c7
Fix golint issues in config/
2015-11-12 12:57:20 +01:00
Fabian Reinartz
16bc5356aa
Vendor static assets
2015-11-11 18:03:56 +01:00
Fabian Reinartz
d945c872d8
Style fix, remove debug prints
2015-11-11 17:53:18 +01:00
Fabian Reinartz
c157b78a04
Do not expose groups with 0 alerts
2015-11-11 17:05:22 +01:00
Fabian Reinartz
75c57ffd00
Add version print and flag
2015-11-11 16:50:54 +01:00
Fabian Reinartz
78c6784672
Change Makefile target order
2015-11-11 15:50:19 +01:00
Fabian Reinartz
034ab0da0c
Statically compile assets into binary
2015-11-11 15:34:36 +01:00
Fabian Reinartz
f188f3357d
Format alert filtering section
2015-11-11 13:33:33 +01:00
Fabian Reinartz
f1a6f8892f
Make collapsible detail sections more visible
2015-11-10 14:55:57 +01:00
Fabian Reinartz
ede4b63a91
Implement deterministic alert group order, cleanup
2015-11-10 14:52:04 +01:00
Fabian Reinartz
dc656a44ea
Adjust config fields to 'receiver'
2015-11-10 14:08:20 +01:00
Fabian Reinartz
6a99dfaa90
Merge branch 'dev' of github.com:prometheus/alertmanager into dev
2015-11-10 13:56:40 +01:00
Fabian Reinartz
e4e594d826
Unify receiver naming
2015-11-10 13:47:04 +01:00
Fabian Reinartz
a1c7c49a91
Remove resolved issues
2015-11-10 11:26:42 +01:00
Fabian Reinartz
5fb30e1a0e
Do not include resolved alerts in API response
2015-11-10 11:25:11 +01:00
Fabian Reinartz
91db91ef4a
Separate elapsed and active silences
2015-11-10 11:19:04 +01:00
Fabian Reinartz
3cdc3c5359
Add HTML title
2015-11-09 19:08:40 +01:00
Fabian Reinartz
9e7255a850
Vendor angular-sanitize
2015-11-09 18:30:51 +01:00
