Merge pull request #2206 from subutai-io/dev

Dev

Author: dilshat

Jenkinsfile

@@ -47,13 +47,15 @@ node() {
 	switch (env.BRANCH_NAME) {
 		case ~/master/: hubIp = "masterhub.subut.ai"; break;
 		case ~/dev/: hubIp = "devhub.subut.ai"; break;
+		case ~/sysnet/: hubIp = "devhub.subut.ai"; break;
 		default: hubIp = "hub.subut.ai"
 	}
 
 	// String url = "https://eu0.cdn.subut.ai:8338/kurjun/rest"
 	switch (env.BRANCH_NAME) {
 		case ~/master/: cdnHost = "mastercdn.subut.ai"; break;
 		case ~/dev/: cdnHost = "devcdn.subut.ai"; break;
+		case ~/sysnet/: cdnHost = "sysnetcdn.subut.ai"; break;
 		default: cdnHost = "cdn.subut.ai"
 	}
 
@@ -178,7 +180,7 @@ node() {
 		}
 	}
 
-	if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'dev') {
+	if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'dev' || env.BRANCH_NAME == 'sysnet') {
 		stage("Deploy artifacts on kurjun")
 		deleteDir()
 

management/server/core/environment-manager/environment-manager-rest-ui/src/main/java/io/subutai/core/environment/rest/ui/RestServiceImpl.java

@@ -7,6 +7,7 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1194,6 +1195,13 @@ public Response listTenantEnvironments()
     {
         Set<EnvironmentDto> tenantEnvs = environmentManager.getTenantEnvironments();
 
+        //remove remote containers
+        for ( EnvironmentDto environmentDto : tenantEnvs )
+        {
+            Set<ContainerDto> containerDtos = environmentDto.getContainers();
+            containerDtos.removeIf( containerDto -> !containerDto.isLocal() );
+        }
+
         return Response.ok( JsonUtil.toJson( removeXss( tenantEnvs ) ) ).build();
     }
 

management/server/core/local-peer/local-peer-impl/src/main/java/io/subutai/core/localpeer/impl/LocalPeerImpl.java

@@ -4011,10 +4011,10 @@ private void removeStaleContainers()
                         }
                     }
 
-                    if ( found || System.currentTimeMillis() - networkResource.getDateCreated() < TimeUnit.MINUTES
-                            .toMillis( 5 ) )
+                    if ( found || System.currentTimeMillis() - networkResource.getDateCreated() < TimeUnit.DAYS
+                            .toMillis( 7 ) )
                     {
-                        //don't cleanup the found ones and the ones that are created less than 5 min ago
+                        //don't cleanup the found ones and the ones that are created less than 7 days ago
                         iterator.remove();
                     }
                 }

management/server/core/tracker/tracker-impl/src/main/java/io/subutai/core/tracker/impl/TrackerOperationImpl.java

@@ -145,8 +145,8 @@ private synchronized void addLog( String logString, OperationState state )
             }
             log.append( String.format( "{\"date\" : %s, \"log\" : \"%s\", \"state\" : \"%s\"},",
                     new Timestamp( System.currentTimeMillis() ).getTime(),
-                    logString.replaceAll( "\r", "" ).replaceAll( "\n", "" ).replaceAll( "\"", "" )
-                             .replaceAll( "\\{", "" ).replaceAll( "}", "" ), state ) );
+                    logString.replaceAll( "\r", "" ).replaceAll( "\n", "" ).replaceAll( "\\\\", "" )
+                             .replaceAll( "\"", "" ).replaceAll( "\\{", "" ).replaceAll( "}", "" ), state ) );
         }
         this.state = state;
         tracker.saveTrackerOperation( source, this );

management/server/core/tracker/tracker-impl/src/test/java/io/subutai/core/tracker/impl/TrackerOperationImplTest.java

@@ -84,6 +84,16 @@ public void shouldAddLog()
     }
 
 
+    @Test
+    public void testAddLogRemoveSymbols()
+    {
+        TrackerOperationImpl poi = new TrackerOperationImpl( SOURCE, DESCRIPTION, mock( TrackerImpl.class ) );
+
+        poi.addLog( "test\rtest\ntest\\test\"test{}test" );
+        assertThat( poi.getLog(), containsString( "testtesttesttesttesttest" ) );
+    }
+
+
     @Test
     public void shouldAddLogNSucceed()
     {

management/server/webui/src/main/webapp/subutai-app/common/partials/nav-menu.html

@@ -5,7 +5,7 @@
     </a>
   </div>
   <ul class="b-nav__menu">
-    <li class="b-nav-menu" ng-class="subutaiController.activeState == 'home' ? 'b-nav-menu_active' : ''">
+    <li class="b-nav-menu" ng-if="subutaiController.adminMenus" ng-class="subutaiController.activeState == 'home' ? 'b-nav-menu_active' : ''">
       <a ui-sref="home" class="b-nav-menu-link" id="subt-link__monitoring">
 				<span class="b-nav-menu__icon b-nav-menu-link__item">
 					<svg class="b-nav-menu-icon">

management/server/webui/src/main/webapp/subutai-app/environment/service.js

@@ -42,6 +42,7 @@ function environmentService($http, $q) {
 
 
 		getEnvironments : getEnvironments,
+		getTenants: getTenants,
 		startEnvironmentAdvancedBuild : startEnvironmentAdvancedBuild,
 		startEnvironmentAutoBuild: startEnvironmentAutoBuild,
 		destroyEnvironment: destroyEnvironment,
@@ -155,6 +156,10 @@ function environmentService($http, $q) {
 		return $http.get(ENVIRONMENTS_URL, {withCredentials: true, headers: {'Content-Type': 'application/json'}});
 	}
 
+	function getTenants() {
+		return $http.get(TENANTS_URL, {withCredentials: true, headers: {'Content-Type': 'application/json'}});
+	}
+
 
 	function startEnvironmentAutoBuild(environmentName, containers) {
 		var postData = 'name=' + environmentName + "&topology=" + containers;

management/server/webui/src/main/webapp/subutai-app/monitoring/service.js

@@ -13,26 +13,18 @@ function monitoringSrv($http, environmentService, peerRegistrationService) {
 		getEnvironments: getEnvironments,
 		getResourceHosts: getResourceHosts,
 		getInfo: getInfo,
-//		getP2Pstatus: getP2Pstatus,
 		isAdminCheck: isAdminCheck,
 	};
 
 	return monitoringSrv;
 
 	function getEnvironments() {
-		return environmentService.getEnvironments();
+		return environmentService.getTenants();
 	}
 
 	function getResourceHosts() {
 		return environmentService.getResourceHosts();
 	}
-//
-//	function getP2Pstatus() {
-//		return $http.get(
-//			BASE_URL + 'p2p/status',
-//			{withCredentials: true, headers: {'Content-Type': 'application/json'}}
-//		);
-//	}
 
 	function isAdminCheck() {
 		return $http.get(