ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [08/50] [abbrv] ambari git commit: AMBARI-18214. Restify Log Search endpoints (oleewere)
Date Wed, 07 Sep 2016 23:37:58 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VGroupListBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VGroupListBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VGroupListBase.js
index a34aaa3..0c81cc3 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VGroupListBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VGroupListBase.js
@@ -6,9 +6,9 @@
  * to you 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
@@ -17,18 +17,18 @@
  * under the License.
  */
 
- 
+
 define(['require',
 	'collections/BaseCollection',
 	'utils/Globals',
 	'models/VGroup'
 ],function(require,BaseCollection,Globals,VGroup){
-	'use strict';	
+	'use strict';
 
 	var VGroupListBase = BaseCollection.extend(
 	/** @lends VGroupListBase.prototype */
 	{
-		url: Globals.baseURL + 'dashboard/hosts',
+		url: Globals.baseURL + 'service/logs/hosts',
 
 		model : VGroup,
 
@@ -44,7 +44,7 @@ define(['require',
             this._changes = { };
 			this.on('change', this._onChange);
 		},
-		
+
 		_onChange : function(m){
             this._changes[m.id] = m;
 		},
@@ -59,7 +59,7 @@ define(['require',
 
 		getUsersOfGroup : function(groupId, options){
 			var url = Globals.baseURL  + 'xusers/'  + groupId + '/users';
-			
+
 			options = _.extend({
 				//data : JSON.stringify(postData),
 				contentType : 'application/json',
@@ -80,5 +80,3 @@ define(['require',
 
     return VGroupListBase;
 });
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
index 59b5ae8..0e3de20 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
@@ -28,7 +28,7 @@ define(['require',
 	var VLogLevelListBase = BaseCollection.extend(
 	/** @lends VLogLevelListBase.prototype */
 	{
-		url: Globals.baseURL + 'dashboard/levels_count',
+		url: Globals.baseURL + 'service/logs/levels/count',
 
 		model : VLogLevel,
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogListBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogListBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogListBase.js
index 7b102d5..72ab530 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogListBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VLogListBase.js
@@ -58,7 +58,7 @@ define(['require',
 		 *************************/
 
 		cancelFindRequest : function(token, options){
-			var url = Globals.baseURL  + 'dashboard/cancelFindRequest';
+			var url = Globals.baseURL  + 'service/logs/request/cancel';
 			
 			options = _.extend({
 				data : $.param(token),
@@ -69,7 +69,7 @@ define(['require',
 			return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
 		},
 		getServiceLogFields : function(token, options){
-			var url = Globals.baseURL  + 'dashboard/getServiceLogsFieldsName';
+			var url = Globals.baseURL  + 'service/logs/fields';
 			
 			options = _.extend({
 				data : $.param(token),
@@ -80,7 +80,7 @@ define(['require',
 			return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
 		},
 		getServiceLogSchemaFields : function(token, options){
-			var url = Globals.baseURL  + 'dashboard/getServiceLogsSchemaFieldsName';
+			var url = Globals.baseURL  + 'service/logs/schema/fields';
 			
 			options = _.extend({
 				data : $.param(token),
@@ -91,7 +91,7 @@ define(['require',
 			return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
 		},
 		getTruncatedLogs : function(token, options){
-			var url = Globals.baseURL  + 'dashboard/getAfterBeforeLogs';
+			var url = Globals.baseURL  + 'service/logs/truncated';
 			
 			options = _.extend({
 				data : $.param(token),
@@ -102,7 +102,7 @@ define(['require',
 			return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
 		},
 		getServicesInfo : function(options){
-			var url = Globals.baseURL  + 'dashboard/getHadoopServiceConfigJSON';
+			var url = Globals.baseURL  + 'service/logs/serviceconfig';
 			
 			options = _.extend({
 				//data : $.param(token),

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNameValueListBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
index d59eaa2..71e80d9 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
@@ -6,9 +6,9 @@
  * to you 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
@@ -17,18 +17,18 @@
  * under the License.
  */
 
- 
+
 define(['require',
 	'collections/BaseCollection',
 	'utils/Globals',
 	'models/VNameValue'
 ],function(require,BaseCollection,Globals,VNameValue){
-	'use strict';	
+	'use strict';
 
 	var VNameValueListBase = BaseCollection.extend(
 	/** @lends VNameValueListBase.prototype */
 	{
-		url: Globals.baseURL + 'dashboard/hosts',
+		url: Globals.baseURL + 'service/logs/hosts',
 
 		model : VNameValue,
 
@@ -42,7 +42,7 @@ define(['require',
 			this.modelAttrName = 'vnameValues';
 			this.bindErrorEvents();
 		}
-		
+
 	},{
 	/**
 	* Table Cols to be passed to Backgrid
@@ -55,5 +55,3 @@ define(['require',
 
     return VNameValueListBase;
 });
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNodeListBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNodeListBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNodeListBase.js
index 7c7dcf8..78949e3 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNodeListBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/collection_bases/VNodeListBase.js
@@ -28,7 +28,7 @@ define(['require',
 	var VNodeListBase = BaseCollection.extend(
 	/** @lends VNodeListBase.prototype */
 	{
-		url: Globals.baseURL + 'dashboard/getTreeExtension',
+		url: Globals.baseURL + 'service/logs/tree',
 
 		model : VNode,
 
@@ -48,7 +48,7 @@ define(['require',
 		 *************************/
 
 		cancelFindRequest : function(token, options){
-			var url = Globals.baseURL  + 'dashboard/cancelFindRequest';
+			var url = Globals.baseURL  + 'service/logs/request/cancel';
 			
 			options = _.extend({
 				data : $.param(token),

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VAuditLogBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VAuditLogBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VAuditLogBase.js
index 1283875..8513ed2 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VAuditLogBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VAuditLogBase.js
@@ -42,7 +42,7 @@ define(['require',
 			this.modelName = 'VAuditLogBase';
 		},
 		auditLiveFeed : function(token, options){
-			var url = Globals.baseURL  + 'audit/getLiveLogsCount';
+			var url = Globals.baseURL  + 'audit/logs/live/count';
 			
 			options = _.extend({
 				data : $.param(token),

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VCommonModelBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VCommonModelBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VCommonModelBase.js
index 4723e3e..bbc3e36 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VCommonModelBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VCommonModelBase.js
@@ -27,7 +27,7 @@ define(['require',
 	var VCommonModelBase = BaseModel.extend(
 	/** @lends VCommonModelBase.prototype */
 	{
-		urlRoot: Globals.baseURL + 'dashboard/getTreeExtension',
+		urlRoot: Globals.baseURL + 'service/logs/tree',
 		
 		defaults: {},
 		

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VEventHistoryBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
index c237ade..a15cdbd 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
@@ -27,7 +27,7 @@ define(['require',
     var VEventHistory = BaseModel.extend(
         /** @lends VEventHistory.prototype */
         {
-            urlRoot: Globals.baseURL + 'dashboard/aggregatedData',
+            urlRoot: Globals.baseURL + 'service/logs/aggregated',
 
             defaults: {},
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VGraphInfoBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
index a707629..46e826c 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
@@ -27,7 +27,7 @@ define(['require',
 	var VLogBase = BaseModel.extend(
 	/** @lends VLogBase.prototype */
 	{
-		urlRoot: Globals.baseURL + 'dashboard/aggregatedData',
+		urlRoot: Globals.baseURL + 'service/logs/aggregated',
 		
 		defaults: {},
 		

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VLogLevelBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VLogLevelBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VLogLevelBase.js
index 0384bc2..daaaa32 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VLogLevelBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VLogLevelBase.js
@@ -27,7 +27,7 @@ define(['require',
 	var VLogLevelBase = BaseModel.extend(
 	/** @lends VLogLevelBase.prototype */
 	{
-		urlRoot: Globals.baseURL + 'dashboard/levels_count',
+		urlRoot: Globals.baseURL + 'service/logs/levels/count',
 		
 		defaults: {},
 		

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VUserFilterBase.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VUserFilterBase.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VUserFilterBase.js
index 35171aa..da299a0 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VUserFilterBase.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/model_bases/VUserFilterBase.js
@@ -27,7 +27,7 @@ define(['require',
 	var VUserFilterBase = BaseModel.extend(
 	/** @lends VUserFilterBase.prototype */
 	{
-		urlRoot: Globals.baseURL + 'userconfig/user_filter',
+		urlRoot: Globals.baseURL + 'userconfig/users/filter',
 
 		defaults: {},
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/ViewUtils.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/ViewUtils.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/ViewUtils.js
index 331ffd6..62d785b 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/ViewUtils.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/ViewUtils.js
@@ -58,7 +58,7 @@ define(['require',
         if (params.bundle_id && !params.start_time && !params.end_time) {
             var collection = new VNameValueList();
 
-            collection.url = Globals.baseURL + "dashboard/solr/getBundleIdBoundaryDates";
+            collection.url = Globals.baseURL + "service/logs/solr/boundarydates";
             collection.modelAttrName = "vNameValues";
             _.extend(collection.queryParams, {
                 "bundle_id": params.bundle_id

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditAggregatedView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditAggregatedView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditAggregatedView.js
index c04aaf9..ef6dce5 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditAggregatedView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditAggregatedView.js
@@ -98,7 +98,7 @@ define(['require',
                     pageSize: 9999
                 }
 			});
-			this.topUsers.url = Globals.baseURL + "audit/getTopAuditUsers";
+			this.topUsers.url = Globals.baseURL + "audit/logs/users";
 			this.topUsers.modelAttrName = "graphData";
 			this.topResources = new VNameValueList([],{
 				state: {
@@ -106,7 +106,7 @@ define(['require',
                     pageSize: 9999
                 }
 			});
-			this.topResources.url = Globals.baseURL + "audit/getTopAuditResources";
+			this.topResources.url = Globals.baseURL + "audit/logs/resources";
 			this.topResources.modelAttrName = "graphData";		
 			//initialize colors
 			this.colors = (new d3.scale.category20c().range().slice().reverse()).concat(new d3.scale.category20b().range().slice().reverse());
@@ -408,7 +408,7 @@ define(['require',
 			obj.utcOffset = moment().utcOffset();
 			obj.startIndex =  this.topUsers.state.currentPage * this.topUsers.state.pageSize;
 			var params = $.param(_.extend({},this.topUsers.queryParams,obj));
-			var url = "api/v1/audit/exportUserTableToTextFile?"+ params;
+			var url = "api/v1/audit/logs/users/export?"+ params;
 			window.open(url);
 			this.onDialogClosed();
 		}

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js
index 0b570ac..a399cbf 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js
@@ -27,9 +27,9 @@ define(['require',
 	'hbs!tmpl/audit/AuditTabLayoutView_tmpl',
 	'moment'
 ],function(require,Backbone,Globals,Utils,ViewUtils,VGroupList,VAuditLogList,VAuditLog,AuditTabLayoutViewTmpl,moment){
-    
+
     'use strict';
-    
+
     return Backbone.Marionette.Layout.extend(
 	/** @lends LogLevelView */
 	{
@@ -91,14 +91,14 @@ define(['require',
                     pageSize: 25
                 }
 			});
-			
+
 			this.componentsList = new VGroupList([],{
 				state: {
                     firstPage: 0,
                     pageSize: 99999
                 }
 			});
-			this.componentsList.url = Globals.baseURL + "audit/getAuditComponents";
+			this.componentsList.url = Globals.baseURL + "audit/logs/components";
 		},
 		bindEvents : function(){
 			this.listenTo(this.componentsList, "reset", function(col, abc){
@@ -115,13 +115,13 @@ define(['require',
 			this.listenTo(this.vent,"reinitialize:filter:mustNot",function(value){
             	this.reinitializeFilterMustNot(value);
             },this);
-			
+
 			this.listenTo(this.globalVent,"reinitialize:auditLogs",function(options){
             	this.vent.trigger("reinitialize:filter:mustNot reinitialize:filter:mustBe reinitialize:filter:logtime "+
             			"reinitialize:TopTenGraph",options);
             	this.fetchAuditLogs(options);
             },this);
-			
+
 		},
 		onRender : function(){
 			this.renderHistogram();
@@ -154,7 +154,7 @@ define(['require',
 					params : that.defaultParams
 				}));
 			})
-			
+
 		},
 		fetchAuditColumns : function(){
 			var that =this;
@@ -184,7 +184,7 @@ define(['require',
 		renderVSSearch : function(){
 			var that = this;
 			require(['views/tabs/VisualSearchView'], function(VisualSearchView){
-				
+
 				_.each(that.columns,function(v,i){
 					if(v.toLowerCase().indexOf("time") > 0 ){
 						//that.columns.splice(i, 1);
@@ -421,7 +421,7 @@ define(['require',
 					that.$("#loaderFeed").show();
 				},
 				success : function(data){
-					var dd=[]; 
+					var dd=[];
 					that.$("#spark").parent().show();
 					_.each(data.vnameValues,function(d){
 						dd.push(d.value);
@@ -452,8 +452,8 @@ define(['require',
 			if(values.mustNot){
 				this.ui.excludeComponents.select2('val',values.mustNot.split(","));
 			}else{
-				this.ui.excludeComponents.select2('val',[]);	
+				this.ui.excludeComponents.select2('val',[]);
 			}
 		}
 	});
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
index 42b94d5..4fb9b51 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
@@ -31,7 +31,7 @@ define(['require',
 	'select2'
 ],function(require,Backbone,moment,Globals,Utils,ViewUtils,tip,VLogLevel,VLogList,VGraphInfo,BubbleGraphTableLayoutViewTmpl,JBDialog){
 	'use strict';
-	
+
 	return Backbone.Marionette.Layout.extend(
 	/** @lends BubbleGraphTableLayoutView */
 	{
@@ -96,7 +96,7 @@ define(['require',
                     pageSize: 25
                 }
             });
-			this.collection.url = Globals.baseURL + "dashboard/solr/logs_search";
+			this.collection.url = Globals.baseURL + "service/logs";
 			this.graphModel = new VGraphInfo();
 			this.bindEvents();
 			this.graphParams = this.params;
@@ -257,7 +257,7 @@ define(['require',
 					filterOpts : {},
 					paginatorOpts : {}
 				}));
-			});	
+			});
 		},
 		renderComponentList : function(){
 			var that = this;
@@ -416,7 +416,7 @@ define(['require',
 						displayOrder :6,
 						width : 6
 					}
-					
+
 			};
 			_.each(cols,function(c,k){
 				if(columns[k] == undefined){
@@ -502,7 +502,7 @@ define(['require',
 				this.ui.hostList.show();
 			}else
 				this.ui.componentList.show();
-				
+
 		},
 		bindContextMenuClick : function(){
 			var that = this;
@@ -543,13 +543,13 @@ define(['require',
 		        	that.selectionCallBack(selection,e)
 		        },1);
 
-		        
+
 		    });
 		},
 		selectionCallBack : function(selection,e){
 			this.RLogTable.currentView.$el.removeHighlight(true);
 			if(this.selectionText != selection.toString()){
-				this.selectionText = selection.toString(); 
+				this.selectionText = selection.toString();
 			}else{
 				$(".contextMenuBody [data-id='F']").show();
 				$(".contextMenuBody").hide();
@@ -561,8 +561,8 @@ define(['require',
 				$(".contextMenuBody").show();
 				$(".contextMenuBody").css({
 					'top':e.pageY - 40,
-					'left':e.pageX 
-				});  
+					'left':e.pageX
+				});
 			}else{
 				this.RLogTable.currentView.$el.removeHighlight(true);
 				$(".contextMenuBody [data-id='F']").show();
@@ -607,7 +607,7 @@ define(['require',
 			}else if ($el.data("id") === "C_M"){
 				this.globalVent.trigger("add:compare",$el.find('a'));
 			}
-			
+
 		},
 		renderDetailLogFileView : function(view){
 			var that = this;
@@ -655,12 +655,12 @@ define(['require',
 				this.ui.graph.text("no data");
 				return
 			}
-				
+
 			var root = {
 				name : "",
 				dataList : this.graphModel.get("graphData")
 			};
-			
+
 			var margin = 20;
 			this.ui.graph.empty();
 			//		var color = d3.scale.linear()
@@ -813,6 +813,6 @@ define(['require',
 			$('body').unbind("mouseup.contextMenu");
 		}
 	});
-	
-	
-});
\ No newline at end of file
+
+
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
index abd3740..b8c43bb 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
@@ -68,14 +68,14 @@ define(['require',
 		                    pageSize: 99999
 		                }
 					});
-					this.componentsList.url = Globals.baseURL + "dashboard/getComponentListWithLevelCounts";
+					this.componentsList.url = Globals.baseURL + "service/logs/components/level/counts";
 					this.hostList = new VNodeList([],{
 						state: {
 		                    firstPage: 0,
 		                    pageSize: 99999
 		                }
 					});
-					this.hostList.url = Globals.baseURL + "dashboard/getHostListByComponent";
+					this.hostList.url = Globals.baseURL + "service/logs/hosts/components";
 				},
 				/** all events binding here */
 				bindEvents : function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentsView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentsView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentsView.js
index 66cc277..424236d 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentsView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentsView.js
@@ -53,7 +53,7 @@ define(['require',
 		initialize: function(options) {
 			_.extend(this, _.pick(options,'vent'));
 			this.collection = new VLogLevel();
-			this.collection.url = Globals.baseURL+"dashboard/components_count";
+			this.collection.url = Globals.baseURL+"service/logs/components/count";
 			this.bindEvents();
 		},
 		onRender : function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/DashboardView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/DashboardView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/DashboardView.js
index c3fd9c2..35814ba 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/DashboardView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/DashboardView.js
@@ -26,7 +26,7 @@ define(['require',
 ],function(require,Backbone,Globals,DashboardviewTmpl,VGroupList){
     'use strict';
 
-	
+
 	var DashboardView = Backbone.Marionette.Layout.extend(
 	/** @lends DashboardView */
 	{
@@ -69,7 +69,7 @@ define(['require',
 			this.logRegions = new Backbone.Collection();
 			this.hostCollection = new VGroupList([],{});
 			this.cComponents = new VGroupList([],{});
-			this.cComponents.url = Globals.baseURL + "dashboard/components";
+			this.cComponents.url = Globals.baseURL + "service/logs/components";
 			this.cTime = new VGroupList(Globals.timeQueryLOV,{});
 		},
 		/** all events binding here */
@@ -115,7 +115,7 @@ define(['require',
 		},
 		onSearchLogClick : function(e){
 			var searchParams = this.getSearchparams();
-			
+
 			if(this.logRegions.length == 0){
 				var model = new Backbone.Model({
 					id : 1,
@@ -123,7 +123,7 @@ define(['require',
 				});
 				this.generateView(model);
 			}else{
-				
+
 				var existsMod = this.logRegions.find(function(m){
 					return JSON.stringify(searchParams) === JSON.stringify(m.get('params'))
 				});
@@ -159,7 +159,7 @@ define(['require',
 			require(['views/dashboard/LogDetailView'],function(LogDetailView){
 				region.show(new LogDetailView({model: model}));
 			})
-			
+
 		},
 		getSearchparams : function(){
 			var obj={hosts : null, components : null, time:null};
@@ -176,7 +176,7 @@ define(['require',
 					obj.time = this.ui.time.select2("val");
 			}
 			return obj;
-				
+
 		},
 		/** on close */
 		onClose: function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/GridTableLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/GridTableLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/GridTableLayoutView.js
index 1cbdef8..da930ea 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/GridTableLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/GridTableLayoutView.js
@@ -78,7 +78,7 @@ define(['require',
                 this.graphParams = {};
                 this.unit = (this.model.params && this.model.params.unit) ? this.model.params.unit : "+1HOUR";
                 this.firstRender = true;
-                this.collection.url = Globals.baseURL + "audit/getAnyGraphData";
+                this.collection.url = Globals.baseURL + "audit/logs/anygraph";
                 this.collection.modelAttrName = "graphData";
 
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostsView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostsView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostsView.js
index dd82130..2440fd0 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostsView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostsView.js
@@ -53,7 +53,7 @@ define(['require',
 		initialize: function(options) {
 			_.extend(this, _.pick(options,'vent'));
 			this.collection = new VLogLevel();
-			this.collection.url = Globals.baseURL+"dashboard/hosts_count";
+			this.collection.url = Globals.baseURL+"service/logs/hosts/count";
 			this.bindEvents();
 		},
 		onRender : function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js
index b57f7c1..d2ee3d8 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js
@@ -61,7 +61,7 @@ define(['require',
 		initialize: function(options) {
 			_.extend(this, _.pick(options,'vent','globalVent','params'));
 			this.logLevelList = new VLogLevelList();
-			this.logLevelList.url = Globals.baseURL + "dashboard/getLogLevelCounts";
+			this.logLevelList.url = Globals.baseURL + "service/logs/levels/counts/namevalues";
 			this.logLevelList.modelAttrName = "vNameValues";
 			this.bindEvents();
 		},

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/MainLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/MainLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/MainLayoutView.js
index 3be87f5..66593c4 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/MainLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/MainLayoutView.js
@@ -27,7 +27,7 @@ define(['require',
 	'd3.tip'
 ],function(require,Backbone,Utils,ViewUtils,Globals,MainLayoutViewTmpl){
     'use strict';
-	
+
 	var MainLayoutView = Backbone.Marionette.Layout.extend(
 	/** @lends MainLayoutView */
 	{
@@ -93,7 +93,7 @@ define(['require',
 //                    pageSize: 50
 //                }
 //            });
-//			this.collection.url = Globals.baseURL + "dashboard/solr/logs_search";
+//			this.collection.url = Globals.baseURL + "service/logs";
 			this.vent = new Backbone.Wreqr.EventAggregator();
 			this.dateUtil = Utils.dateUtil;
 			this.bindEvents();
@@ -107,7 +107,7 @@ define(['require',
             	setTimeout(function(){
             		that.reAdjustTab()
             	},1000);
-            	
+
             },this);
             this.listenTo(this.globalVent,"render:comparison:tab",function(options){
 				this.hideContextMenu();
@@ -211,7 +211,7 @@ define(['require',
 				$("html, body").animate({ scrollTop: 0 }, 500);
 				that.showTab(tabName);
 			});
-		
+
 		},
 		showTab : function(tabId){
 			this.$(".nav.nav-tabs li").removeClass("active");
@@ -242,7 +242,7 @@ define(['require',
 					globalVent:that.globalVent
 				}));
 			})
-			
+
 		},
 		renderComponents : function(){
 			var that = this;
@@ -274,7 +274,7 @@ define(['require',
 		renderTroubleShootTab:function(){
 			var that = this;
 			require(['views/troubleshoot/TroubleShootLayoutView'], function(TroubleShootLayoutView){
-				
+
 				that.RTroubleShoot.show(new TroubleShootLayoutView({
 					globalVent:that.globalVent
 				}));
@@ -345,7 +345,7 @@ define(['require',
 		var pack = d3.layout.pack()
 		    .padding(2)
 		    .size([diameter - margin, diameter - margin])
-		    .value(function(d) { 
+		    .value(function(d) {
 		    	return d.count; })
 		    .children(function(d){
 		    	return d.dataList;
@@ -381,9 +381,9 @@ define(['require',
 		  var circle = svg.selectAll("circle")
 		      .data(nodes)
 		    .enter().append("circle")
-		      .attr("class", function(d) { 
+		      .attr("class", function(d) {
 		    	  return d.parent ? d.children ? "node" : "node node--leaf "+d.name : "node node--root"; })
-		      .style("fill", function(d) { 
+		      .style("fill", function(d) {
 		    	  return d.children ? color(d.depth) : null; })
 		      .on("click", function(d) {
 		    	  if(d3.event.shiftKey){
@@ -391,7 +391,7 @@ define(['require',
 		    	  }else{
 		    		  if (focus !== d) zoom(d), d3.event.stopPropagation();
 		    	  }
-		    		   
+
 		      })
 		      .on('mouseover', function (d,i) {
                     if (d.x) {
@@ -403,7 +403,7 @@ define(['require',
                         tipCirclePack.hide(d);
                     }
                 });
-		  
+
 		  var text = svg.selectAll("text")
 		      .data(nodes)
 		    .enter().append("text")
@@ -418,7 +418,7 @@ define(['require',
 		    			  return "";
 		    	  }else
 		    		  return d.name;
-		    	   
+
 		      });
 
 		  var node = svg.selectAll("circle,text");
@@ -472,7 +472,7 @@ define(['require',
 			    		el.find('i').removeClass('fa-square-o').addClass('fa-check-square-o');
 			    		this.quickMenuCompare = false;
 			    		this.onCompareLink(el);
-			    	}        
+			    	}
 			    }else{
 			    	el.find('i').removeClass('fa-square-o').addClass('fa-check-square-o');
 			    }
@@ -643,7 +643,7 @@ define(['require',
 			  else {
 			    that.$('.scroller-right').hide();
 			  }
-			  
+
 			  if (getLeftPosi()<0) {
 			    that.$('.scroller-left').show();
 			  }
@@ -655,7 +655,7 @@ define(['require',
 
 
 			this.$('.scroller-right').click(function(e) {
-			  
+
 			 /* that.$('.scroller-left').fadeIn('slow');
 			  that.$('.scroller-right').fadeOut('slow');*/
 			  //console.log(widthOfHidden())
@@ -664,23 +664,23 @@ define(['require',
 			  		that.reAdjustTab();
 			 	 });
 			  }
-			 
+
 			});
 
 			this.$('.scroller-left').click(function() {
-			  
+
 				/*that.$('.scroller-right').fadeIn('slow');
 				that.$('.scroller-left').fadeOut('slow');*/
 			  	//console.log(getLeftPosi())
 			  	if(getLeftPosi() < 0){
 			  		that.$('.list').animate({left:"-="+(-40)+"px"},0,function(){
 			  		that.reAdjustTab();
-			  	});	
+			  	});
 			  	}
-			  	
-			});    
+
+			});
 		},
 	});
 	return MainLayoutView;
-	
-});
\ No newline at end of file
+
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dialog/GlobalExclusionCompositeView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dialog/GlobalExclusionCompositeView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dialog/GlobalExclusionCompositeView.js
index a737eba..ffef322 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dialog/GlobalExclusionCompositeView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dialog/GlobalExclusionCompositeView.js
@@ -50,7 +50,7 @@ define(['require',
                         pageSize: 1000
                     }
                 });
-                this.componentsList.url = Globals.baseURL + "dashboard/components";
+                this.componentsList.url = Globals.baseURL + "service/logs/components";
 
                 this.collection = this.exclusionObj.logMessageCollection;
                 if (this.collection.length == 0) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js
index ba07600..95324d9 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js
@@ -52,7 +52,7 @@ define(['require',
                 events["click [data-value]"] = 'onLogLevelHeaderClick';
                 events["click #filterContent input[type='checkbox']"] = 'onAnyCheckboxClick';
                 events["click .overrideRow a"] = 'onEditHost';
-                
+
                 return events;
             },
 
@@ -76,8 +76,8 @@ define(['require',
                     }
                 });
 
-                this.componentsList.url = Globals.baseURL + "dashboard/components";
-                this.hostList.url = Globals.baseURL + "dashboard/hosts";
+                this.componentsList.url = Globals.baseURL + "service/logs/components";
+                this.hostList.url = Globals.baseURL + "service/logs/hosts";
                 this.model = new VUserFilter();
 
                 this.levelCollection = new Backbone.Collection();
@@ -100,7 +100,7 @@ define(['require',
             onRender: function() {
                 var that = this;
                 // this.setupSelect2Fields(this.levelCollection, "type", "type", "levelSelect2", 'Select Level');
-                
+
                 $.when(this.hostList.fetch({ reset: true }), this.componentsList.fetch({ reset: true }), this.model.fetch({})).then(function(c1, c2, m1) {
                     // if (!_.isUndefined(that.model.get('components'))) {
                     //     that.ui.componentSelect2.select2('val', that.model.get('components'));
@@ -116,7 +116,7 @@ define(['require',
 
                     //that.dataLevels = [];
                     //that.dataLevels = _.pluck(that.levelCollection.models, 'attributes');
-                    
+
                     //that.dataList = [];
                     //that.dataList = _.pluck(that.componentsList.models, 'attributes');
                     that.renderComponents();
@@ -148,13 +148,13 @@ define(['require',
             		var components = this.model.get("filter");
             		_.each(components,function(value,key){
             			var obj = components[key];
-            			
-            			if((_.isArray(obj.overrideLevels) && obj.overrideLevels.length) || 
+
+            			if((_.isArray(obj.overrideLevels) && obj.overrideLevels.length) ||
             					(_.isArray(obj.hosts) && obj.hosts.length) || obj.expiryTime){
             				var $el = that.$("input[data-name='"+key+"']").filter("[data-override]");
         					$el.click();
             			}
-            			
+
             			//setting override data
             			if(_.isArray(obj.overrideLevels)){
             				if(obj.overrideLevels.length){
@@ -202,7 +202,7 @@ define(['require',
             	_.each(this.levelCollection.models,function(model){
             		that.setCheckAllValue(model.get("type"));
             	});
-            	
+
             },
             onAnyCheckboxClick : function(e){
             	var $el = $(e.currentTarget);
@@ -363,4 +363,4 @@ define(['require',
             }
         });
 
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js
index 0085f06..76d0537 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js
@@ -81,10 +81,10 @@ define(['require',
                 this.firstRender = true;
                 if (!this.viewType || this.viewType == Globals.graphType.HISTOGRAM.value) {
                     this.histogramView = true;
-                    this.collection.url = Globals.baseURL + "dashboard/getHistogramData";
+                    this.collection.url = Globals.baseURL + "service/logs/histogram";
                     this.collection.modelAttrName = "graphData";
                 } else {
-                    this.collection.url = Globals.baseURL + "audit/getAuditLineGraphData";
+                    this.collection.url = Globals.baseURL + "audit/logs/linegraph";
                     this.collection.modelAttrName = "graphData";
                     this.lineView = true;
                 }
@@ -246,7 +246,7 @@ define(['require',
                                                  }
                                 }
                         }
-                        Obj.values = newObj;                      
+                        Obj.values = newObj;
                     }
 
                     if (that.histogramView) {
@@ -282,7 +282,7 @@ define(['require',
                     generate: function() {
                         /* var parentWidth = (that.ui.histoGraph.find('svg').parent().width()),
                              parentHeight = (that.ui.histoGraph.find('svg').parent().height())
-                             width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding 
+                             width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding
                               height = ((parentHeight === 0) ? (640) : (parentHeight)) // -15 because  parent has 15 padding */
                         if (that.histogramView) {
                             that.chart = nv.models.multiBarChart()
@@ -290,7 +290,7 @@ define(['require',
                                  .height(height)*/
                                 .stacked(true)
                                 .showControls(false);
-                            that.chart.groupSpacing(0.6) // for bar width and aspace 
+                            that.chart.groupSpacing(0.6) // for bar width and aspace
                         } else {
                             that.chart = nv.models.lineChart().options({
                                 transitionDuration: 300,
@@ -484,7 +484,7 @@ define(['require',
                         that.vent.trigger("date:setDate", {
                                 'from': that.dateUtil.getMomentObject(that.brushValue[0]),
                                 'to': that.dateUtil.getMomentObject(that.brushValue[1])
-                          });          
+                          });
                      }
                     /*}*/
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js
index b0339f3..47393bb 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js
@@ -72,7 +72,7 @@ define(['require',
 
                         }
                     });
-                	this.collection.url = Globals.baseURL + "audit/getAnyGraphData";
+                	this.collection.url = Globals.baseURL + "audit/logs/anygraph";
                     this.collection.modelAttrName = "graphData";
                 }
                 this.dateUtil = Utils.dateUtil;

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/ComparisonView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/ComparisonView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/ComparisonView.js
index 1d26dc4..f922087 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/ComparisonView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/ComparisonView.js
@@ -65,7 +65,7 @@ define(['require',
                     }
                 });
                 this.dateUtil = Utils.dateUtil;
-                this.collection.url = Globals.baseURL + "dashboard/solr/logs_search";
+                this.collection.url = Globals.baseURL + "service/logs";
                 this.bindEvents();
                 this.dateRangeLabel = "Last 1 Hour"
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
index 6c6a77e..e4d327c 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
 		initialize: function(options) {
 			_.extend(this, _.pick(options,'globalVent'));
 //			this.logLevelList = new VLogLevelList();
-//			this.logLevelList.url = Globals.baseURL + "dashboard/getLogLevelCounts";
+//			this.logLevelList.url = Globals.baseURL + "service/logs/levels/counts/namevalues";
 //			this.logLevelList.modelAttrName = "vNameValues";
 			this.columnCollection = new VLogList([],{
 				state: {
@@ -93,15 +93,15 @@ define(['require',
                     pageSize: 99999
                 }
 			});
-			this.componentsList.url = Globals.baseURL + "dashboard/components";
+			this.componentsList.url = Globals.baseURL + "service/logs/components";
 			this.vent = new Backbone.Wreqr.EventAggregator();
-			
+
 			this.defaultParams = ViewUtils.getDefaultParamsForHierarchy();
 			this.bindEvents();
 		},
 		applyParamsDate:function(date){
 			if (date) {
-				var dateString  = date.split(','); 
+				var dateString  = date.split(',');
 				 if(dateString.length){
 				 	var checkDate = Utils.dateUtil.getMomentUTC(dateString[0]);
 				 	if(checkDate.isValid()){
@@ -112,7 +112,7 @@ define(['require',
 				 		}
 				 		return  checkDate.toJSON();
 				 	}
-				 }	
+				 }
 			}
 		},
 		bindEvents : function(){
@@ -144,7 +144,7 @@ define(['require',
 			this.listenTo(this.vent,"tab:refresh",function(params){
 				this.reRenderComponents(params);
 			},this);
-			
+
 			this.listenTo(this.globalVent,"reinitialize:serviceLogs",function(options){
             	this.vent.trigger("reinitialize:filter:tree reinitialize:filter:include:exclude reinitialize:filter:bubbleTable"+
             			" reinitialize:filter:mustNot reinitialize:filter:mustBe reinitialize:filter:level reinitialize:filter:logtime",options);
@@ -163,7 +163,7 @@ define(['require',
 			this.componentsList.fetch({reset:true});
 		},
 		onShow:function(){
-			
+
 			//this.REventHistory.currentView.genrateTimeline();
 
 		},
@@ -267,7 +267,7 @@ define(['require',
 					params : that.defaultParams,
 				}));
             });
-		
+
 
 		},
 		renderVSSearch : function(){
@@ -294,7 +294,7 @@ define(['require',
 								query : query
 							};
 						}
-					
+
 				}));
             });
 		},
@@ -309,7 +309,7 @@ define(['require',
 					placeholder : "Include Search",
 					vent : that.vent,
 					globalVent:that.globalVent,
-					customOptions : columns,  
+					customOptions : columns,
 					eventName : Globals.eventName.serviceLogsIncludeColumns,
 					myFormatData : function(query,searchCollection){
 						var obj=[];
@@ -431,7 +431,7 @@ define(['require',
 				this.ui.excludeComponents.select2('val',values.mustNot.split(","));
 			else
 				this.ui.excludeComponents.select2('val',[]);
-				
+
 		},
 		reRenderComponents : function(params){
 			var iComponents = this.ui.includeComponents.val(),eComponents = this.ui.excludeComponents.val(),that=this;
@@ -455,20 +455,20 @@ define(['require',
 			} else{
 				this.ui.advanceSearch.hide();
 				this.ui.applySearch.hide();
-				this.ui.basicSearch.show();	
+				this.ui.basicSearch.show();
 				obj = this.getIncludeExcludeColValues();
 				obj.advanceSearch = null;
 			}
-			
+
 			this.vent.trigger('main:search',obj);
-			
+
 		},
 		applySearchBtn : function(){
 			var obj = {}
 			obj.advanceSearch = this.RAdvanceSearch.currentView.ui.searchArea.val();
 
 				this.vent.trigger('main:search',obj);
-			
+
 		},
 		getIncludeExcludeColValues : function(){
 			return _.extend(this.RVisualSearchIncCol.currentView.formatData(this.RVisualSearchIncCol.currentView.visualSearch.searchBox.value(),this.RVisualSearchIncCol.currentView.visualSearch.searchQuery),
@@ -483,6 +483,6 @@ define(['require',
 			}
 		}
 	});
-	
-	
-});
\ No newline at end of file
+
+
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
index 4af4670..4b42eab 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
@@ -99,7 +99,7 @@ define(['require',
                         pageSize: 25
                     }
                 });
-                this.logFileCollection.url = Globals.baseURL + "dashboard/solr/logs_search";
+                this.logFileCollection.url = Globals.baseURL + "service/logs";
                 this.vent = new Backbone.Wreqr.EventAggregator();
                 this.bindEvents();
                 this.commonTableOptions = {
@@ -203,7 +203,7 @@ define(['require',
                 //				{startIndex : this.logFileCollection.state.currentPage * this.logFileCollection.state.pageSize},obj),
                 //				'component','from','to','host','level','unit','startIndex','pageSize','format','utcOffset'));
                 var params = $.param(_.extend({}, this.logFileCollection.queryParams, obj));
-                var url = "api/v1/dashboard/exportToTextFile?" + params;
+                var url = "api/v1/service/logs/export?" + params;
                 window.open(url);
                 this.onDialogClosed();
             },
@@ -256,7 +256,7 @@ define(['require',
                             var top = element.offset().top;
                             element.addClass('highlightLog');
                             $("html, body").animate({ scrollTop: (top - 200) }, 1);
-                            /*setTimeout(function(){ 
+                            /*setTimeout(function(){
                             	element.addClass('fadeOutColor')
                             	setTimeout(function(){element.removeClass('fadeOutColor highlightLog');},4000)
                             },6000);*/
@@ -599,7 +599,7 @@ define(['require',
             },
             initializeContextMenu: function() {
                 var that = this;
-                
+
                 $('body').on("mouseup.contextMenuLogFile", function(e) {
                     var selection;
                     if (window.getSelection) {
@@ -657,7 +657,7 @@ define(['require',
                     }else if(type === "IA" || type === "EA"){
     					this.vent.trigger("toggle:facet",{viewName:((type === "IA") ? "include" : "exclude") +"ServiceColumns",
     						key:Globals.serviceLogsColumns["log_message"],value:"*"+this.selectionText+"*"});
-    				} 
+    				}
                     else {
                         //this.vent.trigger("add:include:exclude",{type:type,value:this.selectionText});
                         this.vent.trigger("toggle:facet", { viewName: ((type === "I") ? "include" : "exclude") + "ServiceColumns", key: Globals.serviceLogsColumns["log_message"], value: this.selectionText });
@@ -892,4 +892,4 @@ define(['require',
                 $('body').unbind("mouseup.contextMenuLogFile");
             }
         });
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
index cf33e68..bcd2c80 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
@@ -80,7 +80,7 @@ define(['require',
 		initialize: function(options) {
 			_.extend(this, _.pick(options,'vent','globalVent','params'));
 //			this.collection = new VLogLevel();
-//			this.collection.url = Globals.baseURL+"dashboard/components_count";
+//			this.collection.url = Globals.baseURL+"service/logs/components/count";
 			this.treeModel = new VCommonModel();
 			this.searchParams = (this.params)? this.params :{};
 			this.bindEvents();

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
index c1655f0..66f851c 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
@@ -82,7 +82,7 @@ define(['backbone',
 
                     }
                 });
-                this.serviceLogsCollection.url = Globals.baseURL + "dashboard/getAnyGraphData";
+                this.serviceLogsCollection.url = Globals.baseURL + "service/logs/anygraph";
                 this.serviceLogsCollection.modelAttrName = "graphData";
                 
             	this.topUsers = new VNameValueList([],{
@@ -91,7 +91,7 @@ define(['backbone',
                         pageSize: 9999
                     }
     			});
-    			this.topUsers.url = Globals.baseURL + "audit/getTopAuditUsers";
+    			this.topUsers.url = Globals.baseURL + "audit/logs/users";
     			this.topUsers.modelAttrName = "graphData";
     			
     			this.serviceLoadCollection = new VLogList([], {
@@ -101,7 +101,7 @@ define(['backbone',
 
                     }
                 });
-            	this.serviceLoadCollection.url = Globals.baseURL + "audit/getServiceLoad";
+            	this.serviceLoadCollection.url = Globals.baseURL + "audit/logs/serviceload";
                 this.serviceLoadCollection.modelAttrName = "graphData";
             },
             bindEvents : function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/graphs/backup.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/graphs/backup.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/graphs/backup.js
index 9b589f1..8999e01 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/graphs/backup.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/graphs/backup.js
@@ -78,10 +78,10 @@ define(['require',
                 this.firstRender = true;
                 if (!this.viewType || this.viewType == Globals.graphType.HISTOGRAM.value) {
                     this.histogramView = true;
-                    this.collection.url = Globals.baseURL + "dashboard/getHistogramData";
+                    this.collection.url = Globals.baseURL + "service/logs/histogram";
                     this.collection.modelAttrName = "graphData";
                 } else {
-                    this.collection.url = Globals.baseURL + "audit/getAuditLineGraphData";
+                    this.collection.url = Globals.baseURL + "audit/logs/linegraph";
                     this.collection.modelAttrName = "graphData";
                     this.lineView = true;
                 }
@@ -323,7 +323,7 @@ define(['require',
                     generate: function() {
                         /* var parentWidth = (that.ui.histoGraph.find('svg').parent().width()),
                              parentHeight = (that.ui.histoGraph.find('svg').parent().height())
-                             width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding 
+                             width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding
                               height = ((parentHeight === 0) ? (640) : (parentHeight)) // -15 because  parent has 15 padding */
                         if (that.histogramView) {
                             that.chart = nv.models.multiBarChart()
@@ -331,7 +331,7 @@ define(['require',
                                  .height(height)*/
                                 .stacked(true)
                                 .showControls(false);
-                            that.chart.groupSpacing(0.6) // for bar width and aspace 
+                            that.chart.groupSpacing(0.6) // for bar width and aspace
                         } else {
                             that.chart = nv.models.lineChart().options({
                                 transitionDuration: 300,
@@ -444,8 +444,8 @@ define(['require',
                         that.$(".box").resize(function() {
                             //                             var parentWidth = (that.ui.histoGraph.find('svg').parent().width()),
                             //                                 parentHeight = (that.ui.histoGraph.find('svg').parent().height()),
-                            //                                 width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding 
-                            //                                 height = ((parentHeight === 0) ? (240) : (parentHeight)) // -15 because  parent has 15 padding 
+                            //                                 width = ((parentWidth === 0) ? (891) : (parentWidth)), // -15 because  parent has 15 padding
+                            //                                 height = ((parentHeight === 0) ? (240) : (parentHeight)) // -15 because  parent has 15 padding
                             //                             graph.width(width).height(height);
                             //                          if (that.parentView) {
                             //                                  var elem = that.parentView.$el.find('[data-id="rHistogramGraph"] svg');

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8cf23e4/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
index 276a65e..061c607 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
@@ -62,9 +62,9 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
 
   private static final String LOGSEARCH_ADMIN_PASSWORD_PROPERTY_NAME = "logsearch_admin_password";
 
-  private static final String LOGSEARCH_QUERY_PATH = "/service/dashboard/solr/logs_search";
+  private static final String LOGSEARCH_QUERY_PATH = "/api/v1/service/logs";
 
-  private static final String LOGSEARCH_GET_LOG_LEVELS_PATH = "/service/dashboard/getLogLevelCounts";
+  private static final String LOGSEARCH_GET_LOG_LEVELS_PATH = "/api/v1/service/logs/levels/counts/namevalues";
 
   private static final String LOGSEARCH_ADMIN_CREDENTIAL_NAME = "logsearch.admin.credential";
 


Mime
View raw message