Commit Graph

123 Commits

Author SHA1 Message Date
stuart nelson 7736ea0f61
Add footer field for slack messages (#1141) 2017-12-12 22:50:41 +01:00
berlinsaint 6bab629590 Add notify support for Chinese User wechat (#1059)
* WECHAT support by ybyang2/berlinsaint

* correct the whitespace

* add some TestFile and modify some naming errors by ybyang2/berlinsaint

* modify wechat retry test expect

* template error

* add newline
Signed-off-by: yb_home <berlinsaint@126.com>

* fmt some pr code

* use the @stuartnelson3 the test-ci-wechat bingdata.go

* notify go add wechat
2017-12-09 16:20:22 +01:00
Jose Donizetti 4763f67e4f Add SortedPairs test (#1102) 2017-11-15 14:25:23 -05:00
Jose Donizetti 33644a85df Add tests to template package (#1086) 2017-11-11 15:12:03 +01:00
Siavash Safi d5f0d1773f Add entity_display_name for VictorOps, use better state_message (#769)
* Add entity_display_name for VictorOps, use better state_message

* Reuse existing long-form templates for state_message

* Rebuild binaries

* Limit state_message to 20K
2017-07-03 11:44:53 +02:00
stuart nelson a7009a9db7 Stn/add receiver support (#872)
Add ability to filter alerts by receiver in UI. This adds changes both in the Elm UI, as well as the Go backend.
2017-06-26 18:20:26 +02:00
Fabian Reinartz b3d2ff3688 Remove receiver filtering from backlink 2017-05-17 11:03:32 +02:00
stuart nelson d58e81db46 Generate assets 2017-04-25 10:36:48 +02:00
Andrey Kuzmin 88ec956973 Improve filter (#714)
* Update elm-tools/parser

* Improve filter UI

* Pressing backspace edits the last matcher

* Put escape char back into the output

* Allow editing the matcher

* Update bindata.go

* Const for key codes

* Use qualified imports

* Update bindata.go

* Commented the backspacePressed attribute
2017-04-18 20:49:52 +02:00
Max Leonard Inden c3850708c1 Make assets generation deterministic
By passing "-modtime 1" flag into go-bindata command it uses the same
unix timestamp (1) for every file in the fake filesystem. Thereby every
execution of "make assets" results in the same asset outputs if the
inputs were the same. This forces us to set the "Cache-Control"
attribute to "no-cache".
2017-04-10 13:47:13 +02:00
Conor Broderick b7bea3df5c Renamed from and message options for VictorOps to monitoring_tool and state_message as per the VictorOps documentation (#667) 2017-03-24 14:06:39 +00:00
James O'Gorman 00e3b98614 template: Add reReplaceAll function (#639)
This allows for using regexp replacement in templates.
2017-03-04 12:07:31 +00:00
Harmen be74c8442c make assets format 2017-01-03 19:44:04 +01:00
Fabian Reinartz d7843ad6a6 Export parsed configuration as JSON and drop js-yaml dependency. (#563)
* Export parsed configuration as JSON in /api/v1/status.
* Avoid exporting the XXX fields.
* Drop js-yaml library and use already parsed configuration.
* Go fmt + go-bindata
2016-11-22 15:05:14 +01:00
Fabian Reinartz b6851a5421 silences: fix concurrent cache writes (#561)
This fixes #559 by removing concurrent map writes to the matcher cache.
The cache was guarded by the Silence's main lock, which only used a
read-lock on queries.
The cache's get methods lazily loads data into the cache and thus
causing concurrent writes.

We just change the main lock to always write-lock, as we don't expect
high lock contention at this point and would have it in a dedicated
cache lock anyway.
2016-11-21 11:09:49 +01:00
stuart nelson 7078d18457 Regenerate static assets 2016-10-27 13:37:14 +02:00
tattsun 9396976771 [ui] Save creator's e-mail address to in browser storage 2016-09-19 16:47:31 +02:00
Fabian Reinartz b822fe58b6 Merge branch 'slack_enhance' of https://github.com/dmclain/alertmanager into dmclain-slack_enhance 2016-08-09 14:46:39 +02:00
Fabian Reinartz a840fae9de ui: don't delete old silence on modification 2016-08-09 12:00:52 +02:00
Matt Bostock 16d8afd5a8 Hide groups if all alerts within are silenced
Currently, even if all alerts within a group are silenced, the group
summary still appears. This can take up a lot of space when many alerts
are silenced.

If all alerts in a group are silenced and 'Hide silences' is checked,
hide the empty group.

bindata was updated by running:

    make assets format
2016-07-28 13:28:12 +01:00
Djordje Atlialp 8e0f405e67 Add VictorOps Notifier
Add default VictorOpsAPIURL

Add VictorOps default config

Add VictorOpsConfig struct in notifiers

Add new template tags for victorops

Add notifications logic for victorops

Compiled template tags with make assets

Remove common labels from entity_id template

Set messageType default value to CRITICAL

Recovery messageType is not configurable anymore. Firing state only allows specific keys

Make assets

Using log.Debugf

EntityID should not be configureable

Remove entity_id from template

Use GroupKey(ctx) as entity_id

Improve debug logging

Fix type of entity_id
2016-07-27 00:49:05 +02:00
Tristan Colgate de2252911e OpsGenie Notifier, fixes and additions:
- OpsGenie notifier confused the description and message fields
- Also added the notes field.
2016-07-12 16:20:23 +01:00
Dave McLain c5d1c48610 Add support for overriding the icon_url slack parameter 2016-05-12 13:57:15 -05: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
Max Chadwick c3198633d7 Filter silenced alerts 2016-04-27 22:53:44 -04: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
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 f33c1bedb4 Hide PushOver auth information 2016-04-12 10:14:22 +02:00
stuart nelson 84acd309a6 Add routing-tree visualization (#302) 2016-04-11 16:39:57 +02:00
Christoph Oelmueller 04b61f6d9a fix template error if no template string is defined 2016-04-01 10:23:34 +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
Fabian Reinartz 1748a0e304 Merge pull request #258 from stapelberg/pushover
Re-implement pushover notifications
2016-03-04 10:02:53 +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 124d637de0 Include generatorURL in PD and emails 2016-02-16 16:42:22 +01:00
Fabian Reinartz 3fba247d7c Run `make assets` for template changes 2016-02-16 12:28:16 +01: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
Fabian Reinartz 6e82fdd419 Fix vetting errors 2016-02-15 11:57:16 +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 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
Fabian Reinartz 9d8d386758 Add generatorURL to UI 2016-02-09 14:46:18 +01:00
Fabian Reinartz 897b3a0366 Use missingkey=zero option in templates 2016-02-05 15:41:15 +01:00
louis 23db37dc98 add hipchat room notifier 2016-01-05 20:52:08 +01:00
Fabian Reinartz e0f67dbca5 Invert navigation active/inactive color 2015-12-18 12:05:31 +01:00
Fabian Reinartz fbd81f325b Use double quotes for label values in UI 2015-12-17 11:35:33 +01:00
Fabian Reinartz 625fc42658 Preserve activity interval on silence edit 2015-12-16 14:42:38 +01:00
Fabian Reinartz 76f884b328 Allow zero matching template files 2015-12-09 14:51:18 +01:00
Fabian Reinartz 002c9ca793 Add better mail template 2015-12-09 11:49:22 +01:00
Fabian Reinartz 4ada2398f2 Set previous inhibition/silence state 2015-12-04 10:58:56 +01:00
Fabian Reinartz 1629e9d166 Statically compile default templates 2015-12-01 18:39:57 +01:00
Fabian Reinartz 6dc397de5c Transfer template functions into types+methods 2015-11-30 18:40:22 +01:00
Fabian Reinartz 18e9e728f8 Improve Slack integration 2015-11-30 13:52:41 +01:00
Brian Brazil 71a1c76e52 Use title rather than toTitle.
It turns out that 'title case' is a thing in unicode,
in the same way upper/lower case is.

What our users will want is the first character of a word
being titlecased, which `title` will do.
2015-11-28 11:08:24 +00:00
Fabian Reinartz 9fbc76a52f Improve PagerDuty templating 2015-11-27 14:02:34 +01:00
Fabian Reinartz 38b6ed118d Iterate over templating 2015-11-26 12:56:09 +01:00
Jimmi Dyson 3e7d614eb2 Add opsgenie notifier 2015-11-24 22:29:25 +00:00
Jimmi Dyson ab2a66c6b7 Add space between labels in default subject 2015-11-24 22:29:07 +00:00
Björn Rabenstein a4ffa9a64b Merge pull request #156 from prometheus/beorn7/review-dev
PR with changes after code review
2015-11-23 18:27:32 +01:00
beorn7 93ffa534a5 PR with changes after code review
Now to be reverse-reveiewed.
2015-11-23 18:24:57 +01:00
Fabian Reinartz 4a9d4de80c Improve default subject template 2015-11-23 17:20:02 +01:00
Brian Brazil faa88831f4 First-pass at improving template system.
- Cut back to bare minimum to make the rest simpler
- Consistency in config naming
- Have one data strucutre that's the same for all templates
- Pass in common labels to templates
- Support templates almost everywhere
- Support multiple SMTP recipients
- Support non-ASCII SMTP headers
- Handle colour logic via templates
- Make $subjects have consistent output, go maps aren't sorted.
- Make tests pass when v6 is disabled
2015-11-18 14:59:05 +00:00
Fabian Reinartz c045a6285b Implement deterministic incident keys, complete PD integration 2015-10-21 13:08:53 +02:00
Fabian Reinartz 899257ee23 Add proper styling of mail template 2015-10-20 09:22:36 +02:00
Fabian Reinartz 329b36594b (u)int64 fixes, UI time range improvements 2015-10-20 07:12:28 +02:00
Fabian Reinartz e77bda4e9f Fix inverted cleanup trigger, proper mail notifications 2015-10-16 17:45:21 +02:00
Fabian Reinartz 66488d433b add title and regexp replace template functions 2015-10-12 08:55:20 +02:00
Fabian Reinartz f9f32c7136 Add test for silence deletion 2015-10-12 08:49:49 +02:00
Fabian Reinartz 5dc2f6e9b1 Add license headers 2015-10-11 17:24:49 +02:00
Fabian Reinartz ce15d774d6 Add hierarchical naming for templates 2015-10-11 17:09:59 +02:00
Fabian Reinartz ce74f8363b Simplify initialization
No longer update components based on a new configuration. Generally,
destroying and recreating has no performance impact and is less
error-prone.
This also removes the Reloadable interface and simplifies the entire
startup contraption.
2015-10-11 16:54:39 +02:00
Fabian Reinartz 8e8052ad1b Add default templates 2015-10-11 13:32:34 +02:00
Fabian Reinartz 3a2db95a8e Create and use custom template package 2015-10-11 13:32:24 +02:00