Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: prometheus/client_golang
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.0
Choose a base ref
...
head repository: prometheus/client_golang
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.7.1
Choose a head ref
  • 8 commits
  • 5 files changed
  • 4 contributors

Commits on Jun 19, 2020

  1. fix time parameter propagation in labels API

    Signed-off-by: yeya24 <yb532204897@gmail.com>
    yeya24 committed Jun 19, 2020
    Copy the full SHA
    94ae577 View commit details

Commits on Jun 21, 2020

  1. histogram.go: fix copy/paste typo

    This method calls NewConstHistogram.
    
    Signed-off-by: Mark Hansen <mark@markhansen.co.nz>
    mhansen committed Jun 21, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7687ac2 View commit details

Commits on Jun 22, 2020

  1. Merge pull request #772 from mhansen/patch-1

    histogram.go: fix copy/paste typo
    beorn7 authored Jun 22, 2020
    Copy the full SHA
    0238879 View commit details
  2. Merge pull request #771 from yeya24/fix-time-range-propagation

    Fix time parameter propagation in labels API
    beorn7 authored Jun 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3df22a4 View commit details

Commits on Jun 23, 2020

  1. Update common Prometheus files

    Signed-off-by: prombot <prometheus-team@googlegroups.com>
    prombot committed Jun 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2cbf08b View commit details
  2. Merge pull request #774 from prometheus/repo_sync

    Synchronize common files from prometheus/prometheus
    beorn7 authored Jun 23, 2020
    Copy the full SHA
    ca603a8 View commit details
  3. Cut v1.7.1

    Signed-off-by: beorn7 <beorn@grafana.com>
    beorn7 committed Jun 23, 2020
    Copy the full SHA
    c5ba386 View commit details
  4. Merge pull request #775 from prometheus/beorn7/release

    Cut v1.7.1
    beorn7 authored Jun 23, 2020
    Copy the full SHA
    fe7bd95 View commit details
Showing with 13 additions and 2 deletions.
  1. +4 −0 CHANGELOG.md
  2. +3 −0 CODE_OF_CONDUCT.md
  3. +1 −1 VERSION
  4. +4 −0 api/prometheus/v1/api.go
  5. +1 −1 prometheus/histogram.go
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.7.1 / 2020-06-23

* [BUGFIX] API client: Actually propagate start/end parameters of `LabelNames` and `LabelValues`. #771

## 1.7.0 / 2020-06-17

* [CHANGE] API client: Add start/end parameters to `LabelNames` and `LabelValues`. #767
3 changes: 3 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Prometheus Community Code of Conduct

Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.0
1.7.1
4 changes: 4 additions & 0 deletions api/prometheus/v1/api.go
Original file line number Diff line number Diff line change
@@ -682,6 +682,8 @@ func (h *httpAPI) LabelNames(ctx context.Context, startTime time.Time, endTime t
q.Set("start", formatTime(startTime))
q.Set("end", formatTime(endTime))

u.RawQuery = q.Encode()

req, err := http.NewRequest(http.MethodGet, u.String(), nil)
if err != nil {
return nil, nil, err
@@ -700,6 +702,8 @@ func (h *httpAPI) LabelValues(ctx context.Context, label string, startTime time.
q.Set("start", formatTime(startTime))
q.Set("end", formatTime(endTime))

u.RawQuery = q.Encode()

req, err := http.NewRequest(http.MethodGet, u.String(), nil)
if err != nil {
return nil, nil, err
2 changes: 1 addition & 1 deletion prometheus/histogram.go
Original file line number Diff line number Diff line change
@@ -607,7 +607,7 @@ func NewConstHistogram(
}

// MustNewConstHistogram is a version of NewConstHistogram that panics where
// NewConstMetric would have returned an error.
// NewConstHistogram would have returned an error.
func MustNewConstHistogram(
desc *Desc,
count uint64,