Commit Graph

210 Commits

Author SHA1 Message Date
Julius Volz e406de1746 Cut Alertmanager release 0.0.4 2015-09-09 16:09:34 +02:00
Julius Volz af6f3ff79b Merge pull request #118 from prometheus/linkify-alerts
Linkify alert rows.
2015-09-09 13:13:40 +02:00
Julius Volz 477a6c17ec Linkify alert rows. 2015-09-08 16:44:11 +02:00
Julius Volz 457b842f41 Merge pull request #117 from prometheus/consistent-sorting
Sort alerts consistently in web UI.
2015-09-08 15:59:06 +02:00
Julius Volz 55b390f049 Sort alerts consistently in web UI. 2015-09-08 15:44:04 +02:00
Julius Volz fa41146ce0 Merge pull request #116 from prometheus/ui-rework
Rearrange alert columns and allow expanding more alert details.
2015-09-08 13:07:17 +02:00
Julius Volz ffe603eeb0 Rearrange alert columns and allow expanding more alert details. 2015-09-08 12:39:38 +02:00
Julius Volz 78c8286abb Merge pull request #115 from prometheus/suggest-creator-email
Suggest to use email address as silence creator
2015-09-07 13:33:31 +02:00
Julius Volz 38dd219150 Merge pull request #113 from mrwacky42/master
Fix version info string.
2015-09-07 13:13:25 +02:00
Tobias Schmidt 791c14c76a Suggest to use email address as silence creator
Using email addresses provides a unique identifier with a defined
format. It will reduce the amount of different and ambigious identifiers
used (first, last, full, initials, different case used, etc.) while
still allowing others to use a different format.

I could also imagine making an email address mandatory.
2015-09-05 15:09:07 -04:00
Sharif Nassar 17e4cf0d30 Fix version info string.
Broken by the following commit
e38bb7c Use Makefile.COMMON and add generated files.go
2015-09-04 11:54:40 -07:00
Fabian Reinartz e0b4817d13 Merge pull request #112 from jamiegwatkin/fix_for_aws-sdk-go_breaking_change
Renamed TopicARN to TopicArn
2015-08-17 21:48:07 +02:00
jamiegwatkin a03cd1c638 Renamed TopicARN to TopicArn to match 54390aa361/service/sns/examples_test.go (L518). 2015-08-17 15:37:02 -04:00
Julius Volz 33d6097ce4 Merge pull request #106 from prometheus/add-opsgenie
Add OpsGenie to README.md and reformat the list.
2015-07-30 17:10:13 +02:00
Julius Volz 98f738ebc7 Add OpsGenie to README.md and reformat the list. 2015-07-30 14:23:50 +02:00
Julius Volz da8d659658 Merge pull request #105 from MonsantoCo/master
Add Amazon SNS Notifier
2015-07-29 20:49:25 +02:00
Kyle 51357fd34c Alertmanager: Add Amazon SNS Notification
This adds notifications to Amazon SNS.  It is using Amazon's go sdk. The notification config should look like
    amazon_sns_config {
      topic_arn: "arn:aws:sns:us-east-1:an-arn-id:topic"
      send_resolved: true
    }

The alert summary and status will be used as the SNS subject.
The alert description and status will be used as the SNS message.

SNS notifictions require Amazon AWS credentials to be setup as described by the Amazon go sdk.
2015-07-29 13:40:05 -05:00
Julius Volz 55074bdf19 Merge pull request #97 from miekg/opsgenie
Alertmanager: Add OpsGenie Webhook notification.
2015-07-29 18:23:16 +02:00
Miek Gieben 48ba027cc5 Alertmanager: Add OpsGenie Webhook notification.
This adds notifications to OpsGenie. It is using the webhook api. The
notification_config should look like

  opsgenie_config {
    api_key: "bliep"
    teams: "team-one"
    send_resolved: true
  }

It further sets the alert fingerprint in Alias and adds all the
alert labels into the Details field.

See https://www.opsgenie.com/docs/web-api/alert-api#createAlertRequest
for the details.

It can also close the alert by using the Alias field again. See
https://www.opsgenie.com/docs/web-api/alert-api#closeAlertRequest

And it adds a 'labels_to_tag' that allows you to specify for which
label names you want to create a tag with the value of that label.
This makes routing alerts easier.
2015-07-29 17:17:33 +01:00
Julius Volz 2eb7962ed0 Merge pull request #101 from farcaller/patch-1
Made slack timeout configurable
2015-07-27 12:40:41 +02:00
Vladimir Pouzanov 64e606d8f1 Made slack timeout configurable 2015-07-27 11:23:29 +01:00
Julius Volz 412d63a6dc Merge pull request #104 from farcaller/patch-3
Fixed pushover api call with retry and expire flags
2015-07-27 11:41:20 +02:00
Vladimir Pouzanov 74cf7b4000 Fixed pushover api call with retry and expire flags
Fixes #100
2015-07-25 08:49:24 +01:00
Julius Volz c60e6fae14 Merge pull request #102 from pdf/gh_95
Add web.external-url flag
2015-07-25 01:49:11 +02:00
Peter Fern ee3dc4804c Add web.external-url flag
Allows setting the full external URL for accessing Alertmanager, takes
precedence over web.hostname.

