Steve Durrheimer
e1ba2ae262
Missing external dependency in vendors
2016-05-15 11:30:00 +02:00
Steve Durrheimer
06ff653631
Merge pull request #342 from sdurrheimer/fix-circleci-flanky-go-get
...
Fix CircleCI problems during go get promu
2016-05-15 10:55:25 +02:00
Brian Brazil
084ebbcef5
Merge pull request #349 from sdurrheimer/update-shields
...
Update README image shields
2016-05-13 20:56:22 +01:00
Steve Durrheimer
a1ce2e3383
Update README image shields
2016-05-13 21:48:57 +02:00
Steve Durrheimer
1e61c977f8
Fix CircleCI problems during go get promu
2016-05-05 13:13:24 +02:00
Fabian Reinartz
22b4d74f7e
ci: use go1.6.2 test image
2016-05-04 14:58:57 +02:00
Fabian Reinartz
38be95b0a7
Merge pull request #337 from prometheus/fabxc-prov-boltmem
...
Bolt intermediate storage
2016-05-03 18:36:41 +02:00
Fabian Reinartz
639a4e9dc4
provider/boltmem: add license headers
2016-05-03 18:36:25 +02:00
Fabian Reinartz
0cd725ef3a
provider/boltmem: fix naming, add doc comments
2016-05-03 12:46:34 +02:00
Fabian Reinartz
3980a6904e
provider/boltmem: properly compare timestamps
...
Depending on the environment the timestamp internal fields
are different to handle timezones.
Thus a reflect.DeepEqual comparison falsely evaluates to
false.
This commit manually compares timestamps via the time.Time.Equal
method to circumvent the issue.
2016-05-03 12:46:34 +02:00
Fabian Reinartz
d8efdde515
main: Use bolt based storage
2016-05-03 12:46:34 +02:00
Fabian Reinartz
cc5aab6cff
provider/boltmem: add alert subscription.
...
This commit implements the Subscribe() and GetPending()
methods for the bolt based alert provider.
2016-05-03 12:46:34 +02:00
Fabian Reinartz
0e954e10cf
provider/boltmem: Add Put/Get for BoltDB provider
2016-05-03 12:46:34 +02:00
Fabian Reinartz
667c92dc19
vendor: add godebug/pretty
2016-05-03 12:39:22 +02:00
Fabian Reinartz
11e90bbd88
vendor: add BoltDB
2016-05-03 12:39:22 +02:00
Fabian Reinartz
a66ea61041
provider/boltmem: Implement Silences.Mutes()
...
This commits implements the Mutes() method for the boltmem silence
provider.
2016-05-03 12:39:22 +02:00
Fabian Reinartz
f0cbdbec51
provider/boltmem: Implement Silences.All()
...
This commits adds the All() method to the Silence provider.
2016-05-03 12:39:21 +02:00
Fabian Reinartz
f833fe5073
provider/boltmem: Implement silence deletion
2016-05-03 12:39:21 +02:00
Fabian Reinartz
9e4dfb32ca
provider/boltmem: Implement set/del silences.
...
This commit implements creation and setting of silences.
They are stored as JSON objects in BoltDB and addressed by a unique
ID assigned on initial creation.
2016-05-03 12:39:21 +02:00
Fabian Reinartz
0019d4f858
provider/boltmem: Implement Notify, add dummies
...
This commit creates dummy implementations of the provider interfaces
for the boltmem provider.
It implements the NotifyInfo provider in BoltDB.
2016-05-03 12:39:21 +02:00
Fabian Reinartz
ff182863b3
*: bump default Go version to 1.6.2
2016-05-03 12:39:21 +02:00
Fabian Reinartz
e18c912307
Merge branch 'master' of github.com:prometheus/alertmanager
2016-05-02 14:51:48 +02:00
Fabian Reinartz
83724b6e69
ci: fix inconsistent indentation
2016-05-02 14:51:26 +02:00
Fabian Reinartz
514595c198
Merge pull request #338 from prometheus/fabxc-goversion
...
*: bump default Go version to 1.6.2
2016-05-02 14:49:02 +02:00
Fabian Reinartz
2fed70f749
*: bump default Go version to 1.6.2
2016-05-02 12:15:05 +02:00
Fabian Reinartz
6493dd5cfd
Merge pull request #319 from mpchadwick/filter-silenced
...
Add a filter to hide silenced alerts
2016-04-28 08:25:29 +01:00
Max Chadwick
c3198633d7
Filter silenced alerts
2016-04-27 22:53:44 -04:00
Fabian Reinartz
4ed3b79640
Merge pull request #326 from teemow/master
...
Add resolved alerts to pushover template
2016-04-27 12:03:33 +01:00
Timo Derstappen
68232da066
Add resolved alerts to pushover template
...
The pushover notification of resolved alerts can end up in an empty
message (only a newline). I've fixed the check for an empty message with
trimming the whitespace. But I also thought that adding the resolved
alerts to the message would be helpful.
2016-04-27 10:55:06 +02:00
Fabian Reinartz
318db91b8b
Merge pull request #320 from prometheus/fabxc-quay
...
ci: push images to Quay
2016-04-24 13:35:47 +02:00
Fabian Reinartz
c3eb8a8e49
ci: push images to Quay
2016-04-24 13:20:39 +02:00
Fabian Reinartz
ac294e6449
Merge pull request #223 from sdurrheimer/master
...
New release process using docker, circleci and a centralized building tool
2016-04-24 10:03:17 +02:00
Fabian Reinartz
3c85d535cc
Merge pull request #297 from prometheus/goversion-buildinfo
...
Include goversion in build_info metric
2016-04-23 15:18:17 +02:00
Steve Durrheimer
9d4dccae7c
New release process using docker, circleci and a centralized
...
building tool
2016-04-22 21:46:53 +02:00
Brian Brazil
3d22b5fb5f
Merge pull request #316 from mpchadwick/typo-fix
...
Fix a typo in simple.yml
2016-04-21 08:03:31 +01:00
Max Chadwick
5801581883
Fix a typo in simple.yml
2016-04-20 22:10:28 -04:00
Julius Volz
6ba0045b4c
Merge pull request #315 from prometheus/add-safehtml
...
Add safeHtml template function.
2016-04-20 16:39:52 +02:00
Julius Volz
ecd856a401
Add safeHtml template function.
...
Fixes https://github.com/prometheus/alertmanager/issues/314
2016-04-20 16:17:30 +02:00
Fabian Reinartz
7a14971042
Merge pull request #294 from ben51/master
...
Change fallback fonts to something readable
2016-04-18 11:42:52 +02:00
Fabian Reinartz
b52e71e5cd
Merge pull request #308 from mpchadwick/smtp-auth
...
Move SMTP auth to the config file
2016-04-16 23:52:44 +02:00
Max Chadwick
4cb3874ab8
Move SMTP auth to the config file
2016-04-16 16:41:55 -04:00
Brian Brazil
eb9f5f2cf5
Merge pull request #310 from joker234/alertmanager-patch
...
Fixing Pushover issue with message length
2016-04-16 12:59:20 +01:00
Johannes Visintini
f38a16c848
Fixing Pushover issue with message length
...
thanks to Merovius
2016-04-16 13:00:46 +02:00
Brian Brazil
9136cf8f00
Merge pull request #303 from prometheus/fabxc/secret
...
Hide PushOver auth information
2016-04-12 09:21:40 +01:00
Fabian Reinartz
f33c1bedb4
Hide PushOver auth information
2016-04-12 10:14:22 +02:00
Tobias Schmidt
0f166e81ae
Merge pull request #301 from mpchadwick/listening-port
...
Provide feedback in console about port
2016-04-12 02:13:23 -04:00
Max Chadwick
3e6180cb74
Provide feedback in console about port
2016-04-11 21:10:06 -04:00
stuart nelson
84acd309a6
Add routing-tree visualization ( #302 )
2016-04-11 16:39:57 +02:00
Brian Brazil
bd3d745f90
Merge pull request #300 from mpchadwick/docs/smtp-auth
...
Clarify SMTP authentication in the docs
2016-04-11 08:29:07 +01:00
Max Chadwick
eaff66916c
Clarify SMTP authentication in the docs
2016-04-10 21:25:06 -04:00
