Commit Graph

1344 Commits

Author SHA1 Message Date
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
stuart nelson 040b1f9e53 Stn/status page ohne mesh (#920)
* Render status page without mesh connection (#918)

A mesh connection was assumed, even though the
value that was being passed into the helper
function was a possibly-nil pointer. Add a check
for this, and return a nil value in that case. The
frontend finds this when decoding the json
payload, and displays the "not configured"
message.

* Update bindata
2017-07-22 12:30:19 +02:00
Max Leonard Inden 88961051b1
Add current time to go webhook standard output
This is just a small addition for better debugging of notifications send
by Alertmanager.
2017-07-22 11:25:25 +02:00
Julius Volz b78869e749 Fix crash when no mesh router is configured (#919)
* Fix crash when no mesh router is configured

This adds a check for `meshListen != ""` around the waitFunc code as we
have around the other mesh-related code parts above.

Fixes https://github.com/prometheus/alertmanager/issues/914

* Update bindata
2017-07-22 10:56:55 +02:00
Björn Rabenstein 74e7e48d24 Merge pull request #915 from prometheus/beorn7/release
Cut release 0.8.0
2017-07-20 16:11:18 +02:00
beorn7 fb77ffaa6d Cut release 0.8.0 2017-07-20 15:50:16 +02:00
stuart nelson 4f8ef26b28 Update matching algorithm (#910)
* Test for consecutive chars throughout string

Previously, we were only testing for consecutive
characters at the beginning of the string. Now,
the entire string being compared is searched
through for a matching character, and then the
consecutive search starts.

We were seeing weird situations where the text
entered matched the last half of certain terms,
but because it wasn't, but because we only
searched from the start, results that probably
shouldn't have been the top suggestion were being
suggested too high on the list.

* Weight consecutive matches more highly

Bit of a guess, this seemed to give better results
for my small test case.

* bindata
2017-07-19 11:50:33 +02:00
ideaship a566036015 Support for custom SMTP hello string (#892)
* Support for custom SMTP hello string

Some MTAs insist that they be greeted with a fully qualified domain
name. The default provided by the net/smtp library, "HELLO localhost",
is not sufficient and will result in rejected messages.

This changeset adds a new configuration option that allows the
alertmanager to do its job in such an environment.

* Test SMTPHello parsing
2017-07-18 09:32:57 +02:00
Carlos Alexandro Becker ca8d73a59b Added possibility to have a global victorops api_key (#897)
* Added possibility to have a global victorops api_key

* adding tests for victorops default key
2017-07-12 09:25:47 +02:00
Andrey Kuzmin f4c11751a9 Receiver autocomplete (#900)
* Extract receivers

* Moved Match into Utils

* Implemented autocomplete

* Update bindata.go
2017-07-11 11:25:03 +02:00
Paul Traylor dfbac123db Add User-Agent for webhook requests (#893) 2017-07-11 11:22:13 +02:00
Max Inden 1001f49b1f Merge pull request #792 from mxinden/elm-docker
Improve front-end build process
2017-07-07 18:06:53 +02:00
Max Leonard Inden b3f3ecf803
Improve front-end build process
We generate binaries whenever `make build-all` is run. If they already
exist, we only regenerate them if they are outdated.

When one makes changes to the front-end and runs the single command
`make build-all` on the root level Makefile, the front-end is rebuild
accordingly.

`make build-all` will use Docker to build the front-end. If someone prefers
to install all the dev dependencies on their local machine instead, one
can add the `NO_DOCKER=true` flag.

For folks that only want to make back-end changes `ui/bindata.go` is
checked in, so they do not have to build the front-end. They still use
the `make build` command as before.
2017-07-06 13:43:10 +02:00
Matt Bostock 16232ce654 Update config file location in flag usage text (#895)
The config file location was changed in 305263e462. Update the flag usage text accordingly.
2017-07-05 13:09:03 +02: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
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