Display custom metrics for pods if they are available.

Author: mwringe

app/scripts/directives/podMetrics.js

@@ -95,6 +95,38 @@ angular.module('openshiftConsole')
           });
         }
 
+        // Load any custom metrics onto the page
+        MetricsService.getCustomMetrics(scope.pod).then(
+          function(response) {
+            angular.forEach(response, function(metric) {
+
+              // set the label to the description if specified
+              var label = (metric.description !== undefined) ? metric.description : metric.name;
+              
+              // get the unit value if specified
+              var unit = (metric.unit !== undefined) ? metric.unit : "unknown";
+
+              scope.metrics.push({
+                label: label,
+                units: unit,
+                chartPrefix: "custom-" + btoa(metric.name),
+                chartType: "spline",
+
+                datasets: [
+                  {
+                    id: "custom/" + metric.name,
+                    label: label,
+                    data: []
+                  },
+                ]
+              });
+
+            });
+            // update the page with the new charts.
+            update();
+          }
+        );
+
         // Set to true when any data has been loaded (or failed to load).
         scope.loaded = false;
         scope.noData = true;

app/scripts/services/metrics.js

@@ -169,6 +169,46 @@ angular.module("openshiftConsole")
       });
     };
 
+    // Returns custom metrics available for a particular pod
+    var getCustomMetrics = function(pod) {
+      var namespace = pod.metadata.namespace;
+      var podName = pod.metadata.name;
+
+      return getMetricsURL().then(function(metricsURL) {
+
+        if (!metricsURL) {
+          return null;
+        }
+
+        var url = metricsURL + "/metrics";
+
+        var params = {
+          tags: "custom_metric:true,pod_name:" + podName
+        };
+
+        return $http.get(url, {
+          auth: {},
+          headers: {
+            Accept: 'application/json',
+            'Hawkular-Tenant': namespace
+          },
+          params: params
+        }).then(function(response) {
+          var metrics = [];
+          angular.forEach(response.data, function(value) {
+            var metric = {
+              name: value.tags.metric_name,
+              unit: value.tags.units,
+              description: value.tags.description,
+            };
+            metrics.push(metric);
+          });
+           return metrics;
+        });
+      });
+    };
+
+
     return {
       // Check if the metrics service is available. The service is considered
       // available if a metrics URL is set. Returns a promise resolved with a
@@ -255,6 +295,7 @@ angular.module("openshiftConsole")
       //   end:            end time in millis (optional)
       //
       // Returns a promise resolved with the metrics data.
-      getPodMetrics: getPodMetrics
+      getPodMetrics: getPodMetrics,
+      getCustomMetrics: getCustomMetrics,
     };
   });

dist/scripts/scripts.js

@@ -2996,6 +2996,32 @@ _.assign(b, a);
 }), b;
 });
 });
+}, u = function(a) {
+var c = a.metadata.namespace, d = a.metadata.name;
+return f().then(function(a) {
+if (!a) return null;
+var e = a + "/metrics", f = {
+tags:"custom_metric:true,pod_name:" + d
+};
+return b.get(e, {
+auth:{},
+headers:{
+Accept:"application/json",
+"Hawkular-Tenant":c
+},
+params:f
+}).then(function(a) {
+var b = [];
+return angular.forEach(a.data, function(a) {
+var c = {
+name:a.tags.metric_name,
+unit:a.tags.units,
+description:a.tags.description
+};
+b.push(c);
+}), b;
+});
+});
 };
 return {
 isAvailable:o,
@@ -3044,7 +3070,8 @@ usage:_.head(g(b.data))
 });
 });
 },
-getPodMetrics:t
+getPodMetrics:t,
+getCustomMetrics:u
 };
 } ]), angular.module("openshiftConsole").factory("MetricsCharts", [ "$timeout", "ConversionService", function(a, b) {
 var c = function(a, c) {
@@ -11382,6 +11409,21 @@ id:"network/rx_rate",
 label:"Received",
 data:[]
 } ]
+}), j.getCustomMetrics(m.pod).then(function(a) {
+angular.forEach(a, function(a) {
+var b = void 0 !== a.description ? a.description :a.name, c = void 0 !== a.unit ? a.unit :"unknown";
+m.metrics.push({
+label:b,
+units:c,
+chartPrefix:"custom-" + btoa(a.name),
+chartType:"spline",
+datasets:[ {
+id:"custom/" + a.name,
+label:b,
+data:[]
+} ]
+});
+}), z();
 }), m.loaded = !1, m.noData = !0, m.showComputeUnitsHelp = function() {
 k.showComputeUnitsHelp();
 }, j.getMetricsURL().then(function(a) {