RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-16 02:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
683 Commits 66 Branches 78 Tags 225 MiB
77245b9452
Commit Graph

683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Reinartz
77245b9452 Fix typo 2016-02-09 14:53:59 +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
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
Brian Brazil
b820b6d0d2 Make metric names consistent. 2016-01-09 12:49:25 +00:00
Fabian Reinartz
56b070a586 Merge pull request #219 from prometheus/instrument 
Add basic instrumentation
 2016-01-09 13:44:58 +01:00
Fabian Reinartz
b2fb6c8ab0 Instrument received alerts 
This instruments the number of received alerts and makes
handling of invalid alerts more graceful.
 2016-01-09 13:42:02 +01:00
Fabian Reinartz
1eb64b4263 Add web handler instrumentation 2016-01-09 13:32:36 +01:00
Fabian Reinartz
b887885bf6 Update changelog for 0.1.0-beta1 2016-01-09 12:39:59 +01:00
Fabian Reinartz
26cfefd615 Bump beta version 2016-01-08 20:31:59 +01:00
Fabian Reinartz
8451e1ced5 Merge pull request #218 from prometheus/sendall 
Simplify and fix notification grouping.
 2016-01-08 15:31:43 +01:00
Fabian Reinartz
11fae2a719 Simplify and fix notification grouping. 
This commit changes the notification grouping behavior
to simply send all alerts of a group as soon as a single
one of them needs updating.

This fixes a critical bug which caused erroneous resolved
notifications to be sent.
 2016-01-08 15:17:54 +01:00
Brian Brazil
aafb163275 Merge pull request #217 from RichiH/patch-2 
README.md: sudo ALL the yums
 2016-01-08 14:05:30 +00:00
Richard Hartmann
27bbdf333d README.md: sudo ALL the yums 2016-01-08 14:59:32 +01:00
Fabian Reinartz
0318f264e6 Merge pull request #216 from prometheus/fabxc-patch-1 
Remove template section from example config
 2016-01-07 16:39:40 +01:00
Fabian Reinartz
4540c75887 Remove template section from example config 
Since our default templates are now compiled into the binary, this is only
relevant to advanced users and will cause trouble when running a derivative
of the example config within the repository directory.
 2016-01-07 16:19:51 +01:00
Fabian Reinartz
3c15d0fc96 Merge pull request #215 from RichiH/patch-1 
README.md: List dependencies
 2016-01-07 15:30:43 +01:00
Richard Hartmann
fcf17c2ee4 README.md: List dependencies 2016-01-07 15:15:21 +01:00