Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer

Timestamp:

06/30/15 13:12:07 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated database schema
• updated sql scripts
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

• updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

• added exception page
• improved jobs, clients, users and groups page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Client.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientDetails.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Group.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupDetails.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Client.cs

@@ -35 +35 @@
     public Guid? GroupId { get; set; }
     public string GroupName { get; set; }
+    public bool IsAllowedToCalculate { get; set; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientDetails.cs

@@ -43 +43 @@
     public long TotalTransferringTime { get; set; }
     public IEnumerable<TaskStateCount> TasksStates { get; set; }
+    public IEnumerable<User> Users { get; set; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Group.cs

@@ -31 +31 @@
     public int UsedMemory { get; set; }
     public double CpuUtilization { get; set; }
-    public int Clients { get; set; }
+    public int TotalClients { get; set; }
+    public int OnlineClients { get; set; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupDetails.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Services.WebApp.Statistics.WebApi.DataTransfer {
@@ -30 +31 @@
     public int TotalMemory { get; set; }
     public int UsedMemory { get; set; }
-    public double CpuUtilization { get; set; }
-    public int Clients { get; set; }
+    public double TotalCpuUtilization { get; set; }
+    public double ActiveCpuUtilization { get; set; }
+    public int TotalClients { get; set; }
+    public int OnlineClients { get; set; }
+    public long TotalUnavailableTime { get; set; }
+    public long TotalCalculatingTime { get; set; }
+    public long TotalIdleTime { get; set; }
+    public long TotalOfflineTime { get; set; }
+    public long TotalTransferringTime { get; set; }
+    public IEnumerable<TaskStateCount> TasksStates { get; set; }
   }
 }