Cluster state info parameters (#29182)

Author: Evgenik2

ydb/core/grpc_services/rpc_cluster_state.cpp

@@ -371,27 +371,37 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
         }
     }
 
-    void ReplyAndPassAway() {
-        CloseSession();
-        TResponse response;
-        Ydb::Operations::Operation& operation = *response.mutable_operation();
-        operation.set_ready(true);
-        operation.set_status(Ydb::StatusIds::SUCCESS);
+    void AddBlock(Ydb::Monitoring::ClusterStateResult& result, const TString& name, const auto& obj) {
         google::protobuf::util::JsonPrintOptions jsonOpts;
         jsonOpts.add_whitespace = true;
         TString data;
-        google::protobuf::util::MessageToJsonString(State, &data, jsonOpts);
-        Ydb::Monitoring::ClusterStateResult result;
+        google::protobuf::util::MessageToJsonString(obj, &data, jsonOpts);
         auto* block = result.Addblocks();
-        block->Setname("cluster_state.json");
+        block->Setname(name);
         block->Setcontent(data);
         block->Mutabletimestamp()->set_seconds(TInstant::Now().Seconds());
+    }
 
+    void ReplyAndPassAway() {
+        CloseSession();
+        TResponse response;
+        Ydb::Operations::Operation& operation = *response.mutable_operation();
+        operation.set_ready(true);
+        operation.set_status(Ydb::StatusIds::SUCCESS);
+
+        Ydb::Monitoring::ClusterStateResult result;
+        AddBlock(result, "cluster_state.json", State);
+        NKikimrClusterStateInfoProto::TClusterStateInfoParameters params;
+        params.SetStartedAt(Started.ToStringUpToSeconds());
+        params.SetDurationSeconds(Duration.Seconds());
+        params.SetPeriodSeconds(Period.Seconds());
+        AddBlock(result, "cluster_state_fetch_parameters.json", params);
         for (ui32 node : xrange(Counters.size())) {
             for (ui32 i : xrange(Counters[node].size())) {
                 auto* counterBlock = result.Addblocks();
                 TStringBuilder sb;
-                sb << "node_" << node << "_counters_" << i << ".json";
+                auto nodeId = Nodes[node].NodeId;
+                sb << "node_" << nodeId << "_counters_" << i << ".json";
                 counterBlock->Setname(sb);
                 counterBlock->Setcontent(Counters[node][i].first);
                 counterBlock->Mutabletimestamp()->set_seconds(Counters[node][i].second.Seconds());

ydb/core/protos/cluster_state_info.proto

@@ -27,6 +27,12 @@ message TClusterStateQueryInfo {
     optional NKikimrKqp.TQueryResponse Response = 3;
 }
 
+message TClusterStateInfoParameters {
+    optional uint32 DurationSeconds = 1;
+    optional uint32 PeriodSeconds = 2;
+    optional string StartedAt = 3;
+}
+
 message TClusterStateInfo {
     optional Ydb.Monitoring.SelfCheckResult SelfCheck = 1;
     repeated TNodeInfo NodeInfos = 2;