RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
768 Commits 67 Branches 77 Tags 210 MiB
Commit Graph

768 Commits

Author SHA1 Message Date
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
Tobias Schmidt 18023f8c1c Merge remote-tracking branch 'origin/release-0.1' 2016-04-08 16:31:01 -04:00
Julius Volz 8a814a59f8 Remove GoVersion from build.sh 2016-04-08 14:43:44 +02:00
Julius Volz 6ea6f8eba9 Include goversion in build_info metric 2016-04-08 14:28:42 +02:00
Julius Volz 3292c278fe Merge pull request #296 from prometheus/use-runtime-version 
Use runtime.Version() instead of injected version
 2016-04-08 14:28:15 +02:00
Julius Volz 839fd799a1 Use runtime.Version() instead of injected version 2016-04-08 14:21:47 +02:00
Benjamin Villain c94c1ed464 Change fallback fonts to something readable 
Change-Id: I5f5ce8c7113b2188083ef0ec9ef2bcc4d74f5500
 2016-04-07 14:14:38 +02:00
Julius Volz 93070012f9 Merge pull request #266 from stapelberg/starttls 
Re-do #163: smtp: STARTTLS before querying auth mechanisms
 2016-04-01 22:19:48 +02:00
Michael Stapelberg 5158926bc3 Re-do #163: smtp: STARTTLS before querying auth mechanisms 
This was not ported over with the rewrite.
 2016-04-01 16:50:12 +02:00
Brian Brazil 43fcbe0695 Merge pull request #288 from zwopiR/fix_opsgenie_teams_n_tags 
fix for Issue 287 (https://github.com/prometheus/alertmanager/issues/…
 2016-04-01 10:09:20 +01:00
Christoph Oelmueller 04b61f6d9a fix template error if no template string is defined 2016-04-01 10:23:34 +02:00
Julius Volz d7c0b7f488 Merge pull request #289 from prometheus/ext-url 
Re-add full -web.external-url functionality
 2016-04-01 01:46:38 +02:00
Fabian Reinartz 481bf96e74 Merge pull request #277 from amorken/notification-fixups 
Notifications: Improve OpsGenie error handling, and minor fixes
 2016-04-01 00:29:00 +02:00
Anders Daljord Morken 74c49588cf Handle OpsGenie's response to closing an already closed alert 
OpsGenie returns HTTP 400 to alert close requests if the alert has
already been closed. There is no need to try again if this happens.

When an error is returned from a notifiation service, an error is
logged, and the logged error is more meaningful if it includes a hint
about which notification service that caused a problem.

Defer the resp.body.Close() call in the OpsGenie Notify()
implementation.
 2016-03-31 23:47:17 +02:00
Julius Volz 20739cc6ad Re-add full -web.external-url functionality 
Fixes https://github.com/prometheus/alertmanager/issues/212
 2016-03-30 23:04:19 +02:00
Julius Volz 5d2277a6a3 Merge pull request #286 from prometheus/clarify-deps 
Clarify build- vs. run-time dependencies in README.md
 2016-03-30 16:38:16 +02:00
Julius Volz a540be82a2 Clarify build- vs. run-time dependencies in README.md 
See https://github.com/prometheus/alertmanager/issues/285
 2016-03-30 16:05:42 +02:00
Fabian Reinartz 22b37c831a Update Fabian's email address 2016-03-24 17:02:42 +01:00
Brian Brazil 1ca831b1d1 Merge pull request #278 from improbable-io/opsgenie-add-tags-teams 
OpsGenie notifier: Add support for tags, teams, and using labels as tags.
 2016-03-16 10:23:49 +00:00
Seb Dijols 7d512eba56 Add support for Teams and Tags to OpsGenie notifier 
Add Teams and Tags templated strings to OpsGenieConfig. Output must be comma-separated values.
 2016-03-16 09:54:21 +00:00
Fabian Reinartz 0e541bf0be Bump version to 0.1.1 2016-03-15 21:54:55 +01:00
Fabian Reinartz 387f23a96f Merge branch 'master' of github.com:prometheus/alertmanager 2016-03-15 21:50:37 +01:00
Fabian Reinartz a024033c89 Merge branch 'release-0.1' 2016-03-15 21:50:23 +01:00
Fabian Reinartz d2c0cd6832 Revert back to one DB file 2016-03-15 20:47:54 +01:00
Fabian Reinartz d0e35c109e Separate alert and silence DB. 
This commit separates out the silences and alert/notify databases.
Additional alert FP index was added and a locking of the
silences DB access added.
 2016-03-15 20:39:00 +01:00
Fabian Reinartz 2eb685c45b Enable debug endpoint 2016-03-15 20:07:58 +01:00