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

Updating heapster version to v0.9. #5485

Merged
merged 1 commit into from
Mar 16, 2015
Merged

Updating heapster version to v0.9. #5485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 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,10 +12,21 @@ desiredState:
id: monitoring-heapster
containers:
- name: heapster
image: kubernetes/heapster:v0.8
image: kubernetes/heapster:v0.9
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"
- name: "SINK"
value: "influxdb"
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
volumes:
- name: ssl-certs
source:
hostDir:
path: /etc/ssl/certs
labels:
name: heapster
uses: monitoring-influxdb
Expand Down
6 changes: 4 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 @@ -22,7 +22,7 @@ desiredState:
- containerPort: 8086
hostPort: 8086
- name: grafana
image: kubernetes/heapster_grafana:v0.4
image: kubernetes/heapster_grafana:v0.5
env:
- name: "HTTP_USER"
value: "admin"
Expand All @@ -31,9 +31,11 @@ desiredState:
- name: "INFLUXDB_PROTO"
value: "https"
- name: "INFLUXDB_HOST"
value: '"+window.location.hostname+"/api/v1beta1/proxy/services/monitoring-influxdb'
value: "localhost"
- name: "INFLUXDB_PORT"
value: ""
- name: "KUBERNETES_API_PORT"
value: ""
labels:
name: influxGrafana
kubernetes.io/cluster-service: "true"
6 changes: 3 additions & 3 deletions test/e2e/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const (
influxdbDatabaseName = "k8s"
influxdbUser = "root"
influxdbPW = "root"
podlistQuery = "select distinct(pod) from stats"
nodelistQuery = "select distinct(hostname) from machine"
podlistQuery = "select distinct(pod_id) from /cpu.*/"
nodelistQuery = "select distinct(hostname) from /cpu.*/"
sleepBetweenAttempts = 5 * time.Second
testTimeout = 5 * time.Minute
)
Expand Down Expand Up @@ -89,7 +89,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error
return nil, err
}
for _, pod := range podList.Items {
expectedPods = append(expectedPods, pod.Name)
expectedPods = append(expectedPods, string(pod.UID))
}
}
}
Expand Down