RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-27 16:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,318 Commits 66 Branches 78 Tags 245 MiB
d5f0d1773f
Commit Graph

1318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Raúl Benencia
41c5aaf3f4 Remove timeout for ui requests (#873) (#890) 2017-06-28 00:03:47 +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
6ef5ca6225 Merge pull request #882 from iksaif/dedup-matchers 
Make sure Matchers are always ordered
 2017-06-23 16:29:50 +02:00
Corentin Chary
9b2afbf18b Make sure Matchers are always ordered 
This fixes https://github.com/prometheus/alertmanager/issues/881
Also add some unit tests
 2017-06-23 15:30:34 +02:00
Conor Broderick
b5ad65fa32 Omit empty config fields and show regex upon re-marshalling to elide secrets (#864) 
* Omit empty config fields upon remarshalling to elide secrets

* added test checking for empty or null fields and blank regexps
 2017-06-20 19:09:14 +02:00
Andrey Kuzmin
6b5fb2dbc9 Parse error message (#866) 
* Parse error message

* Update bindata.go
 2017-06-18 12:19:40 +02:00
Praveen Maurya
525bd56db0 Changes to send mail to smtp port 465 (#704) 2017-06-18 12:18:10 +02:00
Max Inden
2e73a81ee2 Merge pull request #861 from prometheus/stn/jaro-winkler-golf 
Stn/jaro winkler golf
 2017-06-12 10:46:44 +02:00
Stuart Nelson
3911168df0 Update bindata 2017-06-12 10:17:22 +02:00
Stuart Nelson
ddde5eaacd Use concatMap directly 2017-06-12 10:11:36 +02:00
Max Inden
16c7dcd634 Merge pull request #858 from prometheus/release-0.7 
Merge 0.7.1 back into master
 2017-06-12 10:01:50 +02:00
Max Inden
ab4138299b Merge pull request #857 from mxinden/release-0.7 
*: cut v0.7.1
 2017-06-09 17:27:29 +02:00
Max Leonard Inden
40eaed0c7a
*: cut v0.7.1 2017-06-09 16:34:58 +02:00
Max Inden
e07ade08a7 Merge pull request #856 from mxinden/fix-filtering 
Fix filtering by label
 2017-06-09 12:23:59 +02:00
Max Leonard Inden
46ffad322e
Fix filtering by label 
When clicking on a label on the AlertList or SilenceList view, the
changed Alert/Silence query is appended to the current url. This Postfix
should not start with a slash. If it does, the url is not appended but
replaced by the browser instead resulting in a `pushState` exception.
 2017-06-08 21:34:26 +02:00
Frederic Branczyk
b6b7fe775f Merge pull request #852 from prometheus/release-0.7 
Merge changelog changes back to master.
 2017-06-08 15:55:01 +02:00
Frederic Branczyk
14755ed362 Merge pull request #851 from mxinden/release-0.7 
Add status api change to changelog
 2017-06-08 15:34:21 +02:00
Max Leonard Inden
9cfe17e224
Add status api change to changelog 2017-06-08 15:13:00 +02:00
Max Inden
fe105f4ed7 Merge pull request #849 from mxinden/cutv0.7.0 
*: cut v0.7.0
 2017-06-08 13:59:14 +02:00
Max Inden
ff50b35d7d Merge pull request #850 from brancz/config-marshal 
As in the code we marshaled/unmarshaled the config a few times (in cmd, api, cli), the elided secrets caused some parsing errors when marshaling/unmarshaling JSON. Unnecessary marshaling and unmarshaling is removed in this PR. amtool still does it, but it is necessary there.
 2017-06-08 13:45:00 +02:00
Max Leonard Inden
e048083ab2
*: cut v0.7.0 2017-06-08 13:44:43 +02:00
Frederic Branczyk
c4c0875ba3
fix config JSON marshaling 2017-06-08 13:37:57 +02:00
Frederic Branczyk
d383ab0d91 Merge pull request #847 from mxinden/serve-libs 
Serve FontAwesome & Bootstrap ourself
 2017-06-08 09:45:43 +02:00
Max Leonard Inden
dd7ffe0515
Serve FontAwesome & Bootstrap ourself 
Instead of using external CDNs for Bootstrap and FontAwesome, this patch
makes Alertmanager serve these libraries itself.
 2017-06-07 22:40:18 +02:00
stuart nelson
2cf38e4c2e Fix external web url (#836) 
Infer path from Navigation.Location

Build uses template, local dev uses elm-reactor

Remove unneeded local dev go server

Add script.js make target

Compiles and uglifies script.js

Before:
~570kb

After:
~170kb

Bootstrap loading state

Add trailing slash via JS & add routePrefix console param

Add Javascript script tag to `index.html` which adds a trailing slash to
the url pathname if none is present. This is done to ensure assets like
`script.js` are loaded properly.

Example without patch:
If the pathname is "mxinden.com/alertmanager" the browser will try to
download the `script.js` asset from "mxinden.com/script.js". This
request will fail.

Example with patch:
If the pathname is "mxinden.com/alertmanager", Javascript redirects the
browser to "mxinden.com/alertmanager/" and then the `script.js` asset
will be downloaded from "mxinden.com/alertmanager/script.js". This
request will succeed.

Add `-web.route-prefix` as a console parameter. This configures a
Prefix for the internal routes of web endpoints. Defaults to path of
-web.external-url like in *Prometheus*.

Trim slashes off of route prefix and add one slash at the beginning.
Make sure route prefix is not empty or just a slash before prefixing
router.
 2017-06-07 22:38:39 +02:00
Conor Broderick
5a5acb2d1c Elide secrets in alertmanager config (#841) 2017-06-06 12:02:49 +01:00
Fabian Reinartz
31001474c4 Merge pull request #843 from Kellel/kellel/831-fix 
Fixes #831
 2017-06-06 06:55:37 +02:00
Kellen Fox
305263e462 Fixes #831 Move config file to a more consistent location and update docs 2017-06-03 14:12:43 -07:00
Andrey Kuzmin
ffe79ad410 Inhibited indicator in the UI (#838) 
* Add inhibited indicator

* Update bindata.go
 2017-06-01 10:43:44 +02:00
Andrey Kuzmin
3f60d01592 Add favicon (#839) 
* Add favicon

* Fix the node version

* Update bindata.go
 2017-06-01 10:13:20 +02:00
Conor Broderick
02484d18b0 Added option to disable AM listening on mesh port (#764) 2017-05-31 11:05:18 +01:00
Andrey Kuzmin
eff5341dec Show alert annotations (#833) 
* Show annotations

* Update bindata.go

* Fix the versions of elm modules
 2017-05-30 21:04:49 +02:00
Max Inden
6a69491ecf Merge pull request #832 from mxinden/expire-sil 
Expire pending silence and move to expired state
 2017-05-30 10:33:32 +02:00
Max Leonard Inden
08be6a4149
Expire pending silence and move to expired state 
Instead of setting endsAt to startsAt we can set both to now. Thereby
the Silence will get the expired state by default.
 2017-05-29 18:44:58 +02:00
Max Inden
a217e162a8 Do not expose resolved alerts & do not send resolved if never firing (#820) 
Do not expose resolved alerts on the /alerts endpoint. Do not send
resolved alerts to receivers if the alerts have never been fired before.
 2017-05-29 14:07:05 +02:00
Max Inden
0819ee8a87 Update build status to target master (#826) 
Instead of targeting the latest build, which could be any PR, we should target current master results.
 2017-05-28 13:25:17 +02:00
Andrey Kuzmin
562f99566e Improved Validation (#827) 
* Restructure the validation

* Validate on blur

* Extract alerts from the silence

* Use string for the error type

* Use ApiData everywhere

* Validate the form

* Remove redirect on failure

* Code review fixes

* Hide the delete button if there is one matcher

* Rename silence2

* Update bindata.go

* Fix the tests

* Actually hide the delete button

* Update bindata.go
 2017-05-28 12:53:25 +02:00
David Guerrero
1f346a6724 fixing a typo in amtool help text (#829) 2017-05-26 11:27:09 +01:00
Fabian Reinartz
6be3fbcb68 Merge pull request #818 from prometheus/brian-brazil-patch-1 
Correct change types in 0.6.x changelogs
 2017-05-22 18:29:50 +02:00
Brian Brazil
b5763d8d3b Correct change types in 0.6.x changelogs 2017-05-22 17:14:47 +01:00
Andrey Kuzmin
30749037a9 Style the silences list (#809) 
* Get rid of old css lib

* Cleanup the models and updates

* Styled the silences view

* Update that bindata stuff
 2017-05-22 13:36:31 +02:00
Fabian Reinartz
e882e6f9e0 Merge pull request #811 from prometheus/silexp 
silence: fix and test expiration behavior
 2017-05-22 09:52:50 +02:00
Fabian Reinartz
f53974d5e6 silence: fix and test expiration behavior 2017-05-22 09:27:57 +02:00
Max Inden
15979ceeec Merge pull request #807 from mxinden/cutv0.7.0-rc.0 
*: cut v0.7.0-rc.0
 2017-05-19 16:22:10 +02:00
Max Leonard Inden
ba6d945456
*: cut v0.7.0-rc.0 2017-05-19 15:48:55 +02:00
Max Inden
efb0e870ef Merge pull request #806 from mxinden/silence-form 
Rework SilenceForm
 2017-05-19 15:09:48 +02:00
Max Leonard Inden
b3bb5dca80
Rework SilenceForm 
* Restyle SilenceForm view
* Add validation to SilenceForm
* Redirect to new silence when editing expired one
 2017-05-19 14:14:35 +02:00
Fazal Majid
2123264b98 updated logrus so alertmanager can build on Solaris/Illumos (#804) 2017-05-18 15:58:30 +02:00
Max Inden
e85d8acbb2 Merge pull request #799 from mxinden/silenced 
Add 'silenced' query param to /alerts endpoint
 2017-05-18 09:16:07 +02:00