ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-11835. Request in the widget "Memory Usage" returns 400-error (onechiporenko)
Date Wed, 10 Jun 2015 13:27:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 1037ecd87 -> 3d5c4cea0


AMBARI-11835. Request in the widget "Memory Usage" returns 400-error (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d5c4cea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d5c4cea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d5c4cea

Branch: refs/heads/branch-2.1
Commit: 3d5c4cea0a1317019042a6e8e9a45cb7b041a321
Parents: 1037ecd
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Wed Jun 10 16:21:36 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed Jun 10 16:26:52 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/ajax/ajax.js       | 2 +-
 ambari-web/test/utils/ajax/ajax_test.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d5c4cea/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 3b71219..ece938c 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1142,7 +1142,7 @@ var urls = {
     'testInProduction': true
   },
   'dashboard.cluster_metrics.memory': {
-    'real': '/clusters/{clusterName}/?fields=metrics/memory/Buffer._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Cache._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Share._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Swap._avg[{fromSeconds},{toSeconds},{stepSeconds}],
metrics/memory/Total._avg[{fromSeconds},{toSeconds},{stepSeconds}], metrics/memory/Use._avg[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/?fields=metrics/memory/Buffer._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Cache._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Share._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Swap._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Total._avg[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/Use._avg[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/cluster_metrics/memory_1hr.json',
     'testInProduction': true
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d5c4cea/ambari-web/test/utils/ajax/ajax_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/ajax/ajax_test.js b/ambari-web/test/utils/ajax/ajax_test.js
index 3b692bd..1c5c5ab 100644
--- a/ambari-web/test/utils/ajax/ajax_test.js
+++ b/ambari-web/test/utils/ajax/ajax_test.js
@@ -97,10 +97,14 @@ describe('App.ajax', function() {
   describe('Check "real" property for each url object', function() {
     var names = App.ajax.fakeGetUrlNames();
     names.forEach(function(name) {
-      it(name, function() {
+      it('`' + name + '`', function() {
         var url = App.ajax.fakeGetUrl(name);
         expect(url.real).to.be.a('string');
       });
+      it('`' + name + '` should not contain spaces', function () {
+        var url = App.ajax.fakeGetUrl(name);
+        expect(url.real.contains(' ')).to.be.false;
+      });
     });
   });
 


Mime
View raw message