Health statistics

components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/healthStatistics/AverageLoadAverageBean.java

@@ -0,0 +1,74 @@
+/*
+ * 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.stratos.common.beans.healthStatistics;
+
+
+public class AverageLoadAverageBean {
+    private static final long serialVersionUID = -7788619177798333712L;
+
+    private String clusterId;
+    private Long timeStamp;
+    private Double memberAverageLoadAverage;
+    private String memberId;
+
+    public AverageLoadAverageBean(String clusterId, Long timeStamp, Double memberAverageLoadAverage, String memberId) {
+        this.clusterId = clusterId;
+        this.timeStamp = timeStamp;
+        this.memberAverageLoadAverage = memberAverageLoadAverage;
+        this.memberId = memberId;
+    }
+
+
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+
+    public Double getMemberAverageLoadAverage() {
+        return memberAverageLoadAverage;
+    }
+
+    public void setMemberAverageLoadAverage(Double memberAverageLoadAverage) {
+        this.memberAverageLoadAverage = memberAverageLoadAverage;
+    }
+
+    public Long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+
+}

components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/healthStatistics/AverageMemoryConsumptionBean.java

@@ -0,0 +1,70 @@
+/*
+ * 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.stratos.common.beans.healthStatistics;
+
+public class AverageMemoryConsumptionBean {
+    private static final long serialVersionUID = -7788619177798333711L;
+
+    private String clusterId;
+    private Double memberAverageMemoryConsumption;
+    private Long timeStamp;
+    private String memberId;
+
+    public AverageMemoryConsumptionBean(String clusterId, Double memberAverageMemoryConsumption, Long timeStamp, String memberId) {
+        this.clusterId = clusterId;
+        this.memberAverageMemoryConsumption = memberAverageMemoryConsumption;
+        this.timeStamp = timeStamp;
+        this.memberId = memberId;
+    }
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+    public Double getMemberAverageMemoryConsumption() {
+        return memberAverageMemoryConsumption;
+    }
+
+    public void setMemberAverageMemoryConsumption(Double memberAverageMemoryConsumption) {
+        this.memberAverageMemoryConsumption = memberAverageMemoryConsumption;
+    }
+
+    public Long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+}
+

components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/healthStatistics/InFlightRequestBean.java

@@ -0,0 +1,65 @@
+/*
+ * 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.stratos.common.beans.healthStatistics;
+
+
+public class InFlightRequestBean {
+
+    private static final long serialVersionUID = -7788619177798333712L;
+
+    private String clusterId;
+    private Long timeStamp;
+    private Double inFlightRequestCount;
+
+    public InFlightRequestBean(String clusterId, Long timeStamp, Double inFlightRequestCount) {
+        this.clusterId = clusterId;
+        this.timeStamp = timeStamp;
+        this.inFlightRequestCount = inFlightRequestCount;
+    }
+
+
+
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+    public Double getInFlightRequestCount() {
+        return inFlightRequestCount;
+    }
+
+    public void setInFlightRequestCount(Double inFlightRequestCount) {
+        this.inFlightRequestCount = inFlightRequestCount;
+    }
+
+
+    public Long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+}

components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java

@@ -56,6 +56,7 @@ private static StreamDefinition createStreamDefinition() {
             payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING));
             payloadData.add(new Attribute("network_partition_id", AttributeType.STRING));
             payloadData.add(new Attribute("member_id", AttributeType.STRING));
+            payloadData.add(new Attribute("timeStamp", AttributeType.LONG));
             payloadData.add(new Attribute("partition_id", AttributeType.STRING));
             payloadData.add(new Attribute("health_description", AttributeType.STRING));
             payloadData.add(new Attribute("value", AttributeType.DOUBLE));
@@ -90,6 +91,7 @@ public void publish(String clusterId, String clusterInstanceId, String networkPa
         payload.add(clusterInstanceId);
         payload.add(networkPartitionId);
         payload.add(memberId);
+        payload.add(System.currentTimeMillis());
         payload.add(partitionId);
         payload.add(health);
         payload.add(value);

components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java

@@ -53,6 +53,7 @@ private static StreamDefinition createStreamDefinition() {
             // Set payload definition
             payloadData.add(new Attribute("cluster_id", AttributeType.STRING));
             payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING));
+            payloadData.add(new Attribute("timeStamp", AttributeType.LONG));
             payloadData.add(new Attribute("network_partition_id", AttributeType.STRING));
             payloadData.add(new Attribute("in_flight_request_count", AttributeType.DOUBLE));
             streamDefinition.setPayloadData(payloadData);
@@ -76,6 +77,7 @@ public void publish(String clusterId, String clusterInstanceId, String networkPa
         List<Object> payload = new ArrayList<Object>();
         payload.add(clusterId);
         payload.add(clusterInstanceId);
+        payload.add(System.currentTimeMillis());
         payload.add(networkPartitionId);
         payload.add((double) inFlightRequestCount);
 

components/org.apache.stratos.manager.console/console/applications_form.jag

@@ -26,6 +26,7 @@ var log = new Log("apachestratos.applications_form"),
         error = [],
         list_data,
         caramel = require('caramel'),
+        config = require('/config/console.json'),
         context = caramel.configs().context,
         menuJson = require('/controllers/menu/menu.json'),
         util = require('/controllers/rest/rest_calls.jag'),
@@ -49,7 +50,8 @@ if (!elements) {
         var applicationName = elements.applicationId;
 
         //get application json
-        applicationJSON = util.RESTCalls.getApplicationJSON(applicationName);
+        applicationJSONapplicationJSON = util.RESTCalls.getApplicationJSON(applicationName);
+
         var applicationAlias = applicationJSON.alias;
 
         if(elements.action == 'view'){
@@ -90,6 +92,7 @@ if (!elements) {
 
 }
 
+var healthStatisticEnable=config.healthStatistics.UI_enable;
 
 var formtype = elements.formtype;
 
@@ -109,6 +112,7 @@ switch (formtype) {
 var caramelData = {
     breadcrumbPathLevelOne: breadcrumbPathLevelOne,
     breadcrumbPathLevelTwo: '',
+    healthStatisticEnable:healthStatisticEnable,
     left_menu: leftMenu,
     isForm: isForm,
     isEdit: isEdit,

components/org.apache.stratos.manager.console/console/config/console.json

@@ -1,5 +1,8 @@
 {
     "backendServerConfiguration": {
         "url": "%https.host%/api/v4.1"
+    },
+    "healthStatistics": {
+        "UI_enable": "false"
     }
 }