Fabian Reinartz
3fba247d7c
Run make assets for template changes
2016-02-16 12:28:16 +01:00
Brian Brazil
2e93eaa653
Merge pull request #253 from alexissavin/master
...
Adding support for slack icon_emoji in slack receiver config.
2016-02-16 11:18:30 +00:00
Alexis Savin
b364ca535e
Adding support for slack icon_emoji in slack config.
...
```
slack_configs:
- send_resolved: true
username: 'Prometheus'
channel: '#monitoring'
icon_emoji: ':prometheus:'
api_url: 'https://hooks.slack.com/services/ <token>'
```
2016-02-16 11:54:30 +01:00
Brian Brazil
260eabfc23
Merge pull request #252 from prometheus/fabxc/vet
...
Fix vetting errors
2016-02-15 11:03:27 +00:00
Fabian Reinartz
6e82fdd419
Fix vetting errors
2016-02-15 11:57:16 +01:00
Brian Brazil
8a9fd42ca3
Fix typo in comment
2016-02-14 14:40:48 +00:00
Fabian Reinartz
3620d996cf
Serialize all database accesses
2016-02-13 09:21:46 +01:00
Fabian Reinartz
27603290b2
Merge pull request #249 from prometheus/webhook
...
Upgrade webhook protocol
2016-02-12 15:18:41 +01:00
Fabian Reinartz
04f60c5a50
Deal with changed webhook format in tests
2016-02-12 11:00:51 +01:00
Fabian Reinartz
24b8c22a83
Expose alert interval in template data
2016-02-12 11:00:33 +01:00
Fabian Reinartz
0594d170f6
Upgrade webhook protocol
2016-02-12 10:34:00 +01:00
Brian Brazil
0719b8940e
Merge pull request #247 from prometheus/genui
...
Add generatorURL to UI
2016-02-09 13:54:56 +00:00
Fabian Reinartz
77245b9452
Fix typo
2016-02-09 14:53:59 +01:00
Fabian Reinartz
9d8d386758
Add generatorURL to UI
2016-02-09 14:46:18 +01:00
Brian Brazil
35b1e4dbd7
Merge pull request #248 from prometheus/groupkey
...
Add groupKey to webhook data
2016-02-09 13:41:02 +00:00
Fabian Reinartz
c1df1a1984
Add groupKey to webhook data
2016-02-09 14:37:44 +01:00
Brian Brazil
c676102c45
Merge pull request #244 from dmclain/slack_text_fix
...
Slack: Use the text template processor for the text field
2016-02-08 22:10:58 +00:00
Dave McLain
f26bfc30dc
Slack: Use the text template processor for the text field to enable linked URLs
...
Fixes #207
2016-02-08 21:17:44 +00:00
Brian Brazil
e1530ba985
Merge pull request #242 from prometheus/zeroval
...
Use missingkey=zero option in templates
2016-02-05 14:53:33 +00:00
Fabian Reinartz
897b3a0366
Use missingkey=zero option in templates
2016-02-05 15:41:15 +01:00
Fabian Reinartz
fee2372477
Bump Dockerfile Go version
2016-02-05 11:54:47 +01:00
Fabian Reinartz
170906482d
Merge pull request #240 from prometheus/slackfix
...
Allow markdown in Slack 'text' field
2016-02-05 08:14:14 +01:00
Fabian Reinartz
4f8d6f5f2a
Allow markdown in Slack 'text' field
2016-02-04 11:42:55 +01:00
Fabian Reinartz
1a68209fd1
Fix example config
2016-02-03 17:20:41 +01:00
Fabian Reinartz
2915cedd51
Add 0.1.0beta2 changelog
2016-02-03 17:01:00 +01:00
Fabian Reinartz
a300727270
Bump beta version
2016-02-03 17:00:46 +01:00
Fabian Reinartz
3abc300eb4
Merge pull request #239 from prometheus/disappearfix
...
Fix disappearing alerts
2016-02-03 16:52:46 +01:00
Fabian Reinartz
1f9785d248
Fix assigned reosolve timeout
2016-02-03 14:12:10 +01:00
Fabian Reinartz
438e22f246
Add merge alert test
2016-02-03 14:11:59 +01:00
Brian Brazil
db54de261b
Merge pull request #238 from lukaf/master
...
OpsGenie: include missing source option
2016-02-02 16:40:56 +00:00
Luka Furlan
8ba1d9569f
OpsGenie: include missing source option
2016-02-02 16:03:29 +00:00
Fabian Reinartz
8b216995b3
Merge pull request #237 from cherti/patch-1
...
fix build command
2016-02-02 13:54:37 +01:00
cherti
8514db159f
fix build command
...
`make` alone doesn't work to build alertmanager, throws a pile of errors instead here. `make build` works perfectly fine, though.
2016-02-02 10:27:20 +01:00
Fabian Reinartz
c61c017361
Merge pull request #233 from prometheus/fish/fix-listen-error-handling
...
Fish/fix listen error handling
2016-01-28 14:04:52 +01:00
Fabian Reinartz
edcc8aea78
Remove continue clauses from example config
...
The continue examples were not aligned with the current semantics and
are mostly important for advanced use cases. Those are not in the scope
of this basic example.
2016-01-28 14:03:36 +01:00
Fabian Reinartz
983e5db56c
Update example configuration
2016-01-28 14:02:15 +01:00
Johannes 'fish' Ziemke
dedff6a027
Check return code of ListenAndServe()
2016-01-28 13:44:40 +01:00
Johannes 'fish' Ziemke
e5925db736
Fix indent
2016-01-28 13:44:21 +01:00
Fabian Reinartz
b276807c31
Merge pull request #232 from prometheus/discordianfish-patch-1
...
Fix typo in README
2016-01-28 13:30:21 +01:00
Johannes 'fish' Ziemke
83b9913dae
Fix typo in README
2016-01-28 13:25:09 +01:00
Fabian Reinartz
789471fbbe
Merge pull request #230 from prometheus/cfgvalid
...
Add routing validation
2016-01-27 15:11:57 +01:00
Fabian Reinartz
11fa642998
Add routing validation
...
The root route in the configuration must not exclude any alerts,
i.e. not have any matchers.
All receivers referenced in the routing tree are validated to exist.
2016-01-27 14:27:19 +01:00
Fabian Reinartz
2aa20f31eb
Merge pull request #229 from prometheus/vendor
...
Update common/* package vendoring
2016-01-26 11:47:01 +01:00
Fabian Reinartz
943faa704f
Update common/* package vendoring
2016-01-26 11:37:43 +01:00
Fabian Reinartz
5d96e6cb6d
Remove fixed TODO item
2016-01-21 14:19:39 +01:00
Fabian Reinartz
44388e07a9
Merge pull request #228 from prometheus/vendorup
...
Update common/log vendoring
2016-01-20 12:53:01 +01:00
Fabian Reinartz
7ca744f62a
Update common/log vendoring
...
Fixes #227
2016-01-20 12:47:51 +01:00
Fabian Reinartz
fc846989a3
Merge pull request #221 from prometheus/instrument
...
Add instrumentation about notifications
2016-01-11 11:14:31 +01:00
Fabian Reinartz
047e7e9c80
Add instrumentation about notifications
2016-01-11 11:04:29 +01:00
Fabian Reinartz
46c5f9c7d3
Merge pull request #220 from prometheus/metric-name
...
Make metric names consistent.
2016-01-09 14:14:25 +01:00
