Merge 9db56be into 09ba4d5

Author: vporyadke

ydb/core/mind/hive/hive_schema.h

@@ -298,6 +298,15 @@ struct Schema : NIceDb::Schema {
         using TColumns = TableColumns<Node, TabletType, MaxCount>;
     };
 
+    struct OperationsLog : Table<21> {
+        struct Timestamp : Column<1, NScheme::NTypeIds::Uint64> {};
+        struct User : Column<2, NScheme::NTypeIds::String> {};
+        struct Operation : Column<3, NScheme::NTypeIds::String> { using Type = NKikimrHive::TOperation; };
+
+        using TKey = TableKey<Timestamp>;
+        using TColumns = TableColumns<Timestamp, User, Operation>;
+    };
+
     using TTables = SchemaTables<
                                 State,
                                 Tablet,
@@ -313,7 +322,8 @@ struct Schema : NIceDb::Schema {
                                 SubDomain,
                                 BlockedOwner,
                                 TabletOwners,
-                                TabletAvailabilityRestrictions
+                                TabletAvailabilityRestrictions,
+                                OperationsLog
                                 >;
     using TSettings = SchemaSettings<
                                     ExecutorLogBatching<true>,

ydb/core/mind/hive/monitoring.cpp

@@ -25,6 +25,7 @@ SRCS(
     leader_tablet_info.h
     metrics.h
     monitoring.cpp
+    monitoring.h
     node_info.cpp
     node_info.h
     object_distribution.h
@@ -82,6 +83,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/library/aclib
     ydb/library/actors/core
     ydb/library/actors/interconnect
     library/cpp/containers/ring_buffer

ydb/core/mind/hive/ya.make

@@ -567,3 +567,39 @@ message TEvUpdateDomainReply {
     optional fixed64 Origin = 1;
     optional uint64 TxId = 2;
 }
+
+message TConfigUpdate {
+    optional uint64 FieldNumber = 1;
+    optional string Value = 2;
+}
+
+message TConfigUpdates {
+    repeated TConfigUpdate ConfigUpdate = 1;
+}
+
+message TTabletAvailabilityRestriction {
+    optional NKikimrTabletBase.TTabletTypes.EType Type = 1;
+    optional uint64 MaxCount = 2 [default = 1000000];
+}
+
+message TNodeOperation {
+    optional uint32 NodeId = 1;
+    optional bool Down = 2;
+    optional bool Freeze = 3;
+    repeated TTabletAvailabilityRestriction TabletAvailability = 4;
+}
+
+message TAllowedMetricsUpdate {
+    optional NKikimrTabletBase.TTabletTypes.EType Type = 1;
+    repeated uint64 AllowedMetrics = 2;
+}
+
+message TAllowedMetricsUpdates {
+    repeated TAllowedMetricsUpdate AllowedMetricsUpdate = 1;
+}
+
+message TOperation {
+    optional TConfigUpdates ConfigUpdates = 1;
+    optional TNodeOperation NodeOperation = 2;
+    optional TAllowedMetricsUpdates AllowedMetricsUpdates = 3;
+}

ydb/core/protos/hive.proto

@@ -35,15 +35,15 @@ class TForwardingActor : public TActorBootstrapped<TForwardingActor> {
         return NKikimrServices::TActivity::TABLET_FORWARDING_ACTOR;
     }
 
-    TForwardingActor(const TTabletMonitoringProxyConfig& config, ui64 targetTablet, bool forceFollower, const TActorId& sender, const NMonitoring::IMonHttpRequest& request)
+    TForwardingActor(const TTabletMonitoringProxyConfig& config, ui64 targetTablet, bool forceFollower, const TActorId& sender, const NMonitoring::IMonHttpRequest& request, const TString& userToken)
         : Config(config)
         , TargetTablet(targetTablet)
         , ForceFollower(forceFollower)
         , Sender(sender)
-        , Request(ConvertRequestToProtobuf(request))
+        , Request(ConvertRequestToProtobuf(request, userToken))
     {}
 
-    static NActorsProto::TRemoteHttpInfo ConvertRequestToProtobuf(const NMonitoring::IMonHttpRequest& request) {
+    static NActorsProto::TRemoteHttpInfo ConvertRequestToProtobuf(const NMonitoring::IMonHttpRequest& request, const TString& userToken) {
         NActorsProto::TRemoteHttpInfo pb;
         pb.SetMethod(request.GetMethod());
         pb.SetPath(TString(request.GetPathInfo()));
@@ -70,6 +70,7 @@ class TForwardingActor : public TActorBootstrapped<TForwardingActor> {
         if (const auto& addr = request.GetRemoteAddr()) {
             pb.SetRemoteAddr(addr.data(), addr.size());
         }
+        pb.SetUserToken(userToken);
         return pb;
     }
 
@@ -279,7 +280,7 @@ TTabletMonitoringProxyActor::Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorCon
         const TString &tabletIdParam = cgi->Get("FollowerID");
         const ui64 tabletId = TryParseTabletId(tabletIdParam);
         if (tabletId) {
-            ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, true, ev->Sender, msg->Request));
+            ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, true, ev->Sender, msg->Request, msg->UserToken));
             return;
         }
     }
@@ -289,7 +290,7 @@ TTabletMonitoringProxyActor::Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorCon
         const TString &tabletIdParam = cgi->Get("TabletID");
         const ui64 tabletId = TryParseTabletId(tabletIdParam);
         if (tabletId) {
-            ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, false, ev->Sender, msg->Request));
+            ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, false, ev->Sender, msg->Request, msg->UserToken));
             return;
         }
     }

ydb/core/tablet/tablet_monitoring_proxy.cpp

@@ -34,6 +34,7 @@ message TRemoteHttpInfo {
     optional bytes PostContent = 8;
     repeated THeader Headers = 9;
     optional string RemoteAddr = 7;
+    optional string UserToken = 10;
 
     // for compatibility reasons (incorrect field types merged in 21-4)
     reserved 5;

ydb/library/actors/protos/actors.proto

@@ -549,6 +549,53 @@
             }
         }
     },
+    {
+        "TableId": 21,
+        "TableName": "OperationsLog",
+        "TableKey": [
+            1
+        ],
+        "ColumnsAdded": [
+            {
+                "ColumnId": 1,
+                "ColumnName": "Timestamp",
+                "ColumnType": "Uint64"
+            },
+            {
+                "ColumnId": 2,
+                "ColumnName": "User",
+                "ColumnType": "String"
+            },
+            {
+                "ColumnId": 3,
+                "ColumnName": "Operation",
+                "ColumnType": "String"
+            }
+        ],
+        "ColumnsDropped": [],
+        "ColumnFamilies": {
+            "0": {
+                "Columns": [
+                    1,
+                    2,
+                    3
+                ],
+                "RoomID": 0,
+                "Codec": 0,
+                "InMemory": false,
+                "Cache": 0,
+                "Small": 4294967295,
+                "Large": 4294967295
+            }
+        },
+        "Rooms": {
+            "0": {
+                "Main": 1,
+                "Outer": 1,
+                "Blobs": 1
+            }
+        }
+    },
     {
         "TableId": 4,
         "TableName": "Node",