Fabian Reinartz
7ddcc42efa
Fix lock
2015-12-04 14:55:42 +01:00
Fabian Reinartz
78ac6859a1
Merge pull request #176 from prometheus/silinh
...
Set previous inhibition/silence state
2015-12-04 10:59:11 +01:00
Fabian Reinartz
4ada2398f2
Set previous inhibition/silence state
2015-12-04 10:58:56 +01:00
Brian Brazil
6fbf84596b
Merge pull request #174 from prometheus/secret
...
Hide secret configuration data
2015-12-03 11:50:45 +00:00
Fabian Reinartz
7581d974ff
Hide secret configuration data
2015-12-03 12:46:28 +01:00
Brian Brazil
62fda13894
Merge pull request #170 from jimmidyson/dev
...
Remove default.tmpl from Docker image
2015-12-02 11:43:15 +00:00
Jimmi Dyson
3c276ea447
Remove default.tmpl from Docker image
2015-12-02 11:25:17 +00:00
Fabian Reinartz
eebde79c66
Merge pull request #168 from prometheus/stattmpl
...
Statically compile default templates
2015-12-01 18:55:39 +01:00
Fabian Reinartz
1629e9d166
Statically compile default templates
2015-12-01 18:39:57 +01:00
Fabian Reinartz
fee23ae610
Merge pull request #167 from prometheus/notifierrrrs
...
Fix typo in filename
2015-11-30 19:45:15 +01:00
Brian Brazil
24b2da9482
Fix typo in filename
2015-11-30 18:37:47 +00:00
Fabian Reinartz
0736616208
Merge pull request #166 from prometheus/slack
...
Transfer template functions into types+methods
2015-11-30 18:44:37 +01:00
Fabian Reinartz
6dc397de5c
Transfer template functions into types+methods
2015-11-30 18:40:22 +01:00
Fabian Reinartz
7465e4abe5
Merge pull request #165 from prometheus/slack
...
Improve Slack integration
2015-11-30 14:01:10 +01:00
Fabian Reinartz
18e9e728f8
Improve Slack integration
2015-11-30 13:52:41 +01:00
Fabian Reinartz
42b73a6291
Add missing template data argument
2015-11-30 11:21:08 +01:00
Fabian Reinartz
cec04341f7
Add resolved test
2015-11-30 11:20:28 +01:00
Fabian Reinartz
a1ffffd7e0
Merge pull request #162 from prometheus/title
...
Use title rather than toTitle.
2015-11-28 12:26:16 +01:00
Brian Brazil
71a1c76e52
Use title rather than toTitle.
...
It turns out that 'title case' is a thing in unicode,
in the same way upper/lower case is.
What our users will want is the first character of a word
being titlecased, which `title` will do.
2015-11-28 11:08:24 +00:00
Fabian Reinartz
03a270910d
Merge pull request #161 from prometheus/tmpl
...
Improve PagerDuty templating
2015-11-27 18:29:53 +01:00
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
