Storage groups group by (ydb-platform#7480)

Author: adameat

ydb/core/viewer/json_handlers_storage.cpp

@@ -4,7 +4,7 @@
 namespace NKikimr::NViewer {
 
 void InitStorageGroupsJsonHandler(TJsonHandlers& jsonHandlers) {
-    jsonHandlers.AddHandler("/storage/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()));
+    jsonHandlers.AddHandler("/storage/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()), 2);
 }
 
 void InitStorageJsonHandlers(TJsonHandlers& jsonHandlers) {

ydb/core/viewer/json_handlers_viewer.cpp

@@ -226,7 +226,7 @@ void InitViewerWhoAmIJsonHandler(TJsonHandlers& handlers) {
 }
 
 void InitViewerQueryJsonHandler(TJsonHandlers& handlers) {
-    handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()));
+    handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()), 2);
 }
 
 void InitViewerNetInfoJsonHandler(TJsonHandlers& handlers) {

ydb/core/viewer/json_pipe_req.h

@@ -220,6 +220,10 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
         return Requests == 1;
     }
 
+    bool NoMoreRequests(ui32 requestsDone = 0) const {
+        return Requests == requestsDone;
+    }
+
     TRequestState GetRequest() const;
     void ReplyAndPassAway(TString data, const TString& error = {});
 

ydb/core/viewer/protos/viewer.proto

@@ -437,12 +437,18 @@ message TStorageGroupInfo {
     uint64 Used = 13;
     uint64 Limit = 14;
     uint64 Available = 15;
-    double Usage = 16;
+    float Usage = 16;
     uint64 Read = 17;
     uint64 Write = 18;
+    float DiskSpaceUsage = 19;
     repeated TStorageVDisk VDisks = 20;
 }
 
+message TStorageGroupGroup {
+    string GroupName = 1;
+    uint64 GroupCount = 2;
+}
+
 message TStoragePoolInfo {
     EFlag Overall = 1;
     string Name = 2;
@@ -467,15 +473,18 @@ message TStorageInfo {
 }
 
 message TStorageGroupsInfo {
-    uint64 Version = 1;
-    optional uint64 TotalGroups = 2;
-    optional uint64 FoundGroups = 3;
-    optional uint64 FieldsAvailable = 4;
-    optional uint64 FieldsRequired = 5;
+    uint32 Version = 1;
+    optional uint32 TotalGroups = 2;
+    optional uint32 FoundGroups = 3;
+    optional uint32 FieldsAvailable = 4;
+    optional uint32 FieldsRequired = 5;
     optional bool NeedFilter = 6;
-    optional bool NeedSort = 7;
-    optional bool NeedLimit = 8;
-    repeated TStorageGroupInfo StorageGroups = 10;
+    optional bool NeedGroup = 7;
+    optional bool NeedSort = 8;
+    optional bool NeedLimit = 9;
+    repeated string Problems = 10;
+    repeated TStorageGroupInfo StorageGroups = 11;
+    repeated TStorageGroupGroup StorageGroupGroups = 12;
 }
 
 message TStorageUsageStats {