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

Update monitoring components to the latest released versions. #3743

Merged
merged 2 commits into from
Jan 23, 2015
Merged

Update monitoring components to the latest released versions. #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bbb3e
Update monitoring components to the latest released versions.
vishh Jan 22, 2015
adbbfbf
Improve monitoring e2e test.
vishh Jan 23, 2015
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: 1 addition & 1 deletion cluster/addons/cluster-monitoring/grafana-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1beta1"
kind: "Service"
id: "monitoring-grafana"
port: 8087
port: 80
containerPort: 80
selector:
name: "influxGrafana"
6 changes: 5 additions & 1 deletion cluster/addons/cluster-monitoring/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ desiredState:
id: "monitoring-heapsterController"
containers:
- name: "heapster"
image: "kubernetes/heapster:v0.5"
image: "kubernetes/heapster:v0.6"
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"

labels:
name: "heapster"
uses: "monitoring-influxdb"
Expand Down
7 changes: 7 additions & 0 deletions cluster/addons/cluster-monitoring/heapster-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: "v1beta1"
kind: "Service"
id: "monitoring-heapster"
port: 80
containerPort: 8082
selector:
name: "heapster"
4 changes: 2 additions & 2 deletions cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ desiredState:
id: "monitoring-influxGrafanaController"
containers:
- name: "influxdb"
image: "kubernetes/heapster_influxdb:v0.2"
image: "kubernetes/heapster_influxdb:v0.3"
ports:
- containerPort: 8083
hostPort: 8083
- containerPort: 8086
hostPort: 8086
- name: "grafana"
image: "kubernetes/heapster_grafana:v0.2"
image: "kubernetes/heapster_grafana:v0.3"
ports:
- containerPort: 80
hostPort: 80
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/influxdb-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1beta1"
kind: "Service"
id: "monitoring-influxdb"
port: 8085
port: 80
containerPort: 8086
selector:
name: "influxGrafana"
7 changes: 7 additions & 0 deletions hack/e2e-suite/monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ function setup {
function cleanup {
"${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true
"${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true
while kubectl.sh get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \
|| kubectl.sh get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do
sleep 2
done
"${KUBECTL}" delete -f "${MONITORING}/" &> /dev/null || true

# This only has work to do on gce and gke
Expand Down Expand Up @@ -104,6 +108,9 @@ function wait-for-pods {

trap cleanup EXIT

# Remove any pre-existing monitoring services.
cleanup

# Start monitoring pods and services.
setup

Expand Down