Commit Graph

847 Commits

Author SHA1 Message Date
Fabian Reinartz
66142a9115 Merge pull request #443 from prometheus/fabxc-empty-slack
config: make Slack channel optional
2016-08-03 10:06:10 +02:00
Fabian Reinartz
f8de58b6b6 config: make Slack channel optional 2016-08-03 08:24:42 +02:00
Fabian Reinartz
a9f7c9f318 Merge pull request #429 from mattbostock/hide_silenced_groups
Hide groups if all alerts within are silenced
2016-07-28 14:42:14 -07: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
Fabian Reinartz
5b64baa419 Update Travis Go versions 2016-07-27 11:58:56 -07:00
Fabian Reinartz
42696d91de Merge pull request #417 from rhazdon/master
Add VictorOps Notifier
2016-07-27 11:58:32 -07: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
Fabian Reinartz
9a2132a45b Revert "circle: tag pre-release docker images"
This reverts commit 8c2320752e.
2016-07-14 11:40:10 +09:00
Fabian Reinartz
8c2320752e circle: tag pre-release docker images 2016-07-14 11:36:39 +09:00
Julius Volz
50aac965ba Merge pull request #426 from tcolgate/master
OpsGenie Notifier, fixes and additions:
2016-07-13 01:31:53 +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
Fabian Reinartz
42c193b136 Merge pull request #424 from prometheus/sdurrheimer/fix-circleci-regex
circleci : fix missing regex update for v-prefiexed tags
2016-07-09 19:19:34 +02:00
Steve Durrheimer
647ab1ce1b
circleci : fix missing regex update for v-prefiexed tags 2016-07-09 15:41:41 +02:00
Fabian Reinartz
97eca6d604 Merge pull request #422 from prometheus/fabxc-0.3.0
Release AM 0.3.0
2016-07-08 11:47:32 +02:00
Fabian Reinartz
ec2932a733 circleci: detect v-prefixed tags 2016-07-08 11:22:10 +02:00
Fabian Reinartz
a8033e7d80 *: cut 0.3.0 2016-07-07 11:53:47 +02:00
Fabian Reinartz
e922acd088 Merge pull request #420 from prometheus/fabxc-memalerts
provider/boltmem: make alerts purely in-memory.
2016-07-07 11:16:33 +02:00
Fabian Reinartz
d6e64dccc5 provider/boltmem: make alerts purely in-memory.
Initial testing has shown BoltDB in plain usage to be a bottleneck
at a few thousand alerts or more (especially JSON decoding.
This commit actually makes them purely memory as a temporary solution.
2016-07-07 09:45:12 +02:00
Brian Brazil
ec708124be Merge pull request #418 from tbouvet/master
Add support for smtp AUTH LOGIN
2016-07-05 15:24:32 +01:00
Thierry BOUVET
936f7e6362 Add smtp AUTH LOGIN 2016-07-05 15:10:42 +02:00
Fabian Reinartz
dd3e9b62c4 Merge pull request #414 from diogogmt/master
Updated webhook notifier config name in UnmarshalYAML.
2016-06-29 00:23:49 +02:00
Diogo Monteiro
fe12aaa6eb Updated webhook notifier config name in UnmarshalYAML. 2016-06-28 18:19:09 -04:00
Fabian Reinartz
3f1c996f64 Merge pull request #405 from prometheus/fabxc-0.2.1
*: cut 0.2.1
2016-06-23 11:05:49 +02:00
Fabian Reinartz
3efd928e91 *: cut 0.2.1 2016-06-23 10:58:12 +02:00
Fabian Reinartz
8da61aa1b0 Merge pull request #402 from prometheus/master
Merge changes into release-0.2
2016-06-23 10:54:37 +02:00
Fabian Reinartz
8dc2f9740d Merge pull request #397 from prometheus/fabxc-sil-fix
Add silence cache in front of BoltDB
2016-06-22 17:45:44 +02:00
Fabian Reinartz
ee37ea6965 provider/boltmem: add in-memory silence cache 2016-06-22 14:29:23 +02:00
beorn7
d3c2ff7bba Fix VERSION 2016-06-21 22:39:47 +02:00
Björn Rabenstein
fc8f20186c Merge pull request #395 from sciffer/hipchat_fix
Fixing hipchat room number formating to string
2016-06-21 16:44:21 +02:00
Fabian Reinartz
1a93b01234 api: fix missing silence initialization 2016-06-21 16:38:35 +02:00
shalom
218c44d6ca Fixing hipchat room number formating to string 2016-06-21 10:33:40 -04:00
Fabian Reinartz
202235fb79 Merge pull request #368 from mattbostock/inherit_receivers
Allow route receiver to be inherited
2016-06-20 15:07:33 +02:00
Fabian Reinartz
3bbb296490 Merge pull request #386 from prometheus/fabxc-0.2.0
*: cut 0.2.0
2016-06-17 16:22:52 +02:00
Fabian Reinartz
6e6ab0c0b5 *: cut 0.2.0 2016-06-17 16:04:07 +02:00
Fabian Reinartz
064a581998 Merge pull request #385 from prometheus/beorn7/lint
Fix go vet warnings
2016-06-17 15:19:05 +02:00
beorn7
1d6b6d6ea8 Fix go vet warnings 2016-06-17 15:10:16 +02:00
Fabian Reinartz
e6892e1063 Merge pull request #379 from prometheus/fabxc-inhibit-fix
inhibit: reduce O(n^2) complexity problem
2016-06-14 22:46:21 +02:00
Fabian Reinartz
5002dde445 Merge pull request #381 from prometheus/fabxc-patch-1
readme: update config documentation link
2016-06-14 11:05:08 +02:00
Fabian Reinartz
11b9061ffb readme: update config documentation link 2016-06-14 11:03:49 +02:00
Fabian Reinartz
a5c6b238c8 inhibit: reduce O(n^2) complexity problem
This change adds a inhibition cache. New alerts are checked against all
inhibition rules' source matchers. At notification time, we only have to
check the target matchers against the notified alerts. If there are
alerts in the source cache, we only have to verify the equal labels
against these.
2016-06-13 18:27:43 +02:00
Fabian Reinartz
6db9089469 Merge pull request #376 from prometheus/move-api-endpoint
web: Move /api/-/reload endpoint to /-/reload.
2016-06-12 12:14:16 +02:00
Julius Volz
55eb9601fa web: Move /api/-/reload endpoint to /-/reload. 2016-06-12 11:27:21 +02:00
Fabian Reinartz
5843dcf673 Merge pull request #367 from mattbostock/use_localhost_for_tests
Use localhost for tests
2016-06-07 11:01:57 +02:00
Fabian Reinartz
6c1581fd00 Merge pull request #372 from ZhenyangZhao/master
Add api/-/reload endpoint #353
2016-06-06 16:57:08 +02:00
zhaozy
13fb17be37 Add api/-/reload endpoint #353 2016-06-06 21:42:16 +08:00
Brian Brazil
7b20b776ea Merge pull request #370 from mattbostock/fix_typo
Fix typo 'determins' in comment
2016-06-06 12:32:26 +01:00
Matt Bostock
0d057e2fac Fix typo 'determins' in comment 2016-06-06 12:18:55 +01:00
Matt Bostock
aec84c0288 Add route tests for receiver inheritance
Tests for:
- inheriting a receiver from the default route
- overriding the receiver when the parent route has not set one
- inheriting a receiver from a parent route that's not the default

Adds a route which matches on a `group_by` label which inherits the
default receiver and also has a child route, matching on an `env` label,
which overrides the receiver.

To be sure of edge case behaviour, we test inheriting the receiver from
a child route. Hopefully no one would actually implement this edge case
in reality as it's overly complex but we test anyway to be sure that it
doesn't trigger unexpected behaviour.
2016-06-04 10:21:28 +01:00
Matt Bostock
a29860d80e Allow route receiver to be inherited
This is useful when you're using a label to determine the receiver but
want to override other options such as `group_by`. Currently you'd have
to duplicate the matchers for the receivers to be able to do this.

`checkReceiver()` now returns no error if a receiver is empty and we add
a check to ensure that the root route has a receiver defined. I've added
a test for this.

This brings the `receiver` option into line with the other options
(`group_by`, `group_wait`, etc) in the sense that routes can now inherit
the receiver from the parent node.

From https://prometheus.io/docs/alerting/configuration/:

> A route block defines a node in a routing tree and its children. Its
> optional configuration parameters are inherited from its parent node
> if not set.
2016-06-04 10:19:43 +01:00
Matt Bostock
68a1e51ffb Use localhost for tests
Previously, the tests would listen on all available interfaces.

Instead, have the tests use localhost only; using all available
interfaces is unnecessary.

On Mac OS X with the builtin firewall enabled, it triggers annoying
prompts to allow the tests to listen on all interfaces.
2016-06-04 08:19:23 +01:00