Merge 2794150 into 7ec0ff8

vporyadke · web-flow · commit f0dc0bcfcfc8 · 2024-02-09T14:42:44.000Z
diff --git a/ydb/core/mind/hive/hive_schema.h b/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> {}; // JSON
+
+        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>,
diff --git a/ydb/core/mind/hive/monitoring.cpp b/ydb/core/mind/hive/monitoring.cpp
diff --git a/ydb/core/mind/hive/monitoring.h b/ydb/core/mind/hive/monitoring.h
@@ -0,0 +1,23 @@
+#include <library/cpp/json/json_writer.h>
+#include <ydb/core/protos/hive.pb.h>
+#include <ydb/core/tablet_flat/flat_cxx_database.h>
+#include <ydb/library/aclib/aclib.h>
+#include <ydb/library/actors/core/mon.h>
+
+namespace NKikimr {
+namespace NHive {
+
+class TLoggedMonTransaction {
+private:
+    TInstant Timestamp;
+    TString User;
+
+protected:
+    TLoggedMonTransaction(const NMon::TEvRemoteHttpInfo::TPtr& ev);
+
+    bool Prepare(NIceDb::TNiceDb& db);
+    void WriteOperation(NIceDb::TNiceDb& db, const NJson::TJsonValue& op);
+};
+
+}
+}
diff --git a/ydb/core/mind/hive/ya.make b/ydb/core/mind/hive/ya.make
@@ -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
diff --git a/ydb/core/tablet/tablet_monitoring_proxy.cpp b/ydb/core/tablet/tablet_monitoring_proxy.cpp
@@ -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;
         }
     }
diff --git a/ydb/library/actors/protos/actors.proto b/ydb/library/actors/protos/actors.proto
@@ -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;
diff --git a/ydb/tests/functional/scheme_tests/canondata/tablet_scheme_tests.TestTabletSchemes.test_tablet_schemes_flat_hive_/flat_hive.schema b/ydb/tests/functional/scheme_tests/canondata/tablet_scheme_tests.TestTabletSchemes.test_tablet_schemes_flat_hive_/flat_hive.schema
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ class TForwardingActor : public TActorBootstrapped<TForwardingActor> {`
`35`	`35`	`return NKikimrServices::TActivity::TABLET_FORWARDING_ACTOR;`
`36`	`36`	`}`
`37`	`37`
`38`		`- TForwardingActor(const TTabletMonitoringProxyConfig& config, ui64 targetTablet, bool forceFollower, const TActorId& sender, const NMonitoring::IMonHttpRequest& request)`
	`38`	`+ TForwardingActor(const TTabletMonitoringProxyConfig& config, ui64 targetTablet, bool forceFollower, const TActorId& sender, const NMonitoring::IMonHttpRequest& request, const TString& userToken)`
`39`	`39`	`: Config(config)`
`40`	`40`	`, TargetTablet(targetTablet)`
`41`	`41`	`, ForceFollower(forceFollower)`
`42`	`42`	`, Sender(sender)`
`43`		`- , Request(ConvertRequestToProtobuf(request))`
	`43`	`+ , Request(ConvertRequestToProtobuf(request, userToken))`
`44`	`44`	`{}`
`45`	`45`
`46`		`- static NActorsProto::TRemoteHttpInfo ConvertRequestToProtobuf(const NMonitoring::IMonHttpRequest& request) {`
	`46`	`+ static NActorsProto::TRemoteHttpInfo ConvertRequestToProtobuf(const NMonitoring::IMonHttpRequest& request, const TString& userToken) {`
`47`	`47`	`NActorsProto::TRemoteHttpInfo pb;`
`48`	`48`	`pb.SetMethod(request.GetMethod());`
`49`	`49`	`pb.SetPath(TString(request.GetPathInfo()));`
`@@ -70,6 +70,7 @@ class TForwardingActor : public TActorBootstrapped<TForwardingActor> {`
`70`	`70`	`if (const auto& addr = request.GetRemoteAddr()) {`
`71`	`71`	`pb.SetRemoteAddr(addr.data(), addr.size());`
`72`	`72`	`}`
	`73`	`+ pb.SetUserToken(userToken);`
`73`	`74`	`return pb;`
`74`	`75`	`}`
`75`	`76`
`@@ -279,7 +280,7 @@ TTabletMonitoringProxyActor::Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorCon`
`279`	`280`	`const TString &tabletIdParam = cgi->Get("FollowerID");`
`280`	`281`	`const ui64 tabletId = TryParseTabletId(tabletIdParam);`
`281`	`282`	`if (tabletId) {`
`282`		`- ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, true, ev->Sender, msg->Request));`
	`283`	`+ ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, true, ev->Sender, msg->Request, msg->UserToken));`
`283`	`284`	`return;`
`284`	`285`	`}`
`285`	`286`	`}`
`@@ -289,7 +290,7 @@ TTabletMonitoringProxyActor::Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorCon`
`289`	`290`	`const TString &tabletIdParam = cgi->Get("TabletID");`
`290`	`291`	`const ui64 tabletId = TryParseTabletId(tabletIdParam);`
`291`	`292`	`if (tabletId) {`
`292`		`- ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, false, ev->Sender, msg->Request));`
	`293`	`+ ctx.ExecutorThread.RegisterActor(new TForwardingActor(Config, tabletId, false, ev->Sender, msg->Request, msg->UserToken));`
`293`	`294`	`return;`
`294`	`295`	`}`
`295`	`296`	`}`