Skip to content
Snippets Groups Projects
Unverified Commit 97ca4616 authored by Frederic Branczyk's avatar Frederic Branczyk Committed by GitHub
Browse files

Merge pull request #575 from stafot/update_adapter_endpoint

Update prometheus-adapter endpoint
parents 17989b42 3cbc97d7
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; ...@@ -15,7 +15,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
prometheusAdapter+:: { prometheusAdapter+:: {
name: 'prometheus-adapter', name: 'prometheus-adapter',
labels: { name: $._config.prometheusAdapter.name }, labels: { name: $._config.prometheusAdapter.name },
prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.namespace + '.svc:9090/', prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.namespace + '.svc.cluster.local:9090/',
config: { config: {
resourceRules: { resourceRules: {
cpu: { cpu: {
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },
"version": "8d3c2f6829d73be15a6684f9324917e72fbf1a31", "version": "74207c04655e1fd93eea0e9a5d2f31b1cbc4d3d0",
"sum": "lEzhZ8gllSfAO4kmXeTwl4W0anapIeFd5GCaCNuDe18=", "sum": "lEzhZ8gllSfAO4kmXeTwl4W0anapIeFd5GCaCNuDe18=",
"name": "prometheus" "name": "prometheus"
}, },
......
...@@ -23,7 +23,7 @@ spec: ...@@ -23,7 +23,7 @@ spec:
- --config=/etc/adapter/config.yaml - --config=/etc/adapter/config.yaml
- --logtostderr=true - --logtostderr=true
- --metrics-relist-interval=1m - --metrics-relist-interval=1m
- --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/ - --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local:9090/
- --secure-port=6443 - --secure-port=6443
image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.7.0 image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.7.0
name: prometheus-adapter name: prometheus-adapter
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment