Commit Graph

1364 Commits

Author SHA1 Message Date
Conor Broderick
c56d2b5d07 Sorted silences based on current status (#1015) 2017-10-02 18:42:43 +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
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