Mshost stats

api/src/main/java/com/cloud/server/ManagementServerHostStats.java

@@ -0,0 +1,113 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// 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
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package com.cloud.server;
+
+import java.util.Date;
+
+/**
+ * management server related stats
+ */
+public interface ManagementServerHostStats {
+    Date getCollectionTime();
+
+    Date getSystemBootTime();
+
+    long getManagementServerHostId();
+
+    String getManagementServerHostUuid();
+
+    long getSessions();
+
+    double getCpuUtilization();
+
+    long getTotalJvmMemoryBytes();
+
+    double getFreeJvmMemoryBytes();
+
+    long getProcessJvmMemoryBytes();
+
+    long getJvmUptime();
+
+    long getJvmStartTime();
+
+    int getAvailableProcessors();
+
+    double getLoadAverage();
+
+    long getTotalInit();
+
+    long getTotalUsed();
+
+    long getMaxJvmMemoryBytes();
+
+    long getTotalCommitted();
+
+    long getPid();
+
+    String getJvmName();
+
+    String getJvmVendor();
+
+    String getJvmVersion();
+
+    String getOsDistribution();
+
+    int getAgentCount();
+
+    long getHeapMemoryUsed();
+
+    long getHeapMemoryTotal();
+
+    int getThreadsBlockedCount();
+
+    int getThreadsTotalCount();
+
+    int getThreadsDaemonCount();
+
+    int getThreadsRunnableCount();
+
+    int getThreadsTerminatedCount();
+
+    int getThreadsWaitingCount();
+
+    long getSystemMemoryTotal();
+
+    long getSystemMemoryFree();
+
+    long getSystemMemoryUsed();
+
+    long getSystemMemoryVirtualSize();
+
+    String getLogInfo();
+
+    /**
+     * @return in mega hertz
+     */
+    double getSystemTotalCpuCycles();
+
+    double[] getSystemLoadAverages();
+
+    long[] getSystemCyclesUsage();
+
+    boolean isDbLocal();
+
+    boolean isUsageLocal();
+
+    String getKernelVersion();
+}

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -239,10 +239,17 @@ public class ApiConstants {
     public static final String IS_RECURSIVE = "isrecursive";
     public static final String ISO_FILTER = "isofilter";
     public static final String ISO_GUEST_OS_NONE = "None";
+    public static final String JAVA_DISTRIBUTION = "javadistribution";
+    public static final String JAVA_VERSION = "javaversion";
     public static final String JOB_ID = "jobid";
     public static final String JOB_STATUS = "jobstatus";
+    public static final String KEEPALIVE_ENABLED = "keepaliveenabled";
+    public static final String KERNEL_VERSION = "kernelversion";
     public static final String LABEL = "label";
     public static final String LASTNAME = "lastname";
+    public static final String LAST_BOOT = "lastboottime";
+    public static final String LAST_SERVER_START = "lastserverstart";
+    public static final String LAST_SERVER_STOP = "lastserverstop";
     public static final String LEVEL = "level";
     public static final String LENGTH = "length";
     public static final String LIMIT_CPU_USE = "limitcpuuse";
@@ -260,7 +267,6 @@ public class ApiConstants {
     public static final String MIGRATION_TYPE = "migrationtype";
     public static final String MEMORY = "memory";
     public static final String MODE = "mode";
-    public static final String KEEPALIVE_ENABLED = "keepaliveenabled";
     public static final String NAME = "name";
     public static final String METHOD_NAME = "methodname";
     public static final String NETWORK_DOMAIN = "networkdomain";
@@ -273,6 +279,7 @@ public class ApiConstants {
     public static final String NEW_END_IP = "newendip";
     public static final String NUM_RETRIES = "numretries";
     public static final String OFFER_HA = "offerha";
+    public static final String OS_DISTRIBUTION = "osdistribution";
     public static final String IS_SYSTEM_OFFERING = "issystem";
     public static final String IS_DEFAULT_USE = "defaultuse";
     public static final String OLD_FORMAT = "oldformat";

api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java

@@ -22,6 +22,9 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.management.ManagementServerHost.State;
+
+import java.util.Date;
 
 @EntityReference(value = ManagementServerHost.class)
 public class ManagementServerResponse extends BaseResponse {
@@ -35,12 +38,80 @@ public class ManagementServerResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.STATE)
     @Param(description = "the state of the management server")
-    private ManagementServerHost.State state;
+    private State state;
 
     @SerializedName(ApiConstants.VERSION)
     @Param(description = "the version of the management server")
     private String version;
 
+    @SerializedName(ApiConstants.JAVA_DISTRIBUTION)
+    @Param(description = "the java distribution name running the management server process")
+    private String javaDistribution;
+
+    @SerializedName(ApiConstants.JAVA_VERSION)
+    @Param(description = "the version of the java distribution running the management server process")
+    private String javaVersion;
+
+    @SerializedName(ApiConstants.OS_DISTRIBUTION)
+    @Param(description = "the name of the OS distribution running on the management server")
+    private String osDistribution;
+
+    @SerializedName(ApiConstants.LAST_SERVER_START)
+    @Param(description = "the last time this Management Server was started")
+    private Date lastServerStart;
+
+    @SerializedName(ApiConstants.LAST_SERVER_STOP)
+    @Param(description = "the last time this Management Server was stopped")
+    private Date lastServerStop;
+
+    @SerializedName(ApiConstants.LAST_BOOT)
+    @Param(description = "the last time the host on which this Management Server runs was booted")
+    private Date lastBoot;
+
+    @SerializedName(ApiConstants.KERNEL_VERSION)
+    @Param(description = "the running OS kernel version for this Management Server")
+    private String kernelVersion;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getJavaVersion() {
+        return javaVersion;
+    }
+
+    public String getJavaDistribution() {
+        return javaDistribution;
+    }
+
+    public String getOsDistribution() {
+        return osDistribution;
+    }
+
+    public Date getLastServerStart() {
+        return lastServerStart;
+    }
+
+    public Date getLastServerStop() {
+        return lastServerStop;
+    }
+
+    public Date getLastBoot() {
+        return lastBoot;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -49,11 +120,39 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public void setState(ManagementServerHost.State state) {
+    public void setState(State state) {
         this.state = state;
     }
 
     public void setVersion(String version) {
         this.version = version;
     }
+
+    public void setJavaDistribution(String javaDistribution) {
+        this.javaDistribution = javaDistribution;
+    }
+
+    public void setJavaVersion(String javaVersion) {
+        this.javaVersion = javaVersion;
+    }
+
+    public void setOsDistribution(String osDistribution) {
+        this.osDistribution = osDistribution;
+    }
+
+    public void setLastServerStart(Date lastServerStart) {
+        this.lastServerStart = lastServerStart;
+    }
+
+    public void setLastServerStop(Date lastServerStop) {
+        this.lastServerStop = lastServerStop;
+    }
+
+    public void setLastBoot(Date lastBoot) {
+        this.lastBoot = lastBoot;
+    }
+
+    public void setKernelVersion(String kernelVersion) {
+        this.kernelVersion = kernelVersion;
+    }
 }

api/src/main/java/org/apache/cloudstack/management/ManagementServerStatus.java

@@ -0,0 +1,45 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// 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
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.management;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+import java.util.Date;
+
+public interface ManagementServerStatus extends InternalIdentity {
+    long getId();
+
+    String getMsId();
+
+    Date getLastJvmStart();
+
+    Date getLastJvmStop();
+
+    Date getLastSystemBoot();
+
+    String getOsDistribution();
+
+    String getJavaName();
+
+    String getJavaVersion();
+
+    Date getUpdated();
+
+    Date getCreated();
+
+    Date getRemoved();
+}

client/src/main/webapp/WEB-INF/web.xml

@@ -28,6 +28,9 @@
     <listener>
         <listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
     </listener>
+    <listener>
+        <listener-class>com.cloud.api.ApiSessionListener</listener-class>
+    </listener>
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>

engine/orchestration/src/main/java/com/cloud/agent/manager/ConnectedAgentAttache.java

@@ -26,7 +26,7 @@
 import com.cloud.utils.nio.Link;
 
 /**
- * ConnectedAgentAttache implements an direct connection to this management server.
+ * ConnectedAgentAttache implements a direct connection to this management server.
  */
 public class ConnectedAgentAttache extends AgentAttache {
     private static final Logger s_logger = Logger.getLogger(ConnectedAgentAttache.class);

engine/schema/src/main/java/com/cloud/host/dao/HostDao.java

@@ -142,4 +142,11 @@ public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Stat
     HostVO findByName(String name);
 
     List<HostVO> listHostsWithActiveVMs(long offeringId);
+
+    /**
+     * Retrieves the number of hosts/agents this {@see ManagementServer} has responsibility over.
+     * @param msid the id of the {@see ManagementServer}
+     * @return the number of hosts/agents this {@see ManagementServer} has responsibility over
+     */
+    int countByMs(long msid);
 }

engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java

@@ -119,6 +119,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     protected SearchBuilder<HostVO> UnmanagedApplianceSearch;
     protected SearchBuilder<HostVO> MaintenanceCountSearch;
     protected SearchBuilder<HostVO> HostTypeCountSearch;
+    protected SearchBuilder<HostVO> ResponsibleMsCountSearch;
     protected SearchBuilder<HostVO> HostTypeZoneCountSearch;
     protected SearchBuilder<HostVO> ClusterStatusSearch;
     protected SearchBuilder<HostVO> TypeNameZoneSearch;
@@ -179,6 +180,10 @@ public void init() {
         HostTypeCountSearch.and("type", HostTypeCountSearch.entity().getType(), SearchCriteria.Op.EQ);
         HostTypeCountSearch.done();
 
+        ResponsibleMsCountSearch = createSearchBuilder();
+        ResponsibleMsCountSearch.and("managementServerId", ResponsibleMsCountSearch.entity().getManagementServerId(), SearchCriteria.Op.EQ);
+        ResponsibleMsCountSearch.done();
+
         HostTypeZoneCountSearch = createSearchBuilder();
         HostTypeZoneCountSearch.and("type", HostTypeZoneCountSearch.entity().getType(), SearchCriteria.Op.EQ);
         HostTypeZoneCountSearch.and("dc", HostTypeZoneCountSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
@@ -1287,6 +1292,13 @@ public List<HostVO> listHostsWithActiveVMs(long offeringId) {
         }
     }
 
+    @Override
+    public int countByMs(long msid) {
+        SearchCriteria<HostVO> sc = ResponsibleMsCountSearch.create();
+        sc.setParameters("managementServerId", msid);
+        return getCount(sc);
+    }
+
     @Override
     public List<HostVO> listAllHostsByType(Host.Type type) {
         SearchCriteria<HostVO> sc = TypeSearch.create();