Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump v0.20.0 #30

Merged
merged 47 commits into from Dec 19, 2019
Merged

Bump v0.20.0 #30

merged 47 commits into from Dec 19, 2019

Conversation

simonpasquier
Copy link

No description provided.

prombot and others added 30 commits August 30, 2019 00:08
@prombot
makefile: update Makefile.common with newer version
ccc01f0 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
@stuartnelson3
Merge pull request prometheus#2016 from prometheus/makefile_common
f2cacf4 
Synchronize Makefile.common from prometheus/prometheus
@simonpasquier
Merge release-0.19 branch to master (prometheus#2020)
8beee36 
* Cut v0.19.0 (prometheus#2017)

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

* Fix CHANGELOG.md (prometheus#2018)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
*: bump Open API dependencies (prometheus#2024)
d5f6f88 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@prombot @simonpasquier
makefile: update Makefile.common with newer version (prometheus#2030)
c07f76f 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
@simonpasquier
*: remove dependency on github.com/prometheus/prometheus (prometheus#…
e4437ab 
…2009)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Bump golang 1.13 (prometheus#2031)
dea2829 
* *: 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>
@TheMeier @simonpasquier
Add docs for cluster.reconnect flags (prometheus#1991)
223dd6c 
fixes prometheus#1820

Signed-off-by: Christoph Maser <christoph.maser+github@gmail.com>
@simonpasquier
dispatch: don't garbage-collect alerts from store
4535311 
The aggregation group is already responsible for removing the resolved
alerts. Running the garbage collection in parallel introduces a race and
eventually resolved notifications may be dropped.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@oddlittlebird @simonpasquier
Update README.md (prometheus#2032)
bc6dd0d 
* Update README.md

Minor grammar fixes. Mostly correcting capitalization.

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Update README.md

Applied edits

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Update README.md

Removed a period and deleted unnecessary lines from License section

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Reword the contributing section

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@johncming @simonpasquier
notify/wechat: adjust result check sequence. (prometheus#2044)
7d21f5a 
Signed-off-by: johncming <johncming@yahoo.com>
@brancz
Merge pull request prometheus#2040 from simonpasquier/dont-gc-alerts-…
76f339f 
…in-aggr-groups

dispatch: don't garbage-collect alerts from store
@johncming @simonpasquier
types: remove unused equal method and add test case. (prometheus#2043)
52b4cec 
Signed-off-by: johncming <johncming@yahoo.com>
@johncming @simonpasquier
nflog: use errors.New instead of fmt.Errorf for no custom error msg. (p…
3116506 
…rometheus#2045)

Signed-off-by: johncming <johncming@yahoo.com>
@johncming @simonpasquier
api/v1: return error more clear and common. (prometheus#2050)
5ef7069 
Signed-off-by: johncming <johncming@yahoo.com>
@johncming @simonpasquier
dispatch: route group labels should contain group common label. (prom…
bad2e79 
…etheus#2055)

Signed-off-by: johncming <johncming@yahoo.com>
@stephenreddek @simonpasquier
Disable the grammarly plugin on all textareas to prevent inserted nod…
f3a2ff8 
…es from crashing the vdom (prometheus#2061)

Signed-off-by: Stephen Reddekopp <stephen.reddekopp@gmail.com>
@ntk148v @simonpasquier
Consolidate invalid address log (prometheus#2063)
ca38930 
The Invalid listen address errors should be as
same as Invalid advertise address.

Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>
@simonpasquier
Bump prometheus/client_golang to v1.2.0 (prometheus#2069)
cb10f27 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Bump prometheus/client_golang to v1.2.1 (prometheus#2072)
ad9dcf6 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
ui/app: fix silences filter (prometheus#2075)
5211fad 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
.circleci/config.yml: cache Go modules (prometheus#2076)
b210031 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@perlun
Update README.md
b33bd61 
Added link to goreman repo.

Signed-off-by: Per Lundberg <perlun@gmail.com>
@mxinden
Merge pull request prometheus#2078 from perlun/patch-1
23c7a3f 
Add goreman link
@simonpasquier
store: fix potential flaky test (prometheus#2077)
25b3243 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@n33pm @simonpasquier
Add email notify Message-Id Header (prometheus#2057)
a75cd02 
* add email message-id

Signed-off-by: PM <wugyresearcher@gmail.com>

* check if message-id already exists

Signed-off-by: PM <wugyresearcher@gmail.com>

* simplify mail message-id procedure

Signed-off-by: PM <wugyresearcher@gmail.com>

* Add unit test

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
config: forbid nil regexp matchers (prometheus#2083)
0630b38 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
config: remove support for JSON marshaling (prometheus#2086)
918f08b 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
notify/pagerduty: check that PagerDuty keys aren't empty (prometheus#…
71b3b3d 
…2085)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@qoops-1 @simonpasquier
At least one non-empty silence matcher (prometheus#2081)
196c62f 
* check if at least one silence matcher doesn't match empty strings

Signed-off-by: qoops <ilya.v.gladyshev@gmail.com>

* fixed grammar

Signed-off-by: qoops <ilya.v.gladyshev@gmail.com>
CharlesJUDITH and others added 17 commits November 10, 2019 18:01
@CharlesJUDITH @mxinden
README.md: Add consistency for amtool examples (prometheus#2099)
64acc9b 
All the examples are written with `$ amtool` except for two of them.
This change will add `$ amtool` for all of them.

Signed-off-by: Charles JUDITH <c.judith@criteo.com>
@vrischmann @brian-brazil
template: add the default template function stringSlice (prometheus#2101
66a0ed2 
)

Since it's impossible to create a string slice in a Go template by
default, add a function to work around this problem.

The use case is to make it easy to call KV.Remove with an arbitrary
slice inside a template.

Signed-off-by: Vincent Rischmann <vincent@rischmann.fr>
@johncming @simonpasquier
notify: optimize length check. (prometheus#2106)
d965ac6 
Signed-off-by: johncming <johncming@yahoo.com>
@NotAFile @simonpasquier
add elm-* to ui/app make clean (prometheus#2098)
4ec5356 
Signed-off-by: NotAFile <nota@notafile.com>
@roidelapluie @simonpasquier
slack: retry 429 errors (prometheus#2112)
26cc96a 
Fix prometheus#2111

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
@Pger-Y @simonpasquier
cluster: change lock from Read lock to Write Lock since function modi…
f76fec1 
…fies the struct... (prometheus#2109)

Signed-off-by: John Smith <megman5576@gmail.com>
@simonpasquier
Fix TestClusterJoinAndReconnect on macos (prometheus#2110)
21e99dc 
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
@simonpasquier
dispatch: add metrics (prometheus#2113)
4f45457 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
cmd/alertmanager: log unused receivers + add alertmanager_receivers m…
324c44c 
…etric (prometheus#2114)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@johncming @simonpasquier
types: remove redundant statements. (prometheus#2116)
df1f1c8 
Signed-off-by: johncming <johncming@yahoo.com>
@simonpasquier
cmd/alertmanager: add alertmanager_integrations metric (prometheus#2117)
2a1204e 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Cut 0.20.0-rc.0 (prometheus#2119)
89db909 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Revert "slack: retry 429 errors (prometheus#2112)" (prometheus#2128)
052707f 
This reverts commit 26cc96a.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Revert "config: remove support for JSON marshaling (prometheus#2086)" (…
ed6434c 
…prometheus#2133)

This reverts commit 918f08b.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
config: fix JSON unmarshaling for HostPort (prometheus#2134)
06adefb 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Cut 0.20.0 (prometheus#2137)
f74be04 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Merge tag 'v0.20.0' into aos-master
90eb7cb 
v0.20.0

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 12, 2019
pgier
pgier approved these changes Dec 19, 2019
View reviewed changes
Copy link

@pgier pgier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pgier, simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [pgier,simonpasquier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit d597b1e into openshift:master Dec 19, 2019
@simonpasquier simonpasquier deleted the bump-v0.20.0 branch December 20, 2019 11:55
philipgough pushed a commit to philipgough/prometheus-alertmanager that referenced this pull request Feb 19, 2024
@dislbenn
[release-2.6] Updated go to 1.18 (openshift#30)
76049de 
* updated go to 1.18

Signed-off-by: dislbenn <dbennett@redhat.com>

* updated travis to use 1.18

Signed-off-by: dislbenn <dbennett@redhat.com>

* removed travis build

Signed-off-by: dislbenn <dbennett@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pgier pgier pgier approved these changes

@s-urbaniak s-urbaniak Awaiting requested review from s-urbaniak

Assignees

@pgier pgier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet