incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1431619 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/views/main/host/metrics/disk.js ambari-web/app/views/main/host/metrics/memory.js
Date Thu, 10 Jan 2013 20:33:58 GMT
Author: yusaku
Date: Thu Jan 10 20:33:58 2013
New Revision: 1431619

URL: http://svn.apache.org/viewvc?rev=1431619&view=rev
Log:
AMBARI-1080. Host disk and memory graphs have incorrect values. (Srimanth Gunturi via yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js
    incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431619&r1=1431618&r2=1431619&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 10 20:33:58 2013
@@ -654,6 +654,9 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-1080. Host disk & memory graphs have incorrect values.
+  (Srimanth Gunturi via yusaku)
+
   AMBARI-1077. The value for dead nodes is not getting populated on UI.
   (Srimanth Gunturi via yusaku)
 

Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js?rev=1431619&r1=1431618&r2=1431619&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js Thu Jan 10 20:33:58
2013
@@ -32,7 +32,7 @@ App.ChartHostMetricsDisk = App.ChartLine
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',
   url: function () {
-    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/disk/disk_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/part_max_used[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/disk_free[{fromSeconds},{toSeconds},{stepSeconds}]",
{
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/disk/disk_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/disk_free[{fromSeconds},{toSeconds},{stepSeconds}]",
{
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/disk.json");
@@ -52,10 +52,7 @@ App.ChartHostMetricsDisk = App.ChartLine
             displayName = "Total";
             break;
           case "disk_free":
-            displayName = "Free";
-            break;
-          case "part_max_used":
-            displayName = "Maximum Used";
+            displayName = "Available";
             break;
           default:
             break;
@@ -72,7 +69,7 @@ App.ChartHostMetricsDisk = App.ChartLine
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0]
+              y: seriesData[index][0] * 1000000000
             });
           }
           seriesArray.push(series);

Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js?rev=1431619&r1=1431618&r2=1431619&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js Thu Jan 10 20:33:58
2013
@@ -32,7 +32,7 @@ App.ChartHostMetricsMemory = App.ChartLi
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',
   url: function () {
-    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/memory/swap_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_cached[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_buffers[{fromSeconds},{toSeconds},{stepSeconds}]",
{
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/memory/swap_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_shared[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_cached[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_buffers[{fromSeconds},{toSeconds},{stepSeconds}]",
{
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/memory.json");
@@ -45,8 +45,8 @@ App.ChartHostMetricsMemory = App.ChartLi
         var displayName;
         var seriesData = jsonData.metrics.memory[name];
         switch (name) {
-          case "mem_total":
-            displayName = "Total";
+          case "mem_shared":
+            displayName = "Shared";
             break;
           case "swap_free":
             displayName = "Swap";
@@ -75,7 +75,7 @@ App.ChartHostMetricsMemory = App.ChartLi
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0]
+              y: seriesData[index][0] * 1000
             });
           }
           seriesArray.push(series);



Mime
View raw message