diff options
author | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-03-15 15:44:44 +0300 |
---|---|---|
committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-03-15 15:44:44 +0300 |
commit | 5ac87c082442a6fa03a5ae5a8306a633a085b214 (patch) | |
tree | fc9cdfe0f2d5eb2d5e6d4914b1b8471fe8400d0c | |
parent | 2264b57da531d86b253b6c418b71641b1b7ea876 (diff) | |
download | ydb-5ac87c082442a6fa03a5ae5a8306a633a085b214.tar.gz |
Do not sort pages in IC index page,
Do not sort pages in Interconnect index page
-rw-r--r-- | ydb/core/driver_lib/run/kikimr_services_initializers.cpp | 2 | ||||
-rw-r--r-- | ydb/core/mon/async_http_mon.cpp | 4 | ||||
-rw-r--r-- | ydb/core/mon/mon.cpp | 3 | ||||
-rw-r--r-- | ydb/core/mon/mon.h | 3 | ||||
-rw-r--r-- | ydb/core/mon/sync_http_mon.cpp | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp index ad8726f439..20bae134de 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp @@ -958,7 +958,7 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s if (const auto& mon = appData->Mon) { icCommon->RegisterMonPage = [mon](const TString& path, const TString& title, TActorSystem *actorSystem, const TActorId& actorId) { NMonitoring::TIndexMonPage *page = mon->RegisterIndexPage("actors", "Actors")->RegisterIndexPage("interconnect", "Interconnect"); - mon->RegisterActorPage(page, path, title, false, actorSystem, actorId); + mon->RegisterActorPage(page, path, title, false, actorSystem, actorId, /*useAuth=*/true, /*sortPages=*/false); }; setup->LocalServices.emplace_back(NInterconnect::MakeInterconnectMonActorId(NodeId), TActorSetupCmd( NInterconnect::CreateInterconnectMonActor(icCommon), TMailboxType::ReadAsFilled, systemPoolId)); diff --git a/ydb/core/mon/async_http_mon.cpp b/ydb/core/mon/async_http_mon.cpp index 7805201ee7..369140fe99 100644 --- a/ydb/core/mon/async_http_mon.cpp +++ b/ydb/core/mon/async_http_mon.cpp @@ -774,7 +774,9 @@ NMonitoring::IMonPage* TAsyncHttpMon::RegisterActorPage(TRegisterActorPageFields fields.UseAuth ? Config.Authorizer : TRequestAuthorizer()); if (fields.Index) { fields.Index->Register(page); - fields.Index->SortPages(); + if (fields.SortPages) { + fields.Index->SortPages(); + } } else { Register(page.Get()); } diff --git a/ydb/core/mon/mon.cpp b/ydb/core/mon/mon.cpp index b409baf09e..8241b1bd8d 100644 --- a/ydb/core/mon/mon.cpp +++ b/ydb/core/mon/mon.cpp @@ -8,7 +8,7 @@ namespace NActors { using namespace NMonitoring; IMonPage* TMon::RegisterActorPage(TIndexMonPage* index, const TString& relPath, - const TString& title, bool preTag, TActorSystem* actorSystem, const TActorId& actorId, bool useAuth) { + const TString& title, bool preTag, TActorSystem* actorSystem, const TActorId& actorId, bool useAuth, bool sortPages) { return RegisterActorPage({ .Title = title, .RelPath = relPath, @@ -17,6 +17,7 @@ IMonPage* TMon::RegisterActorPage(TIndexMonPage* index, const TString& relPath, .PreTag = preTag, .ActorId = actorId, .UseAuth = useAuth, + .SortPages = sortPages, }); } diff --git a/ydb/core/mon/mon.h b/ydb/core/mon/mon.h index 8bf82ca724..ab69f0c3f8 100644 --- a/ydb/core/mon/mon.h +++ b/ydb/core/mon/mon.h @@ -47,11 +47,12 @@ public: TActorId ActorId; bool UseAuth = true; TVector<TString> AllowedSIDs; + bool SortPages = true; }; virtual NMonitoring::IMonPage* RegisterActorPage(TRegisterActorPageFields fields) = 0; NMonitoring::IMonPage* RegisterActorPage(NMonitoring::TIndexMonPage* index, const TString& relPath, - const TString& title, bool preTag, TActorSystem* actorSystem, const TActorId& actorId, bool useAuth = true); + const TString& title, bool preTag, TActorSystem* actorSystem, const TActorId& actorId, bool useAuth = true, bool sortPages = true); virtual NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) = 0; virtual NMonitoring::IMonPage* FindPage(const TString& relPath) = 0; }; diff --git a/ydb/core/mon/sync_http_mon.cpp b/ydb/core/mon/sync_http_mon.cpp index 6c863c55c1..8506344933 100644 --- a/ydb/core/mon/sync_http_mon.cpp +++ b/ydb/core/mon/sync_http_mon.cpp @@ -77,7 +77,9 @@ namespace NActors { fields.UseAuth ? Config.Authorizer : TRequestAuthorizer()); if (fields.Index) { fields.Index->Register(page); - fields.Index->SortPages(); + if (fields.SortPages) { + fields.Index->SortPages(); + } } else { Register(page); } |