Merge branch 'master' into style-fix

Author: bryk

src/app/backend/heapsterclient.go

@@ -29,17 +29,17 @@ import (
 func CreateHeapsterRESTClient(heapsterHost string, apiclient *client.Client) (
 	*unversioned.RESTClient, error) {
 
-	cfg := client.Config{
-		Host: heapsterHost,
-	}
+	cfg := client.Config{}
 
 	if heapsterHost == "" {
 		bufferProxyHost := bytes.NewBufferString("http://")
 		bufferProxyHost.WriteString(apiclient.RESTClient.Get().URL().Host)
-		bufferProxyHost.WriteString("/api/v1/proxy/namespaces/kube-system/services/heapster/")
 		cfg.Host = bufferProxyHost.String()
+		cfg.Prefix = "/api/v1/proxy/namespaces/kube-system/services/heapster/api"
+	} else {
+		cfg.Host = heapsterHost
 	}
-	log.Printf("Creating Heapster REST client for %s", cfg.Host)
+	log.Printf("Creating Heapster REST client for %s%s", cfg.Host, cfg.Prefix)
 	clientFactory := new(ClientFactoryImpl)
 	heapsterClient, err := clientFactory.New(&cfg)
 	if err != nil {

src/app/backend/replicasetpodsmetrics.go

@@ -19,10 +19,11 @@ import (
 
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	heapster "k8s.io/heapster/api/v1/types"
 	"k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/client/unversioned"
-	"strings"
 )
 
 const (
@@ -86,7 +87,7 @@ func getReplicaSetPodsMetrics(podList *api.PodList, heapsterClient *unversioned.
 
 // Create URL path for metrics.
 func createMetricPath(namespace string, podNames []string, metricName string) string {
-	return fmt.Sprintf("/api/v1/model/namespaces/%s/pod-list/%s/metrics/%s",
+	return fmt.Sprintf("/model/namespaces/%s/pod-list/%s/metrics/%s",
 		namespace,
 		strings.Join(podNames, ","),
 		metricName)
@@ -95,7 +96,7 @@ func createMetricPath(namespace string, podNames []string, metricName string) st
 // Retrieves raw metrics from Heapster.
 func getRawMetrics(heapsterClient *unversioned.RESTClient, metricPath string) ([]byte, error) {
 
-	resultRaw, err := heapsterClient.Get().RequestURI(metricPath).DoRaw()
+	resultRaw, err := heapsterClient.Get().Suffix(metricPath).DoRaw()
 
 	if err != nil {
 		return make([]byte, 0), err

src/app/frontend/common/filters/filters_module.js

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import memoryFilter from './memory_filter';
 import middleEllipsisFilter from './middleellipsis_filter';
 import relativeTimeFilter from './relativetime_filter';
 
@@ -25,4 +26,5 @@ export default angular
           'ngMaterial',
         ])
     .filter('middleEllipsis', middleEllipsisFilter)
+    .filter('kdMemory', memoryFilter)
     .filter('relativeTime', relativeTimeFilter);

src/app/frontend/common/filters/memory_filter.js

@@ -0,0 +1,46 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/** Base for binary prefixes */
+const base = 1024;
+
+/** Names of the suffixes where I-th name is for base^I suffix. */
+const powerSuffixes = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi'];
+
+/**
+ * Returns filter function that formats memory in bytes.
+ * @param {function(number): string} numberFilter
+ * @return {Function}
+ * @ngInject
+ */
+export default function memoryFilter(numberFilter) {
+  /**
+   * Formats memory in bytes to a binary prefix format, e.g., 789,21 MiB.
+   * @param {number} value Value to be formatted.
+   * @return {string}
+   */
+  let formatMemory = function(value) {
+    let divider = 1;
+    let power = 0;
+
+    while (value / divider > base && power < powerSuffixes.length - 1) {
+      divider *= base;
+      power += 1;
+    }
+    let formatted = numberFilter(value / divider);
+    return `${formatted} ${powerSuffixes[power]}B`;
+  };
+
+  return formatMemory;
+}

src/app/frontend/replicasetdetail/replicasetdetail.html

@@ -220,10 +220,10 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
               </span>
             </td>
             <td class="kd-replicasetdetail-table-cell">
-              0.4 CPU<!-- TODO(maciaszczykm): Fill with data and plot. -->
+              {{::pod.metrics.cpuUsage}}
             </td>
             <td class="kd-replicasetdetail-table-cell">
-              12 MB<!-- TODO(maciaszczykm): Fill with data and plot. -->
+              {{::(pod.metrics.memoryUsage | kdMemory)}}
             </td>
             <td class="kd-replicasetdetail-table-cell">
               <span ng-if="::pod.podIP">

src/test/backend/replicasetpodsmetrics_test.go

@@ -15,9 +15,10 @@
 package main
 
 import (
-	heapster "k8s.io/heapster/api/v1/types"
 	"reflect"
 	"testing"
+
+	heapster "k8s.io/heapster/api/v1/types"
 )
 
 func TestCreateMetricPath(t *testing.T) {
@@ -27,9 +28,9 @@ func TestCreateMetricPath(t *testing.T) {
 		metricName string
 		expected   string
 	}{
-		{"", make([]string, 0), "", "/api/v1/model/namespaces//pod-list//metrics/"},
+		{"", make([]string, 0), "", "/model/namespaces//pod-list//metrics/"},
 		{"default", []string{"a", "b"}, "cpu-usage",
-			"/api/v1/model/namespaces/default/pod-list/a,b/metrics/cpu-usage"},
+			"/model/namespaces/default/pod-list/a,b/metrics/cpu-usage"},
 	}
 	for _, c := range cases {
 		actual := createMetricPath(c.namespace, c.podNames, c.metricName)

src/test/frontend/common/filters/memory_filter_test.js

@@ -0,0 +1,41 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import filtersModule from 'common/filters/filters_module';
+
+describe('Memory filter', () => {
+  /** @type {function(!number):string} */
+  let memoryFilter;
+
+  beforeEach(() => {
+    angular.mock.module(filtersModule.name);
+    angular.mock.inject((_kdMemoryFilter_) => { memoryFilter = _kdMemoryFilter_; });
+  });
+
+  it('should format memory', () => {
+    expect(memoryFilter(0)).toEqual('0 B');
+    expect(memoryFilter(1)).toEqual('1 B');
+    expect(memoryFilter(2)).toEqual('2 B');
+    expect(memoryFilter(1000)).toEqual('1,000 B');
+    expect(memoryFilter(1024)).toEqual('1,024 B');
+    expect(memoryFilter(1025)).toEqual('1.001 KiB');
+    expect(memoryFilter(7896)).toEqual('7.711 KiB');
+    expect(memoryFilter(109809)).toEqual('107.235 KiB');
+    expect(memoryFilter(768689899)).toEqual('733.080 MiB');
+    expect(memoryFilter(768689899789)).toEqual('715.898 GiB');
+    expect(memoryFilter(76868989978978)).toEqual('69.912 TiB');
+    expect(memoryFilter(7686898997897878)).toEqual('6.827 PiB');
+    expect(memoryFilter(768689899789787867898766)).toEqual('682,733,780.435 PiB');
+  });
+});