Skip to content

Commit 967a2d5

Browse files
committed
Fix slo-monitor dependencies
1 parent bb6355d commit 967a2d5

File tree

610 files changed

+123459
-94251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

610 files changed

+123459
-94251
lines changed

Diff for: slo-monitor/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
PACKAGE = k8s.io/perf-tests/slo-monitor
16-
TAG = 0.15.1
16+
TAG = 0.15.2
1717
# Image should be pulled from k8s.gcr.io, which will auto-detect
1818
# region (us, eu, asia, ...) and pull from the closest.
1919
REPOSITORY?=k8s.gcr.io

Diff for: slo-monitor/go.mod

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
module k8s.io/perf-tests/slo-monitor
22

33
require (
4-
bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c // indirect
5-
github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 // indirect
64
github.com/golang/glog v0.0.0-20141105023935-44145f04b68c
75
github.com/googleapis/gnostic v0.2.0 // indirect
8-
github.com/matttproud/golang_protobuf_extensions v0.0.0-20150406173934-fc2b8d3a73c4 // indirect
9-
github.com/prometheus/client_golang v0.0.0-20151008143247-e51041b3fa41
10-
github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
11-
github.com/prometheus/common v0.0.0-20151014055050-ffe929a3f4c4 // indirect
12-
github.com/prometheus/procfs v0.0.0-20150928173926-454a56f35412 // indirect
6+
github.com/prometheus/client_golang v1.7.1
137
github.com/spf13/pflag v1.0.1
148
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
159
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect

Diff for: slo-monitor/go.sum

+100-14
Large diffs are not rendered by default.

Diff for: slo-monitor/src/main/slo-monitor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/client-go/tools/clientcmd"
2828

2929
"github.com/golang/glog"
30-
"github.com/prometheus/client_golang/prometheus"
30+
"github.com/prometheus/client_golang/prometheus/promhttp"
3131
"github.com/spf13/pflag"
3232
)
3333

@@ -75,7 +75,7 @@ func main() {
7575
glog.Infof("Starting Performance SLO monitor on port %v", listenURL)
7676

7777
monitors.Register()
78-
http.Handle("/metrics", prometheus.Handler())
78+
http.Handle("/metrics", promhttp.Handler())
7979

8080
kubeClient, err := createKubeClient()
8181
if err != nil {

Diff for: slo-monitor/vendor/bitbucket.org/ww/goautoneg/Makefile

-13
This file was deleted.

Diff for: slo-monitor/vendor/github.com/beorn7/perks/quantile/stream.go

+30-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: slo-monitor/vendor/github.com/cespare/xxhash/v2/.travis.yml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: slo-monitor/vendor/github.com/cespare/xxhash/v2/LICENSE.txt

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: slo-monitor/vendor/github.com/cespare/xxhash/v2/README.md

+67
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: slo-monitor/vendor/github.com/cespare/xxhash/v2/go.mod

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: slo-monitor/vendor/github.com/cespare/xxhash/v2/go.sum

Whitespace-only changes.

0 commit comments

Comments
 (0)