github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

bump heapster to v0.11.0 and grafana to v0.7.0

Browse Source
This commit is contained in:
Ido Shamun 2015-05-01 19:42:30 +03:00
parent 72708d74b9
commit 37040fb0e3
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/cluster-monitoring/heapster-controller.yaml
View File

@ -12,14 +12,12 @@ desiredState:
id: monitoring-heapster id: monitoring-heapster
containers: containers:
- name: heapster - name: heapster
image: gcr.io/google_containers/heapster:v0.10.0 image: gcr.io/google_containers/heapster:v0.11.0
env: env:
- name: "INFLUXDB_HOST" - name: "INFLUXDB_HOST"
value: "monitoring-influxdb" value: "monitoring-influxdb"
- name: "SINK" - name: "SINK"
value: "influxdb" value: "influxdb"
- name: "FLAGS"
value: "--kubelet_port=10255"
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs

2
cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
View File

@ -22,7 +22,7 @@ desiredState:
- containerPort: 8086 - containerPort: 8086
hostPort: 8086 hostPort: 8086
- name: grafana - name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.6 image: gcr.io/google_containers/heapster_grafana:v0.7
env: env:
- name: "INFLUXDB_EXTERNAL_URL" - name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/' value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'

6
cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
View File

@ -16,15 +16,13 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.10.0 - image: gcr.io/google_containers/heapster:v0.11.0
name: heapster name: heapster
env: env:
- name: "INFLUXDB_HOST" - name: "INFLUXDB_HOST"
value: "monitoring-influxdb" value: "http://monitoring-influxdb"
- name: "SINK" - name: "SINK"
value: "influxdb" value: "influxdb"
- name: "FLAGS"
value: "--kubelet_port=10255"
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs

4
cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
View File

@ -24,10 +24,10 @@ spec:
- containerPort: 8086 - containerPort: 8086
hostPort: 8086 hostPort: 8086
- name: grafana - name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.6 image: gcr.io/google_containers/heapster_grafana:v0.7
env: env:
- name: "INFLUXDB_EXTERNAL_URL" - name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/' value: '/api/v1beta3/proxy/namespaces/system/services/monitoring-grafana/db/'
- name: "INFLUXDB_HOST" - name: "INFLUXDB_HOST"
value: 'monitoring-influxdb' value: 'monitoring-influxdb'
- name: "INFLUXDB_PORT" - name: "INFLUXDB_PORT"