RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 08:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
734 Commits 66 Branches 77 Tags 218 MiB
43fcbe0695
Commit Graph

734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brian Brazil
04fbfb9a65 Merge pull request #271 from prometheus/log-opsgenie-error-response 
Add debug log for unexpected opsgenie responses
 2016-03-09 08:58:23 +00:00
Tobias Schmidt
bdb2cd450f Add debug log for unexpected opsgenie responses 2016-03-08 20:04:20 -05:00
Fabian Reinartz
8ad6ebc696 Merge pull request #264 from prometheus/vendorupdate 
Update go-sqlite3 vendoring
 2016-03-04 10:04:52 +01:00
Fabian Reinartz
1748a0e304 Merge pull request #258 from stapelberg/pushover 
Re-implement pushover notifications
 2016-03-04 10:02:53 +01:00
Fabian Reinartz
feff6f074a Update go-sqlite3 vendoring 2016-03-03 20:07:19 +01:00
Brian Brazil
17068fc838 Merge pull request #263 from prometheus/title-email 
Make the first letter title case, not all of them.
 2016-03-03 14:26:19 +00:00
Brian Brazil
dff7953baa Make the first letter title case, not all of them. 2016-03-03 14:06:11 +00:00
Fabian Reinartz
439b116e7b Merge pull request #262 from prometheus/reloadinstr 
Add reload config instrumentation
 2016-03-03 14:55:16 +01:00
Fabian Reinartz
a0e4df20ef Add reload config instrumentation 2016-03-03 14:20:21 +01:00
Michael Stapelberg
4c0aa00bcf Re-implement pushover notifications 
This feature was dropped during the rewrite, but I use and like
Pushover.

fixes #107
 2016-03-03 09:07:33 +01:00
Fabian Reinartz
1494104e56 Remove development status from release version 2016-03-01 11:14:01 +01:00
Fabian Reinartz
078d5d17e6 Remove 'pending issues' from released version. 2016-03-01 11:12:51 +01:00
Tobias Schmidt
a31e60bf12 Merge pull request #251 from prometheus/typo 
Fix typo in comment
 2016-02-23 14:03:19 -05:00
Fabian Reinartz
94d868d2de Add proper short description and link to docs 2016-02-23 17:12:19 +01:00
Fabian Reinartz
b9c3f887b5 Fix changelog dates 2016-02-23 15:41:18 +01:00
Fabian Reinartz
86148a3c1d Bump version to 0.1.0 2016-02-23 15:17:31 +01:00
Fabian Reinartz
af5915f694 Add 0.1.0 changelog 2016-02-23 15:17:14 +01:00
Fabian Reinartz
6089131a14 Merge pull request #241 from prometheus/gobump 
Bump Dockerfile Go version
 2016-02-17 16:58:38 +01:00
Fabian Reinartz
05f2ec003b Merge pull request #255 from prometheus/assets 
Include generatorURL in PD and emails
 2016-02-16 16:56:04 +01:00
Fabian Reinartz
124d637de0 Include generatorURL in PD and emails 2016-02-16 16:42:22 +01:00
Fabian Reinartz
dafba78cea Merge pull request #254 from prometheus/assets 
Run `make assets` for template changes
 2016-02-16 12:35:48 +01:00
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