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

metrics: upgraded prometheus http client #5850

Merged
merged 4 commits into from
Jun 19, 2019
Merged

metrics: upgraded prometheus http client #5850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
226a261
metrics: upgraded prometheus http client to 0.9.4 to address label co…
Jun 18, 2019
f1daa6a
update changelog for GH-5850
Jun 18, 2019
ff2d9c5
Update CHANGELOG.md
Jun 19, 2019
29bafaf
Merge branch 'master' into b-5345-prometheus-metric-label-conflict
Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 0.9.4 (Unreleased)

IMPROVEMENTS:

* api: use region from job hcl when not provided as query parameter in job registration and plan endpoints [[GH-5664](https://github.com/hashicorp/nomad/pull/5664)]
* metrics: add namespace label as appropriate to metrics [[GH-5847](https://github.com/hashicorp/nomad/issues/5847)]

Expand All @@ -9,6 +10,7 @@ BUG FIXES:
* drivers: Fixed an issue preventing external driver plugins from launching executor process [[GH-5726](https://github.com/hashicorp/nomad/issues/5726)]
* drivers/docker: Fixed a bug mounting relative paths on Windows [[GH-5811](https://github.com/hashicorp/nomad/issues/5811)]
* drivers/exec: Upgraded libcontainer dependency to avoid zombie `runc:[1:CHILD]]` processes [[GH-5851](https://github.com/hashicorp/nomad/issues/5851)]
* metrics: upgrade prometheus client to avoid label conflicts [[GH-5850](https://github.com/hashicorp/nomad/issues/5850)]
* ui: Fixed ability to click sort arrow to change sort direction [[GH-5833](https://github.com/hashicorp/nomad/pull/5833)]
cgbaker marked this conversation as resolved.
Show resolved Hide resolved

## 0.9.3 (June 12, 2019)
Expand Down
29 changes: 29 additions & 0 deletions vendor/github.com/prometheus/client_golang/prometheus/build_info.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/prometheus/client_golang/prometheus/build_info_pre_1.12.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 59 additions & 14 deletions vendor/github.com/prometheus/client_golang/prometheus/collector.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 110 additions & 22 deletions vendor/github.com/prometheus/client_golang/prometheus/counter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.