Commit Graph

94 Commits

Author SHA1 Message Date
Julien Pivotto 013177e2d0
Update dependencies (#2257)
Update membership

Update common (support HTTP/2 client)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-05-18 15:00:36 +02:00
Simon Pasquier ad9dcf6d5a
Bump prometheus/client_golang to v1.2.1 (#2072)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-10-18 10:42:00 +02:00
Simon Pasquier cb10f277c1
Bump prometheus/client_golang to v1.2.0 (#2069)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-10-17 09:57:09 +02:00
Simon Pasquier dea2829849
Bump golang 1.13 (#2031)
* *: bump Go version to 1.13

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Fix go.mod and vendor/

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Update Go version for assets generation

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-09-16 12:22:25 +02:00
Simon Pasquier e4437ab54f
*: remove dependency on github.com/prometheus/prometheus (#2009)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-09-16 10:56:29 +02:00
Simon Pasquier d5f6f88928
*: bump Open API dependencies (#2024)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-09-09 10:57:38 +02:00
Carlos Eduardo f21c04b6b1 Update x/sys and x/net modules to support Risc-V (#1984)
* Update x/sys and x/net modules to support Risc-V

Signed-off-by: CarlosEDP <me@carlosedp.com>

* Remove go directive from go.mod

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-08-28 11:33:09 +02:00
Ganesh Vernekar 3207e8b300
Vendor prometheus 2.12.0 (#2008)
* Vendor prometheus 2.12.0

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Update protos

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-08-22 15:34:38 +05:30
Simon Pasquier 94d875f122
Bump prometheus/client_golang to v1.1.0 (#1989)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-08-08 14:36:10 +02:00
beorn7 87ced08129 Update prometheus/client_golang to v1.0.0
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-17 18:12:21 +02:00
Simon Pasquier 6997dc5fe0 Bump github.com/prometheus/common to v0.4.0
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-14 14:26:44 +02:00
Matthias Loibl c7f1eb7553
Use github.com/oklog/run not archived oklog/oklog
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2019-04-22 15:11:40 +02:00
Max Inden 36ffb6ee71
Merge pull request #1811 from simonpasquier/dependabot/go_modules/github.com/hashicorp/go-sockaddr-1.0.2
Dependabot/go modules/GitHub.com/hashicorp/go sockaddr 1.0.2
2019-04-11 18:41:56 +02:00
Simon Pasquier bf43f5b7c2 Update vendor/
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-03-22 17:09:56 +01:00
Paul Gier 8688c7b9ad api/v2: move generated client code from test to api/v2 (#1792)
- Move the generated api/v2 client code out of the test directory
and into the api/v2 directory with models and restapi.
- Remove duplicate models directory
- Update tests to use api/v2 package for models and client

Signed-off-by: Paul Gier <pgier@redhat.com>
2019-03-12 17:11:23 +01:00
Simon Pasquier c7de536129
*: use stdlib context (#1768)
This changes removes all usage of golang.org/x/net/context in the code
base. It also bumps a few dependencies for the same reason:
- github.com/gogo/protobuf
- go-openapi/*

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-02-26 12:18:57 +01:00
Max Leonard Inden 3a38db8faa
vendor: Update to hashicorp/memberlist v0.1.3
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2019-02-05 16:52:53 +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
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
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
Simon Pasquier d2bc742474 *: support Go modules
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-11-20 16:09:40 +01:00
Simon Pasquier e8e70afc44 vendor: fix packages with dubious revision
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Max Leonard Inden <IndenML@gmail.com>
2018-11-16 15:20:53 +01:00
Simon Pasquier 3558e6fd9e Migrate from go-bindata to vfsgen (#1532)
* Migrate from go-bindata to vfsgen

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Ensure idempotent generation for vfsgen

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* asset: update generated files

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Fix asset paths for Windows platforms

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Regenerate assets

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Add vfs wrapper that returns constant mod time

This is identical to what we had with go-bindata and avoids the extra
step of storing the identity of the complete file system in another
location.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Additional cleanup

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-09-24 15:12:40 +02:00
Max Leonard Inden f1b920bcc9
api: Implement OpenAPI generated Alertmanager API V2
The current Alertmanager API v1 is undocumented and written by hand.
This patch introduces a new Alertmanager API - v2. The API is fully
generated via an OpenAPI 2.0 [1] specification (see
`api/v2/openapi.yaml`) with the exception of the http handlers itself.

Pros:
- Generated server code
- Ability to generate clients in all major languages
  (Go, Java, JS, Python, Ruby, Haskell, *elm* [3] ...)
    - Strict contract (OpenAPI spec) between server and clients.
    - Instant feedback on frontend-breaking changes, due to strictly
      typed frontend language elm.
- Generated documentation (See Alertmanager online Swagger UI [4])

Cons:
- Dependency on open api ecosystem including go-swagger [2]

In addition this patch includes the following changes.

- README.md: Add API section

- test: Duplicate acceptance test to API v1 & API v2 version

  The Alertmanager acceptance test framework has a decent test coverage
  on the Alertmanager API. Introducing the Alertmanager API v2 does not go
  hand in hand with deprecating API v1. They should live alongside each
  other for a couple of minor Alertmanager versions.

  Instead of porting the acceptance test framework to use the new API v2,
  this patch duplicates the acceptance tests, one using the API v1, the
  other API v2.

  Once API v1 is removed we can simply remove `test/with_api_v1` and bring
  `test/with_api_v2` to `test/`.

[1]
https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md

[2] https://github.com/go-swagger/go-swagger/

[3] https://github.com/ahultgren/swagger-elm

[4]
http://petstore.swagger.io/?url=https://raw.githubusercontent.com/mxinden/alertmanager/apiv2/api/v2/openapi.yaml

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
2018-09-04 13:38:34 +02:00
Martin Chodur 5d222bce55 feat: added routing tools to amtool (#1511)
Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
2018-08-22 16:41:09 +02:00
Simon Pasquier 387e684faa vendor: update prometheus/common packages (#1414)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-06-13 16:11:22 +02:00
Simon Pasquier 292256ca7f vendor: remove unused packages (#1380)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-05-14 16:23:48 +02:00
Simon Pasquier dc5fc02d22 [amtool] use kingpin.v2 (#1330)
* Use default values to store values from config
* fix typo and reserved keywork
* move to long help texts
* add one more unit test for resolver
* update comments

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-04-24 09:35:15 +02:00
Manos Fokas 300a87e85b Removed file changes to resolve conflict. (#1318)
Signed-off-by: manosf <manosf@protonmail.com>
2018-04-17 16:22:46 +02:00
Simon Pasquier 0c086e3b12 cli: extract client bindings of the v1 API (#1278)
* cli: extract client bindings of the v1 API from amtool

This is a continuation of [1] but the code is kept in the alertmanage
repository rather than having it in client_golang.

[1] https://github.com/prometheus/client_golang/pull/333

Co-Authored-By: Fabian Reinartz <fab.reinartz@gmail.com>
Co-Authored-By: Tristan Colgate <tcolgate@gmail.com>
Co-Authored-By: Corin Lawson <corin@responsight.com>
Co-Authored-By: stuart nelson <stuartnelson3@gmail.com>

* cli: fix httpSilenceAPI.Set() method

* vendor: remove github.com/prometheus/client_golang/api/alertmanager

* cli: don't use the model.Alert type
2018-03-28 19:19:04 +02:00
Simon Pasquier b95b32821f ui: replace deprecated InstrumentHandler() (#1302)
This change replaces the deprecated InstrumentHandler function by
the equivalent functions from the promhttp package.

The following metrics are removed:

* http_request_duration_microseconds (Summary).
* http_request_size_bytes (Summary).
* http_requests_total (Counter).

And the following metrics are added instead:

* alertmanager_http_request_duration_seconds (Histogram).
* alertmanager_http_response_size_bytes (Histogram).
* promhttp_metric_handler_requests_in_flight (Gauge).
* promhttp_metric_handler_requests_total (Counter).
2018-03-28 15:28:38 +02:00
Stuart Nelson 479e5c52ac Update package prometheus/pkg/labels 2018-03-20 16:10:16 +01:00
Frederic Branczyk d678022fea *: configure http client from config 2018-02-13 14:30:59 +01:00
Fabian Reinartz fd49dbb477 *: move to memberlist for clustering 2018-02-08 12:18:44 +01:00
pasquier-s 63598904dc Fix pending connections never going to established (#1204) 2018-01-21 15:09:50 +01:00
Calle Pettersson b7da058efb Switch cmd/alertmanager to kingpin (#974) 2018-01-06 11:22:26 +01:00
Calle Pettersson 608848390f Switch amtool to kingpin (#976)
* Switch cmd/amtool to kingpin

* Touch-ups

* Implement long help

* Add missing short-form of --output

* Fix backwards compatibility for config file options

* Fix vendoring

* Review fixes

* Fix flag word order
2017-12-22 11:17:13 +01:00
Julius Volz b1668866a8 Update vendoring for logger change 2017-10-22 00:20:40 -07:00
Frederic Branczyk de24c5b7ec Fix inhibit race (#1032)
* inhibit: restructure stop logic, to prevent race condition

* vendor oklog/oklog/pkg/group
2017-10-07 13:01:37 +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
stuart nelson a5b2e0bbcc Fixes #925 (#960) 2017-08-22 18:42:30 -05:00
Fazal Majid 2123264b98 updated logrus so alertmanager can build on Solaris/Illumos (#804) 2017-05-18 15:58:30 +02:00
Fabian Reinartz d73a655bf4 Simplify silence modifications, add update endpoint (#796)
* Simplify silence modifications, add update endpoint

* vendor: add pkg/errors

* ui: Handle upserting of silences

.

* Regenerate bindata
2017-05-16 16:48:25 +02:00
Fabian Reinartz 672e9b205f vendor: update mesh 2017-05-09 15:03:27 +02:00
Tom Wilkie ba4fc17307 Remove use of route.Context 2017-04-25 17:43:01 -07: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
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