Commit Graph

1775 Commits

Author SHA1 Message Date
Max Leonard Inden
09a7370572
main.go: Move marker metric registering into types/types.go
Instead of registering marker metrics inside of
cmd/alertmanager/main.go, register them in types/types.go, encapsulating
marker specific logic in its module, not in main.go. In addition it
paves the path for removing the usage of the global metric registry in
the future, by taking a local metric registerer.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-02-05 14:59:22 +01:00
Max Inden
083639e31e
Merge pull request #1736 from mxinden/combine-apis
api: Combine v1 and v2 into generic api
2019-02-05 09:17:18 +01:00
Max Leonard Inden
c57542127d
api: Combine v1 and v2 into generic api
Instead of cmd/alertmanager/main.go instantiating and starting both api
v1 and v2, delegate that work to a generic api combining the two.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-02-04 14:31:33 +01:00
Max Inden
5c5ff9e769
Merge pull request #1728 from mxinden/nil-peer-master
api/v2: Make cluster status peers and name optional
2019-02-04 12:12:14 +01:00
Max Leonard Inden
8e157b3af5
api/v2: Make cluster status peers and name optional
If a users chooses to disable the Alertmanager cluster feature, there is
no cluster name nor cluster peers. Hence these should be optional. Only
cluster status is set to "disabled".

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-02-04 11:40:30 +01:00
JoeWrightss
5c61f4dbc8 Fixs typo in README.md (#1687)
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-01 16:49:57 +01:00
Max Inden
f1bf34b234
Merge pull request #1732 from mxinden/back-to-master
*: Cut v0.16.1 - back to master
2019-01-31 17:33:24 +01:00
Max Leonard Inden
d90c52d6a1
*: Cut v0.16.1
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-01-31 16:57:20 +01:00
Max Leonard Inden
2f055d9966
api/v2: Do not populate cluster info if clustering is disabled
When users start Alertmanager with `--cluster.listen-address=`, the
cluster will not be initialized, hence api.peer will be `nil`. So far
this would result in a nil pointer dereference by the API v2 accessing
the api.peer field.

With this patch, api v2 skips populating the peers array, sets the name
to an empty string and the status to "disabled" in case `api.peer` is
nil.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-01-31 16:56:59 +01:00
Ye Ben
5f8eaf9560 cluster/delegate: Replace labels to const to reduce hardcode (#1724)
Signed-off-by: yeya24 <ben.ye@daocloud.io>
2019-01-28 10:17:55 +01:00
Stefan Büringer
fc1153560d trim PagerDuty message summary to 1024 chars, add PagerDuty debug log (#1701)
PagerDuty Alerts are rejected (a 400 BadRequest is sent back from PagerDuty)
when the summary field is longer than 1024 characters
(https://v2.developer.pagerduty.com/docs/send-an-event-events-api-v2).

Signed-off-by: Stefan Bueringer <sbueringer@gmail.com>
2019-01-24 14:38:35 +01:00
Hrishikesh Barman
23e7fec030 scripts/genproto.sh: Add version locking for protobuf extensions (#1707)
Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
2019-01-22 11:48:37 +01:00
Max Inden
3f5b6924e8
Merge pull request #1716 from mxinden/back-to-master
*: Cut v0.16.0 back to master
2019-01-22 10:26:13 +01:00
Max Leonard Inden
a0b7f6eea3
*: Cut v0.16.0
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-01-21 14:00:55 +01:00
Max Inden
705abf31c2
Merge pull request #1711 from mxinden/disable-redoc
api/v2: Disable serving swagger spec and redoc UI
2019-01-17 17:12:13 +01:00
Max Leonard Inden
7aa8ea9d9d
api/v2: Disable serving swagger spec and redoc UI
By default go-swagger serves the swagger spec and the redoc UI. This
patch disables both.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-01-17 16:19:29 +01:00
Max Inden
96a0f06d3d
Merge pull request #1710 from mxinden/back-to-master
*: Cut v0.16.0-beta.0 back to master
2019-01-16 14:51:30 +01:00
Max Leonard Inden
71997ffc49
*: Cut v0.16.0-beta.0
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-01-15 21:51:12 +01:00
Hrishikesh Barman
4e424e3cd6 config: Change DefaultGlobalConfig to a function (#1656)
The variable DefaultGlobalConfig was being used to initialize values, but it stored previous information due to which some things were persisting in the newer initialization.

In this PR, DefaultGlobalConfig is changed to a function so that it returns a fresh GlobalConfig for initialization.

Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
2019-01-15 18:03:45 +01:00
Jason Roberts
b02afcad63 Support adding custom fields to VictorOps notifications (#1420)
* Support adding custom fields to VictorOps notifications

* Response to feedback

* Added logic to validate victorops custom fields to config load time

* Cleanup victorops notifier of logic duplicated in config check

* rebase and further cleanup from feedback

* another grammer fix

Signed-off-by: Jason Roberts <jroberts@drud.com>
2019-01-15 11:59:05 +01:00
stuart nelson
dba283edd0
respect regex matchers when recreating silences (#1697)
* Respect regexes when recreating silences
* Generate assets

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
2019-01-09 10:33:43 +01:00
stuart nelson
b437240bd9
Stn/update alert compact view (#1698)
* Remove inhibited/silenced text

In the alert list, this is already seen via the
icons. In the silence preview, since it's in the
silence preview, clearly it's affected by the
silence.

* Generate assets

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
2019-01-08 16:26:12 +01:00
Hrishikesh Barman
dc74b6a15b support for assuming first label is alertname in silence add and query (#1693)
* simplified setting first assumed alertname in cli/silence_query.go
* added assumed first label to alertname when adding silences

Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
2019-01-07 13:49:41 +01:00
Brian Brazil
7078333202 Make a copy of firing alerts with EndsAt=0 when flushing. (#1686)
If the original EndsAt is left in place, then as time moves forwards
past the EndsAt then firing alerts will be rendered and treated as
resolved alerts which can cause confusion and races. This is most
likely to happen on retries for a notification.

Mitigate race and fix data races in TestAggrGroup.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-01-04 16:52:20 +01:00
Simon Pasquier
b676fa79c0 *: update Makefile.common with new staticcheck (#1692)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-01-04 15:37:33 +01:00
Tomas Dabasinskas
cfc0d9c558 Pushover: support HTML, URL title and custom sounds (#1634)
* Support HTML inside Pushover message

Signed-off-by: Tomas Dabasinskas <tomas@dabasinskas.net>
2018-12-18 15:15:30 +01:00
Simon Pasquier
16be34fed8 Bump prometheus/client_golang to v0.9.2 (#1670)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-12-17 11:05:40 +01:00
Simon Pasquier
9a116736ef api/v2: Add CORS support (#1667)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-12-16 14:05:34 +01:00
JoeWrightss
9ccbeb585b cluster: Fix typo in comment (#1668)
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-16 14:03:55 +01:00
Paul Traylor
cd4a524848 Update prometheus/common and add support for --log.format (#1658)
Signed-off-by: Paul Traylor <paul.traylor@linecorp.com>
2018-12-13 12:58:43 +01:00
stuart nelson
082b1efed0
Fix #1662 (#1665)
GroupByAll and a duplicate GroupBy were showing up
in the marshaled config, which we don't want.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
2018-12-13 11:51:49 +01:00
Simon Pasquier
34f78c9146 config: fix unmarshalling of secret URLs (#1663)
* config: fix unmarshalling of secret URLs

* Add comment describing why we need the special case

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-12-13 11:09:02 +01:00
Sylvain Rabot
f1d33fbcc2 Travis: specify go_import_path (#1653)
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
2018-12-10 15:37:13 +01:00
Max Inden
c850bdd334
Merge pull request #1652 from prometheus/release-0.16
CHANGELOG.md: Fix date typo, back to master
2018-12-09 12:33:43 +01:00
Hrishikesh Barman
78914f868d added documentation (#1654)
* ref #1610 : added documentation

Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
2018-12-08 12:05:47 +01:00
Max Inden
9bcf4e660b
Merge pull request #1647 from mxinden/fix-date-typo
CHANGELOG.md: Fix date typo
2018-12-05 16:35:39 +01:00
Richard Hartmann
ac058957e7
Merge pull request #1648 from swinslow/mem-license-stmt
Fixed typo in license statement URL
2018-12-03 19:41:30 +01:00
Steve Winslow
8ca1f66a2d Fixed typo in license statement URL
Signed-off-by: Steve Winslow <swinslow@gmail.com>
2018-12-02 08:12:09 -05:00
Max Leonard Inden
9e86cb47af
CHANGELOG.md: Fix date typo
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2018-11-30 23:16:28 +01:00
Max Inden
cb1f78cc78
Merge pull request #1646 from mxinden/cut-v0.16.0-alpha.0
*: Cut v0.16.0-alpha.0
2018-11-30 23:10:20 +01:00
Max Leonard Inden
e30c73d420
*: Cut v0.16.0-alpha.0
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2018-11-30 14:20:18 +01:00
Max Inden
dbe6510827
Merge pull request #1641 from simonpasquier/fix-promu-cfg
promu: fix ldflags for Go modules
2018-11-29 12:42:36 +01:00
kirillsablin
32bb289906 dispatch: Add group_by_all support (#1588)
To aggregate by all possible labels use '...' as the sole label name. 
This effectively disables aggregation entirely, passing through all 
alerts as-is. This is unlikely to be what you want, unless you have 
a very low alert volume or your upstream notification system performs 
its own grouping. Example: group_by: [...]

Signed-off-by: Kyryl Sablin <kyryl.sablin@schibsted.com>
2018-11-29 12:31:14 +01:00
Max Inden
758b5e3bb1
Merge pull request #1640 from mxinden/all-of-alert
api/v2: Extract shared properties of gettable and postable alert
2018-11-29 12:26:24 +01:00
Simon Pasquier
60e991ab39 promu: fix ldflags for Go modules
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-11-29 10:36:13 +01:00
Max Leonard Inden
2b697aaa6b
api/v2: Extract shared properties of gettable and postable alert
With issue 1465 on openapi-generator [1] being fixed, we can not extract
shared properties of the gettable and postable alert definition into a
shared object (`alert`) like we do for silence, gettable silence and
postable silence.

In addition this patch does the following changes to the UI:

- Use `List GettableAlert` instead of plural type definition like
`GettableAlerts` because the plural definitions are not generated.

- Fix openapi-generator-cli docker image to specific hash.

[1] https://github.com/OpenAPITools/openapi-generator/issues/1465

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2018-11-28 14:35:39 +01:00
Max Inden
218b8fb1f4 ui: Pass parameterized api url down to status logic (#1637)
Previously the api url was hardcoded in the elm logic fetching the
status of an Alertmanager. Instead it is now being passed down like we
already did for /alerts, /silences and /receivers.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2018-11-27 15:33:19 +01:00
Max Inden
37e019017b
Merge pull request #1630 from simonpasquier/go-modules
*: support Go modules
2018-11-27 15:32:13 +01:00
Max Inden
091a8a83b1
Merge pull request #1632 from mxinden/alerts-api-v2
ui: Move alerts to api v2
2018-11-26 14:28:13 +01:00
Max Inden
2962039407
Merge pull request #1633 from simonpasquier/fix-v2-with-prefix
Fix route prefix for the API v2
2018-11-26 13:08:12 +01:00