RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-10 07:49:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,296 Commits 71 Branches 77 Tags 220 MiB
c4c0875ba3
Commit Graph

1296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Reinartz
b011c0a32c *: cut v0.6.2 (#777) 2017-05-09 10:43:24 +02:00
Fabian Reinartz
dc5142c76b Fix broken link to silence from alert 2017-05-09 10:26:51 +02:00
Fabian Reinartz
257ce9ae8f Fix broken link to silence from alert 2017-05-09 10:26:25 +02:00
Conor Broderick
a77bfb44d6 Added unit test for continue in root route error (#768) 
* Added unit test for continue in root route error

* replaced %v with %q
 2017-05-09 10:11:40 +02:00
Fabian Reinartz
c9163bd689 Merge pull request #748 from prymitive/anchor-rules 
Anchor silence regex rules
 2017-05-09 10:11:01 +02:00
Fabian Reinartz
5aff15b30f Merge pull request #773 from prometheus/fixalertstat 
Fix alert status handling in UI
 2017-05-09 10:09:24 +02:00
Fabian Reinartz
b9d455cb9a Merge pull request #774 from Kellel/origin/#746 
Fixes #746
 2017-05-09 10:08:49 +02:00
Kellen Fox
6aece86ac1 Fixes #746 
Found that we are only defining MarshalJSON for the Regexp type for
references not for the direct object

Also took the time to simplify the json.Unmarshal usage in cli/config.go
 2017-05-08 11:25:25 -07:00
Fabian Reinartz
8170206070 Fix alert status handling in UI 2017-05-08 12:56:03 +02:00
stuart nelson
91e802c4f3 Extract Alert Filter Bar (#755) 
* Extract Alert Filter Bar

* Add FilterBar to silenceList page

* Prevent empty key= in query string
 2017-05-08 10:42:42 +02:00
Max Leonard Inden
9cc00323ca
Update cache control for web assets 
The commit [1] introduced the `cache-control` header field with the value
`no-cache`. This enforces any cache to revalidate. Apparently this does
not prohibit *FireFox* from caching the assets. `no-cache, no-store,
must-revalidate` does by prohibiting to even save anything of the
request.

[1] c3850708c1
 2017-05-05 09:30:09 +02:00
Fabian Reinartz
cb8b507e62 Merge pull request #760 from prymitive/fix-types-lock 
Use proper locks when modifying alert status
 2017-05-04 14:11:26 +02:00
Fabian Reinartz
8566c9531b Merge pull request #767 from Conorbro/continue_error_in_root_route 
Throw error when continue in route root of Alertmanager config
 2017-05-03 15:06:49 +02:00
conorbroderick
dc782f2dd4 Throw error when continue in route root of Alertmanager config 2017-05-03 13:40:54 +01:00
Max Inden
952543b6e8 Merge pull request #763 from prometheus/alertlist-prevent-null 
Init result slice to prevent /alerts returning `null`
 2017-05-02 15:52:33 +02:00
Max Leonard Inden
96a28bbc36
Init result slice to prevent /alerts returning null 
When there are no alerts to return the api endpoint `/alerts` should
return:
```
{
  "status": "success",
  "data": []
}
```
instead of
```
{
  "status": "success",
  "data": null
}
```
 2017-05-02 11:51:09 +02:00
Max Inden
02f14775e5 Merge pull request #754 from prometheus/alerts-endpoint 
Switch to /alerts endpoint and restlye alerts list page
 2017-05-02 11:07:42 +02:00
Max Leonard Inden
ef3cc7b001
Return alert status on /alerts endpoint and enable filtering 
This makes the /alerts endpoint return the alert status introduced by PR
 # 717. In addition it enables alert filtering via matchers like on the
/alerts/groups endpoint.
 2017-05-02 09:46:20 +02:00
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
Łukasz Mierzwa
2c14247adc Fix lock usage in the types package 
Locking is a bit tricky there since some state-modifying methods will call to other methods that also modify marker state, simple defer won't work.
 2017-05-01 20:28:54 +01:00
Fabian Reinartz
91a2b9d717 Merge pull request #759 from prymitive/alert-status-case 
Serialize AlertStatus as 'status'
 2017-04-28 22:35:30 +02:00
Łukasz Mierzwa
8bc5855c87 Serialize AlertStatus as 'status' 
AlertStatus doesn't have json tag with the field name, so it's serialized into 'Status', and it's the only uppercase field in the alert object. Tag it with 'status' name for consistency
 2017-04-28 11:34:01 -07: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
Łukasz Mierzwa
2f4399a3e8 Anchor silence regex rules 
When user creates a new silence with regex match it's left to the user to anchor it, which is not consistent with Prometheus regex handling (promql/functions.go#L818).
 2017-04-26 19:10:16 -07: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