Commit Graph

1381 Commits

Author SHA1 Message Date
Julius Volz
b1668866a8 Update vendoring for logger change 2017-10-22 00:20:40 -07:00
Julius Volz
947970af44 Convert Alertmanager to use non-global go-kit loggers
Fixes https://github.com/prometheus/alertmanager/issues/1040
2017-10-22 00:20:40 -07:00
Jose Donizetti
4369eb3244 Improve config test coverage (#1046) 2017-10-19 21:00:35 +02:00
Carlos Alexandro Becker
26489b13ef also hide inhibited alerts (#1039)
* also hide inhibited alerts

* split inhibited and silenced
2017-10-17 10:49:59 +02:00
Carlos Alexandro Becker
4a8e710691 Allow template in victorops message_type field (#1038) 2017-10-11 15:42:10 +02:00
Frederic Branczyk
ff9e5270c7 Merge pull request #1026 from brancz/marker-race
Remove .WasInhibited and .WasSilenced fields of Alert type
2017-10-10 16:49:55 +02:00
Frederic Branczyk
0ef6695055
*: Remove .WasInhibited and .WasSilenced fields of Alert type 2017-10-10 15:50:15 +02:00
stuart nelson
89200ccafd add ISSUE_TEMPLATE.md (#1036) 2017-10-10 10:51:30 +02:00
Max Inden
ac935a8ffe Rename Promtheus to Alertmanager in CONTRIBUTING.md (#1033) 2017-10-09 10:23:39 +02:00
Corentin Chary
21a2e5393f cli/silence_add: don't ingore errors when getting current user (#1031)
I had a system where amtool would segfault on startup because of
that.
2017-10-09 10:10:27 +02:00
Frederic Branczyk
de24c5b7ec Fix inhibit race (#1032)
* inhibit: restructure stop logic, to prevent race condition

* vendor oklog/oklog/pkg/group
2017-10-07 13:01:37 +02:00
Jose Donizetti
0508348fd0 Allow selectable matchers on silence view (#1030) 2017-10-07 12:54:30 +02:00
Conor Broderick
10b9d34f80 Initialise notifications_total and notifications_failed_total (#1011) 2017-10-07 11:57:53 +02:00
Frederic Branczyk
620fff4e4f add metric of alertmanager position in mesh (#1024) 2017-10-06 18:37:44 +02:00
Frederic Branczyk
d47f8b908c Merge pull request #998 from iksaif/silence-alert-counters
silence|alerts: add metrics about current silences and alerts
2017-10-05 15:16:26 +02:00
Frederic Branczyk
5328885fe9 dispatch: fix race condition in dispatch test (#1025) 2017-10-04 18:01:23 +02:00
Conor Broderick
c56d2b5d07 Sorted silences based on current status (#1015) 2017-10-02 18:42:43 +02:00
Corentin Chary
bff889b490 silence|alerts: add metrics about current silences and alerts
This adds metrics that look like this:
```
alertmanager_alerts{state="active"} 6
alertmanager_alerts{state="suppressed"} 0
alertmanager_silences{state="active"} 1
alertmanager_silences{state="expired"} 1
alertmanager_silences{state="pending"} 0
```

This can be used to monitor alertmanager's usage and validate that
alertmanagers in a mesh have a similar number of silences and alerts.
2017-10-02 13:33:29 +02:00
Jose Donizetti
fe390bc28a Improve amtool check-config use and description text (#1016) 2017-10-02 11:22:04 +02:00
stuart nelson
9f5f4b2a51 v0.9.1 (#1010) 2017-09-29 14:56:31 +02:00
stuart nelson
a7981e4693 Inconsistent use of baseUrl and apiUrl arguments (#1008)
* Inconsistent use of baseUrl and apiUrl arguments

Both are Strings, so flipping the order between
one invocation and another didn't raise any
argument from the compiler. The baseUrl argument
is actually unnecessary, and has been removed.

* Update bindata.go
2017-09-29 14:16:03 +02:00
Alin Sinpalean
4931c9206e Fix multipart email implementation: (#1009)
* Don't send parts with empty templates.
 * Add a MIME-Version: 1.0 header.
 * Place text/html part last, as parts are supposed to be in increasing preference order.
2017-09-29 11:22:38 +02:00
stuart nelson
837cf5c6fe Update CHANGELOG.md typo 2017-09-28 11:18:55 +02:00
stuart nelson
1535a52116 Add release-0.9 (#1004) 2017-09-28 11:14:10 +02:00
Jose Donizetti
9449bd1fa9 Ignore expired silences OnGossip (#999)
This will fix the bug of resync deleted silences
due to the state of other peers.
2017-09-28 10:25:35 +02:00
Corentin Chary
34d9524ab9 silences: avoid deadlock (#995)
* silences: avoid deadlock

Calling gossip.GossipBroadcast() will cause a deadlock if
there is a currently executing OnBroadcast* function.

See #982

* silence_test: better unit test to detect deadlocks
2017-09-27 11:48:28 +02:00
Conor Broderick
2a0be5c11e Merge pull request #993 from Conorbro/dialog-confirm
Added confirmation dialog when expiring silences
2017-09-14 17:13:25 +01:00
conorbroderick
5597a76ad4 Added confirmation dialog when expiring silences 2017-09-14 16:41:55 +01:00
Conor Broderick
ee76b92cb9 Merge pull request #994 from Conorbro/count-affected-alerts
Show total number of silenced alerts in preview
2017-09-14 15:32:37 +01:00
conorbroderick
20e19e372c Show total no. of silenced alerts in prev 2017-09-14 14:44:27 +01:00
Corentin Chary
869a038a2b Add a mutex to silences.go:gossipData (#984)
This should fix silence/silence.go #982
2017-09-13 11:18:01 +02:00
Fabian Reinartz
1c53b344a9 Merge pull request #990 from cstyan/support-optional-binary
allow a binary name to be passed to make build
2017-09-13 09:48:01 +02:00
Callum Styan
1eef24cae2 add readme note about optional build binaries 2017-09-12 14:18:06 -07:00
Joe Handzik
cba3e6ec83 Cleanup artifacts/README.md (#988)
Sentence and spelling cleanup, also removed a trailing newline.

Signed-Off-By: Joe Handzik <joseph.t.handzik@hpe.com>
2017-09-11 18:34:15 +01:00
Callum Styan
ad27f483dd allow a binary name to be passed to make build, rather than only allowing build to build all binaries from .promu.yml 2017-09-10 14:30:55 -07:00
Pierre Awaragi
f3cd3978db added email notification text content support (#934)
* added email notification text content support (configuration text)
added default email notification text content default value empty
converted email notification from html to multipart/alternatives with support to both html (first) and text (last)
ignore intellij IDE .idea working folder

* removed specific editor .gitignore entries

* renamed TEXT to Text as it's not an acronym
added TODO note to refactor multipart code to use standard go library

* refactored to use standard go mime/multipart library for text and html parts and bounderies

* use multipart createPart returned writer
added error handling while creating parts
removed unnecessary quotes from boundry string

* removed unnecessary comments
2017-09-07 17:24:19 +02:00
Corentin Chary
25e4bb9965 amtool check-config (#978)
This is similar to `promtool check-config` and allows one
to validate the alertmanager configuration (as a git presubmit for example).

`govendor fetch github.com/spf13/{cobra,pflag}` was needed to
have support for `Args`.
2017-09-07 10:58:58 +02:00
Max Inden
1007e0ff9e Merge pull request #969 from prometheus/stn/ui-consistent-alert-sorting
Sort alerts by their fingerprint
2017-09-06 10:10:39 +02:00
stuart nelson
cb9c9466d9 Stn/edit on silence view page (#970)
* Edit/recreate/destroy silence on view page

* Share stuff from SilenceList

* Update bindata

* Remove unused variable

* Update bindata

* Update silence style

* Update bindata
2017-09-05 11:01:46 +02:00
stuart nelson
d33511cb36 macOS requires the template to be at the end (#971)
* macOS requires the template to be at the end

* Update makefile to use .js extension

* see if this works..
2017-09-02 20:19:11 +02:00
Stuart Nelson
ad64e9f1b2 Sort alerts by their fingerprint
Seemed like an ok way to sort.
2017-09-02 11:35:17 +02:00
Jack Neely
0dfdda3074 Use logging options consistently for all components #967 (#968) 2017-09-02 11:24:11 +02:00
stuart nelson
a5b2e0bbcc Fixes #925 (#960) 2017-08-22 18:42:30 -05:00
Kellen Fox
eb38b469f1 Provide README information for amtool (#939)
* Provide README information for amtool

Amtool has been bundled with alertmanager for a while now. It's probably
far past the acceptable time to add information to the readme

* Fixups based on recommendations

* replace `,` with `.` in first sentance
* Add silence query example with filtering
* Add silence add example with multiple matchers and a regex
* Add silence expire all example that shows query -q
* Add configfile example
2017-08-22 18:13:40 -05:00
Łukasz Mierzwa
8e61ebf6c3 Expose alert fingerprint in the API (#786)
* Expose alert fingerprint in the API

Alert fingerprint is already provided as the value of status.inhibitedBy[] attribute that inhibited alerts have, but there's no way to get back to the alert that's inhibiting it as the fingerprint is not exposed.

* Expose alert fingerprint as ID in the list endpoint

* Rename ID to Fingerprint

* Use Fingerprint().String() in the API
2017-08-18 19:30:18 +02:00
Andrey Kuzmin
250bd35c97 Linkify alert annotations (#946)
* Make links in annotations clickable

* Update test script and bindata.go

* Add target = _blank
2017-08-13 19:48:36 +02:00
Kellen Fox
09bc5dd8e5 Fixes #898 (#938)
Exit with error code from subcommands as well as root command
2017-08-02 23:04:07 +02:00
Andrey Kuzmin
7de7cf38f9 Selectable labels (#932)
* Make the labels selectable

* Update bindata.go
2017-07-31 13:22:30 +02:00
Max Inden
ed52b4b090 Merge pull request #909 from mxinden/improve-webhook
Add current time to go webhook standard output
2017-07-27 17:02:50 +02:00
9to6
e1b2bfe497 When I notify alert to slack, I want to use this option. (#912)
* add link_names attribute to slack notifier

* changed type of slack option `link_names` to boolean
2017-07-25 09:21:33 +02:00