Commit Graph

959 Commits

Author SHA1 Message Date
Steve Durrheimer
560bfaf541
Use golang-builder base image for tests in CircleCI 2016-09-09 08:29:12 +02:00
Fabian Reinartz
8809ea2207 Merge pull request #493 from prometheus/readme
Update README
2016-09-07 14:44:26 +02:00
Fabian Reinartz
d0c574d318 readme: point to prometheus.io download section 2016-09-07 14:30:57 +02:00
Fabian Reinartz
4ec5208da4 Update README
This removes some things that no longer apply and syncs the installation intructions with the Prometheus repository
2016-09-06 17:00:52 +02:00
Fabian Reinartz
8583a2c173 Merge pull request #492 from brancz/retry-flag
add retry flag for notify providers
2016-09-06 16:32:25 +02:00
Frederic Branczyk
92acfbd449 add retry flag for notify providers
The retry flag allows an integration to specify whether a retry can
potentially be solved or if the error is likely not going to recover.
For example invalid authentication is likely a wrong configuration and
therefore a retry would not make sense, while a server error is likely
a temporary problem and can potentially be solved on the next retry.
2016-09-06 16:21:56 +02:00
Fabian Reinartz
bf6d47934e Merge pull request #489 from prometheus/timeout
*: consider mesh wait in notification timeouts
2016-09-06 14:17:53 +02:00
Fabian Reinartz
b2461bb2d4 *: remove go-kit logging 2016-09-06 11:56:57 +02:00
Fabian Reinartz
50057906d0 vendor: update client lib and common 2016-09-06 11:50:13 +02:00
Fabian Reinartz
60bb55b4aa example: fix config typo 2016-09-06 11:10:29 +02:00
Fabian Reinartz
d263b7ab9a Merge pull request #487 from vanesa/master
allow CORS for api GET and OPTIONS
2016-09-05 13:26:49 +02:00
Fabian Reinartz
e9fbe62e0f *: consider mesh wait in notification timeouts
This adds the peer wait duration to the standard timeout to avoid
terminating a notification prematurely while being in failover
wait status.
2016-09-05 13:21:28 +02:00
Fabian Reinartz
c01c1989a7 config: check overflow in global section 2016-09-05 11:30:07 +02:00
Fabian Reinartz
44bde96447 examples: pretty print JSON in webhook 2016-09-05 11:17:28 +02:00
Vanesa
9d766e1843 allow CORS for api GET and OPTIONS 2016-09-04 17:43:25 +02:00
Fabian Reinartz
4ac976c7e6 Merge branch 'master' of github.com:prometheus/alertmanager 2016-08-31 12:03:06 +02:00
Fabian Reinartz
dd7a9277a6 example: add HA config file 2016-08-31 12:02:16 +02:00
Fabian Reinartz
8d88d9e05b Merge pull request #481 from prometheus/fabxc-meshsil
*: integrate new silence package
2016-08-30 16:53:34 +02:00
Fabian Reinartz
98101f3868 silence: fix doc strings 2016-08-30 14:19:22 +02:00
Fabian Reinartz
a4e8703567 *: integrate new silence package 2016-08-30 12:15:23 +02:00
Fabian Reinartz
3b5dfa8aba provider: delete old silence provider 2016-08-30 12:01:24 +02:00
Fabian Reinartz
67d53f3a9f Merge pull request #474 from prometheus/fabxc-meshsil
silence: add protobuf-based silence package
2016-08-30 10:44:32 +02:00
Fabian Reinartz
9097386356 Merge pull request #480 from prometheus/sdurrheimer-use-promu-default-go-version
Use promu default go version + use 1.6 tag for cicleci tests
2016-08-30 09:54:15 +02:00
Steve Durrheimer
bc67bce73b
Use promu default go version + use 1.6 tag for cicleci tests 2016-08-30 09:23:02 +02:00
Fabian Reinartz
ed3fdc747d silence: add protobuf-based silence package.
This commit adds an implementation of a silence storage that can
share store and modify silences, share state via a mesh network,
write and load snapshots, and be dynamically queried.
All data formats are based on protocol buffers.
2016-08-24 17:48:31 +02:00
Fabian Reinartz
fcda6fede3 Merge pull request #458 from pdbogen/pdbogen-error-on-nonflag-args
Pdbogen error on nonflag args
2016-08-23 14:25:53 +02:00
Fabian Reinartz
1baf98fb1a provider: remove NotificationInfos provider 2016-08-23 13:57:19 +02:00
Fabian Reinartz
d6713c8eeb nflog: enable sharing log via gossip 2016-08-19 12:20:04 +02:00
Fabian Reinartz
d48b4e5dbd examples: add Go logging webhook 2016-08-19 12:13:39 +02:00
Fabian Reinartz
5dc8286942 nflog: fix maintenance termination 2016-08-19 12:01:16 +02:00
Fabian Reinartz
6f8c9673b2 Merge pull request #467 from prometheus/fabxc-meshproto3
*: integrate nflog
2016-08-18 16:03:19 +02:00
Fabian Reinartz
72fdf3d3ab *: integrate nflog
This commit replaces the previous NotifyInfo provider with the new
nflog package. It needs adjustments in the behavior of the deduping
stage.
The nflog stores notification digests per receiver per alert aggregation
group rather than one entry for alert per receiver. This drastically
reduces the number of entries and removes interference
across aggregation groups.
2016-08-18 15:52:28 +02:00
Fabian Reinartz
374e984444 Merge branch 'master' of github.com:prometheus/alertmanager 2016-08-18 14:42:56 +02:00
Fabian Reinartz
a833522232 Merge pull request #463 from prometheus/notify-recv
Reduce runtime context dependencies
2016-08-18 14:41:39 +02:00
Fabian Reinartz
a52992196b Merge pull request #464 from prometheus/fabxc-stagectx
notify: include context in Stage interface
2016-08-18 14:41:17 +02:00
Fabian Reinartz
9f8845d036 Merge pull request #460 from prometheus/fabxc-meshproto
nflog: append-only log for notification information
2016-08-18 14:40:03 +02:00
Fabian Reinartz
a42a473213 nflog: add doc comments, license headers 2016-08-18 14:08:01 +02:00
Fabian Reinartz
d2a556b269 notify: include context in Stage interface
This adds context.Context to the return arguments of a Stage.
This is necessary to propagate modified contexts.
2016-08-18 11:42:37 +02:00
Patrick Bogen
ca844915b3
alertmanager should raise an error if unexpected arguments are present on the command line 2016-08-16 11:15:45 -07:00
Fabian Reinartz
ed4f295c70 notify: embed nflogpb.Receiver in stage
This commit directly adds the nflogpb.Receiver object to stage
objects at stage creation time. Hence, we no longer rely on a value from
within the context.
2016-08-16 16:40:42 +02:00
Fabian Reinartz
4a5df40539 nflog: add logging 2016-08-16 16:33:17 +02:00
Fabian Reinartz
998a9ce38e notify: rename Receiver to ReceiverName
This string value is initially used to store a receiver name. It is
later overloaded with a unique string identifier of <name, integration,
index>.
This renaming is in preparation to separate the two and use the Receiver
object of the nflogpb package.
2016-08-16 16:33:17 +02:00
Fabian Reinartz
b40703a584 vendor: add github.com/go-kit/kit/log 2016-08-16 16:33:17 +02:00
Fabian Reinartz
48b6c8ff70 nflog: add initial tests 2016-08-16 11:11:48 +02:00
Fabian Reinartz
36b2e89f27 vendor: add testify package and dependencies 2016-08-16 11:11:48 +02:00
Fabian Reinartz
086d581cf8 nflog: add gc/snapshotting maintenance, remove delete
This removes the Delete function from the interface as the log
should be append-only and only be reduced by expired entries.
This also adds an argument to configure a background processing routine,
which periodically garbage collects and snapshots.
2016-08-16 11:11:48 +02:00
Fabian Reinartz
80afd502d5 nflog: add mesh gossip support 2016-08-16 11:11:48 +02:00
Fabian Reinartz
3d8e60ded7 nflog: add notification log package
This adds a new nflog package meant to replace provider.Notifies. It
has a central protobuf type package, which is also meant for usage for
other packages and the API.
The generated Go types are also the in-memory representation.
2016-08-16 11:11:48 +02:00
Fabian Reinartz
cbdcf0a983 vendor: add protobuf related dependencies 2016-08-16 11:11:48 +02:00
Fabian Reinartz
f1cddf5a63 Merge pull request #459 from brancz/refactor-notification-pipeline
refactor notification pipeline
2016-08-16 11:11:16 +02:00