Commit Graph

1224 Commits

Author SHA1 Message Date
Max Leonard Inden
30c62c2f9f
Switch to /alerts endpoint and restlye alerts list page
Instead of using the /alerts/groups endpoint to retriev alerts this
commit introduces usage of the /alerts endpoint. This bypasses a lot of
complexity by ignoring alert groups and alert blocks. Groups and blocks
are left as a pure back-end detail.

Fixes #694
2017-05-02 09:46:20 +02:00
Max Inden
233cad6591 Merge pull request #761 from prometheus/status-page
Display more information on status page
2017-05-02 09:45:42 +02:00
Max Leonard Inden
a5a53c46f7
Display more information on status page 2017-05-02 09:18:36 +02:00
Max Inden
ffba4d078c Merge pull request #753 from mxinden/ui-rewrite
Sync ui-rewrite with master
2017-04-28 14:49:53 +02:00
Max Leonard Inden
64afa042dc
Merge branch 'master' into ui-rewrite 2017-04-28 14:41:58 +02:00
Fabian Reinartz
5aeaf2cb98 Merge pull request #752 from prometheus/cut-0.6.1
*: cut 0.6.1
2017-04-28 11:54:43 +02:00
Frederic Branczyk
b962597d97
*: cut 0.6.1 2017-04-28 11:48:12 +02:00
Frederic Branczyk
3eb81b4243 Add config hash metric (#751) 2017-04-27 20:58:15 +02:00
Frederic Branczyk
cec7341ce7 Merge pull request #750 from prometheus/fabxc-patch-1-1
notify: hex encode deduplication hash
2017-04-27 14:19:12 +02:00
stuart nelson
6a909abf17 Add processing status field to alert 2017-04-27 14:18:52 +02:00
Fabian Reinartz
49ceb8cc99 notify: hex encode deduplication hash 2017-04-27 13:10:43 +02:00
Max Inden
b7603c2eb3 Update .travis.yml (#747) 2017-04-26 15:01:18 +02:00
stuart nelson
fd4fd115cb Build with go-1.8 in circle-ci 2017-04-26 10:58:04 +02:00
Fabian Reinartz
2d1b5fc43f Merge pull request #738 from tomwilkie/context
Remove use of route.Context
2017-04-26 07:45:55 +02:00
Tom Wilkie
ba4fc17307 Remove use of route.Context 2017-04-25 17:43:01 -07:00
stuart nelson
762b5c479a Update VERSION and CHANGELOG.md (#735) 2017-04-25 21:44:20 +02:00
Max Inden
37bbc4c439 Merge pull request #736 from prometheus/ui-rewrite-merge-master
Update ui-rewrite with master branch
2017-04-25 17:36:55 +02:00
Max Leonard Inden
0d2b0b6bd6
Merge branch 'master' into ui-rewrite 2017-04-25 15:47:57 +02:00
Max Inden
6f0c8e2e9e Merge pull request #728 from prometheus/elm-test
test: Introduce elm-test package
2017-04-25 15:21:32 +02:00
Max Leonard Inden
e2898f8f4d
Exclude /ui folder from go tests 2017-04-25 15:01:07 +02:00
stuart nelson
3a76198c47 Use go-1.8 image (#733)
* Use go-1.8 image

* Update assets
2017-04-25 12:34:21 +02:00
Max Leonard Inden
9ec25d84c5
test: Introduce elm-test package
Adding two basic (fuzz-) tests for Utils.Filter.parseMatcher. Including
tests in Travis runs. Adding make target "test" and "dev-server".
2017-04-25 12:03:02 +02:00
Max Leonard Inden
fae4c81286
Update template/internal/deftmpl/bindata.go & ui/bindata.go
Additionaly linting AlertList/Types.elm
2017-04-25 11:39:57 +02:00
Max Leonard Inden
f3a3be8191 Update template/internal/deftmpl/bindata.go & ui/bindata.go
Additionaly linting AlertList/Types.elm
2017-04-25 11:34:31 +02:00
Max Leonard Inden
a8d7f92c66 test: Ensure bindata.go is always up to date
This adds three more steps to the Travis tests.
1. Compile Elm -> script.js
2. Bundle html.index & script.js -> bindata.go
3. Check if bindata.go hasn't changed
2017-04-25 11:33:57 +02:00
stuart nelson
d58e81db46 Generate assets 2017-04-25 10:36:48 +02:00
stuart nelson
98ec6632c3 Remove openbsd/arm builds (#732)
golang.org/x/sys/unix is failing for the various
arm builds.
2017-04-24 22:52:55 +02:00
stuart nelson
06a37d66e2 Remove unused MatchOperator import 2017-04-24 14:59:58 +02:00
stuart nelson
2ae96e845d Add the fns for all match op types
They aren't use, but we might as well be correct.
2017-04-24 14:56:54 +02:00
stuart nelson
b29afb80a2 Receiver key is always an anchored regex match 2017-04-24 14:54:25 +02:00
stuart nelson
dc90e8dec3 Allow filtering receiver with a regex
e.g.:
http://localhost:5000/#/alerts?receiver=~(backend|ops)-warn
2017-04-23 21:04:53 +02:00
stuart nelson
e9cb88e15a Fix vendor package while waiting
I can't be bothered to go through the mountain of
steps to commit this tiny change.

https://github.com/golang/go/issues/20055
2017-04-21 16:21:32 +02:00
Fabian Reinartz
c61a6ec8b6 Merge pull request #716 from prometheus/reloadtest
test: add reload test
2017-04-21 14:57:52 +02:00
Fabian Reinartz
9753a7fcc6 Merge pull request #726 from prometheus/peerpanic
cmd: fix panic on empty peer string
2017-04-21 14:57:23 +02:00
Kellen Fox
b2c656a071 Add command wrapper to handle printing errors for any subcommands (#724)
Fixes #721

I was using the RunE method of cobra.Command which does things with an
error returned from a function. I doesn't seem possible to keep it from
printing usage every time, so I've make a wrapper to use the other
function.
2017-04-21 14:50:02 +02:00
Fabian Reinartz
7e31a58868 cmd: fix panic on empty peer string 2017-04-21 14:40:46 +02:00
Fabian Reinartz
0659dfbde3 Merge pull request #725 from prometheus/groupkey
*: switch group key to matcher serialization
2017-04-21 13:21:39 +02:00
Fabian Reinartz
3269bc39e1 *: switch group key to matcher serialization
Turn the GroupKey into a string that is composed of the matchers if the
path in the routing tree and the grouping labels.
Only hash it at the very end to ensure we don't exceed size limits of
integration APIs.
2017-04-21 12:06:23 +02:00
stuart nelson
68e1cbe024 Add mousetrap vendor package 2017-04-20 11:33:33 +02:00
stuart nelson
7429ccca99 Fix invalid json in vendor.json file 2017-04-20 11:31:04 +02:00
Kellen Fox
3aab66ec3a Amtool implementation (#636)
* Implement alertmanager cli tool 'amtool'

The primary goal of an alertmanager tool is to provide a cli interface
for the prometheus alertmanager.

My vision for this tool has two parts:
  - Silence management (query, add, delete)

  - Alert management (query, maybe more in future?)

Resolves: #567
2017-04-20 11:04:17 +02:00
Andrey Kuzmin
88ec956973 Improve filter (#714)
* Update elm-tools/parser

* Improve filter UI

* Pressing backspace edits the last matcher

* Put escape char back into the output

* Allow editing the matcher

* Update bindata.go

* Const for key codes

* Use qualified imports

* Update bindata.go

* Commented the backspacePressed attribute
2017-04-18 20:49:52 +02:00
Fabian Reinartz
cb8729a458 Merge pull request #715 from prometheus/gogoproto
Move to gogoproto
2017-04-18 14:12:58 +02:00
Fabian Reinartz
15efe6d748 vendor: add gogo protobuf packages 2017-04-18 12:58:32 +02:00
Fabian Reinartz
b1486ca546 silence: move to gogoproto
This generates the protobuf Go code with gogoproto and switches to
standard library time types.
2017-04-18 12:47:42 +02:00
Fabian Reinartz
ff5ecfff51 test: add reload test
This test reloads the Alertmanager to verify, that it properly keeps
state and sends notifications correctly across reloads.
2017-04-18 12:44:38 +02:00
Fabian Reinartz
4258b028d6 nflog: switch to gogoproto
This switches the nflog to generate Go code via gogoproto and thereby
use standard library timestamp types.
2017-04-18 10:03:57 +02:00
Tobias Schmidt
af8cfdde14 Create sha256 checksums file during release (#713) 2017-04-17 20:00:29 +02:00
Fabian Reinartz
8820ce7827 Merge pull request #703 from prometheus/fix-resolve
Fix resolve notifications
2017-04-17 14:19:04 +02:00
Fabian Reinartz
309c6af4b2
nflog: use alert set instead of hash for deduplication
Building a hash over an entire set of alerts causes problems, because
the hash differs, on any change, whereas we only want to send
notifications if the alert and it's state have changed. Therefore this
introduces a list of alerts that are active and a list of alerts that
are resolved. If the currently active alerts of a group are a subset of
the ones that have been notified about before then they are
deduplicated. The resolved notifications work the same way, with a
separate list of resolved notifications that have already been sent.
2017-04-13 15:13:47 +02:00