RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-28 00:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,490 Commits 66 Branches 77 Tags 218 MiB
081fc7d982
Commit Graph

1490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Donizetti
bf3f6de719 Add tests to nflog set 2017-11-01 06:44:27 -02:00
Jose Donizetti
359b614f5f Fix documentation (#1065) 2017-11-01 08:41:00 +00:00
Tom-Fawcett
2d1b84ff5e Upgrade OpsGenie notifier to v2 API. (#1061) 2017-10-29 16:19:17 +01:00
Jose Donizetti
1c7bf17eec Add logging to statemessage truncation (#1056) 2017-10-26 11:09:54 +02:00
Jose Donizetti
877d2780a0 Add limit to OpsGenie message (#1045) 2017-10-26 11:09:23 +02:00
Jose Donizetti
0a16b09fc1 Fix pushover limits (title, message, url) (#1055) 2017-10-25 14:44:35 +02:00
Andrey Kuzmin
0fa852217b Toggle silenced and inhibited alerts (#1049) 
* Add inhibited checkbox

* Update ui/bindata.go
 2017-10-23 11:00:17 +02:00
Jose Donizetti
ae73a3103a Add tests to notifiers config (#1050) 2017-10-23 10:55:34 +02:00
Julius Volz
5d1dec2790 Merge pull request #1052 from prometheus/nonglobal-loggers 
Convert Alertmanager to use non-global go-kit loggers
 2017-10-22 10:04:30 -07:00
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