Fixes #95
2015-07-24 15:34:10 +10:00
Julius Volz 80743177b8 Merge pull request #80 from t0mk/html_template
HTML template for notifications with FlowDock
2015-07-22 12:58:25 +02:00
Björn Rabenstein c8da387a1f Merge pull request #96 from miekg/invalid-channel
Slack notification: add channel
2015-07-21 11:18:06 +02:00
Miek Gieben abacb716f5 Slack notification: add channel
Currently a failure is logged as:
 msg="Sent Slack notification: 17555453829685976206: HTTP 500: Invalid channel specified"

 Add the actual channel in there to aid in debugging.
2015-07-21 09:57:08 +01:00
Tomas Karasek b0a879d416 add test for Flowdock notification 2015-07-15 16:24:57 +03:00
Tomas Karasek 355565defc html template defined and plugged to FlowDock notifier 2015-07-15 16:24:41 +03:00
Julius Volz 7859ccb570 Merge pull request #92 from sdurrheimer/master
New Dockerfile using alpine-golang-make-onbuild base image
2015-07-12 13:16:48 -06:00
Steve Durrheimer 778bc4fc24 Add Docker instructions to the README 2015-07-11 13:14:02 +02:00
Steve Durrheimer a7b8977220 New Dockerfile using alpine-golang-make-onbuild base image 2015-07-09 08:56:45 +02:00
Steve Durrheimer 0aa7f442f8 Update Makefile.COMMON from prometheus/utils 2015-07-09 08:56:45 +02:00
Julius Volz b7919b338b Merge pull request #90 from prometheus/pushover-priority
Set Pushover notification priority to "emergency".
2015-07-09 00:10:01 -06:00
Julius Volz e484620a63 Set Pushover notification priority to "emergency".
Fixes https://github.com/prometheus/alertmanager/issues/89
2015-07-08 18:11:47 -06:00
Julius Volz d91ac2ef11 Merge pull request #84 from prometheus/runbook-amurl
Add runbook and alertmanager URLs to PD+email notifications.
2015-06-25 18:53:28 +02:00
Julius Volz 35b3741756 Add runbook and alertmanager URLs to PD+email notifications.
I don't have a way to test all the other notification mechanisms, which
is something we should fix in general. For now, only PagerDuty and email
have the new runbook and alertmanager URL information.

Not very happy with the overall cleanliness of this, and the codebase
overall, of course, but since we need this urgently tomorrow, I hope
this is fine for now.
2015-06-25 18:18:08 +02:00
Julius Volz 8d455091fc Merge pull request #78 from wrouesnel/master
Add a GET api to /api/alerts which pulls JSON formatted AlertAggregates.
2015-06-16 15:52:04 +02:00
William Rouesnel 34434fefd3 Add a GET api to /api/alerts which pulls JSON formatted AlertAggregates. 2015-06-16 09:05:48 +10:00
Julius Volz 982c968f73 Merge pull request #76 from prometheus/v0.0.3
Cut bugfix release 0.0.3.
2015-06-10 17:07:18 +02:00
Julius Volz 53c131c535 Cut bugfix release 0.0.3. 2015-06-10 17:05:02 +02:00
Brian Brazil de00240d66 Merge pull request #75 from wrouesnel/master
Fix email template body writer being called with parameters in wrong order
2015-06-10 10:09:46 +01:00
William Rouesnel 03bc356197 Fix email template body writer being called with parameters in wrong order. 2015-06-10 15:00:09 +10:00
Julius Volz 7988e1112e Merge pull request #73 from prometheus/version-0.0.2
Cut Alertmanager version 0.0.2.
2015-06-09 18:57:22 +02:00
Julius Volz d5aa4039cb Cut Alertmanager version 0.0.2. 2015-06-09 18:53:24 +02:00
Johannes 'fish' Ziemke 5b78ab6c58 Merge pull request #72 from sdurrheimer/master
Fix silences.json permission error with docker image
2015-06-03 12:33:33 +02:00
Steve Durrheimer acb4ab7ab6 Fix silences.json permission error with docker image 2015-06-03 00:16:22 +02:00
Brian Brazil 30dc9f7325 Merge pull request #71 from prometheus/alert-json-case
Change case of alert json to initial lower letter.
2015-06-01 14:13:56 +01:00
Brian Brazil 5de8fccdb4 Change case of alert json to initial lower letter.
Matching change to what's on the prometheus server side.
2015-05-30 14:37:26 +01:00