From 341fc9fcce2b7176233f1293e448d363c33acc70 Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Mon, 30 Mar 2015 23:42:54 +0000 Subject: [PATCH] Heapster v0.10.0 release and Grafana v0.6 release --- RELEASES.md | 7 +++++++ deploy/kube-config/grafana-service.yaml | 3 +++ deploy/kube-config/heapster-controller.yaml | 3 ++- deploy/kube-config/heapster-service.yaml | 3 +++ deploy/kube-config/influxdb-grafana-controller.yaml | 5 ++++- deploy/kube-config/v1beta3/heapster-controller.yaml | 2 +- .../kube-config/v1beta3/influxdb-grafana-controller.yaml | 2 +- grafana/RELEASES.md | 2 +- grafana/config.js.tmpl | 2 +- version/version.go | 7 ++++--- 10 files changed, 27 insertions(+), 9 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 514e70342b..f3d8b7a838 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,12 @@ # Release Notes +## 0.10.0 (3-30-2014) +- Downsampling - Resolution of metrics is set to 5s by default. +- Support for using Kube client auth. +- Improved Influxdb sink - sequence numbers are generated for every metric. +- Reliability improvements +- Bug fixes. + ## 0.9 (3-13-2014) - [Standardized metrics](sinks/api/supported_metrics.go) - New [common API](sinks/api/types.go) in place for all external storage drivers. diff --git a/deploy/kube-config/grafana-service.yaml b/deploy/kube-config/grafana-service.yaml index d855049eac..20a8e6262c 100644 --- a/deploy/kube-config/grafana-service.yaml +++ b/deploy/kube-config/grafana-service.yaml @@ -3,5 +3,8 @@ kind: "Service" id: "monitoring-grafana" port: 80 containerPort: 8080 +labels: + name: "monitoring-grafana" + kubernetes.io/cluster-service: "true" selector: name: "influxGrafana" diff --git a/deploy/kube-config/heapster-controller.yaml b/deploy/kube-config/heapster-controller.yaml index 42cd14f88e..223a44f8cb 100644 --- a/deploy/kube-config/heapster-controller.yaml +++ b/deploy/kube-config/heapster-controller.yaml @@ -12,7 +12,7 @@ desiredState: id: "monitoring-heapster-controller" containers: - name: "heapster" - image: "kubernetes/heapster:v0.9" + image: "kubernetes/heapster:v0.10.0" env: - name: "INFLUXDB_HOST" value: "monitoring-influxdb" @@ -30,5 +30,6 @@ desiredState: labels: name: "heapster" uses: "monitoring-influxdb" + kubernetes.io/cluster-service: "true" labels: name: "heapster" diff --git a/deploy/kube-config/heapster-service.yaml b/deploy/kube-config/heapster-service.yaml index 2296fef231..3e10ffe183 100644 --- a/deploy/kube-config/heapster-service.yaml +++ b/deploy/kube-config/heapster-service.yaml @@ -3,5 +3,8 @@ kind: "Service" id: "monitoring-heapster" port: 80 containerPort: 8082 +labels: + name: "monitoring-heapster" + kubernetes.io/cluster-service: "true" selector: name: "heapster" diff --git a/deploy/kube-config/influxdb-grafana-controller.yaml b/deploy/kube-config/influxdb-grafana-controller.yaml index ae5bb1b721..1961b00c68 100644 --- a/deploy/kube-config/influxdb-grafana-controller.yaml +++ b/deploy/kube-config/influxdb-grafana-controller.yaml @@ -8,6 +8,7 @@ desiredState: podTemplate: labels: name: "influxGrafana" + kubernetes.io/cluster-service: "true" desiredState: manifest: version: "v1beta1" @@ -19,7 +20,7 @@ desiredState: - containerPort: 8083 - containerPort: 8086 - name: "grafana" - image: "kubernetes/heapster_grafana:v0.5" + image: "kubernetes/heapster_grafana:v0.6" ports: - containerPort: 8080 env: @@ -31,3 +32,5 @@ desiredState: value: '80' labels: name: "influxGrafana" + kubernetes.io/cluster-service: "true" + diff --git a/deploy/kube-config/v1beta3/heapster-controller.yaml b/deploy/kube-config/v1beta3/heapster-controller.yaml index a5dd83bffb..1ecba38ea9 100644 --- a/deploy/kube-config/v1beta3/heapster-controller.yaml +++ b/deploy/kube-config/v1beta3/heapster-controller.yaml @@ -16,7 +16,7 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: kubernetes/heapster:v0.9 + - image: kubernetes/heapster:v0.10.0 name: heapster env: - name: "INFLUXDB_HOST" diff --git a/deploy/kube-config/v1beta3/influxdb-grafana-controller.yaml b/deploy/kube-config/v1beta3/influxdb-grafana-controller.yaml index 86f39c2235..95398e392e 100644 --- a/deploy/kube-config/v1beta3/influxdb-grafana-controller.yaml +++ b/deploy/kube-config/v1beta3/influxdb-grafana-controller.yaml @@ -20,7 +20,7 @@ spec: - containerPort: 8083 - containerPort: 8086 - name: grafana - image: kubernetes/heapster_grafana:v0.5 + image: kubernetes/heapster_grafana:v0.6 ports: - containerPort: 8080 env: diff --git a/grafana/RELEASES.md b/grafana/RELEASES.md index 45c3b3a09d..a9b1bc5912 100644 --- a/grafana/RELEASES.md +++ b/grafana/RELEASES.md @@ -1,6 +1,6 @@ # Release Notes -## 0.6 (UNRELEASED) +## 0.6 (3-30-2014) - Switch to kuisp for serving files & proxying to services - Configurable reverse proxy directly to InfluxDB service rather than using apiserver proxy diff --git a/grafana/config.js.tmpl b/grafana/config.js.tmpl index 7c9a65c74f..c4eb64a283 100644 --- a/grafana/config.js.tmpl +++ b/grafana/config.js.tmpl @@ -10,7 +10,7 @@ function (Settings) { }, 'grafana': { type: 'influxdb', - url: "/{{ .Env.INFLUXDB_EXTERNAL_URL }}{{ .Env.GRAFANA_DB_NAME }}", + url: "{{ .Env.INFLUXDB_EXTERNAL_URL }}{{ .Env.GRAFANA_DB_NAME }}", username: "{{ .Env.INFLUXDB_USER }}", password: "{{ .Env.INFLUXDB_PASSWORD }}", grafanaDB: true diff --git a/version/version.go b/version/version.go index 5d62acce8a..a5cbadbd92 100644 --- a/version/version.go +++ b/version/version.go @@ -15,7 +15,8 @@ package version // Heapster version. Update this whenever making a new release. -// The version is of the format Major.Minor. -// Increment minor number for bug fixes and performance enhancements. +// The version is of the format Major.Minor.Patch // Increment major number for new feature additions and behavioral changes. -const HeapsterVersion = "0.9" +// Increment minor number for bug fixes and performance enhancements. +// Increment patch number for critical fixes to existing releases. +const HeapsterVersion = "0.10.0"