Skip to content

[log_backend] write tenant & cluster for UnifiedAgent log backend (#1… #10731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

[log_backend] write tenant & cluster for UnifiedAgent log backend (#1… #10731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ydb/core/driver_lib/run/run.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,8 @@ void TKikimrRunner::InitializeLogSettings(const TKikimrRunConfig& runConfig)
);

LogSettings->ClusterName = logConfig.HasClusterName() ? logConfig.GetClusterName() : "";
LogSettings->TenantName = runConfig.TenantName;
LogSettings->NodeId = runConfig.NodeId;

if (logConfig.GetFormat() == "full") {
LogSettings->Format = NLog::TSettings::PLAIN_FULL_FORMAT;
Expand Down
27 changes: 24 additions & 3 deletions ydb/core/log_backend/log_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@ TAutoPtr<TLogBackend> CreateLogBackendWithUnifiedAgent(
const auto& uaClientConfig = logConfig.GetUAClientConfig();
auto uaCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "ua_client");
auto logName = uaClientConfig.GetLogName();
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
uaClientConfig,
uaCounters,
logName,
runConfig.TenantName == "" ? "static" : "slot",
runConfig.TenantName,
runConfig.ClusterName
);
logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend;
}
if (logBackend) {
Expand Down Expand Up @@ -52,7 +59,14 @@ TAutoPtr<TLogBackend> CreateMeteringLogBackendWithUnifiedAgent(
auto logName = meteringConfig.HasLogName()
? meteringConfig.GetLogName()
: uaClientConfig.GetLogName();
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
uaClientConfig,
uaCounters,
logName,
runConfig.TenantName == "" ? "static" : "slot",
runConfig.TenantName,
runConfig.ClusterName
);
logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend;
}

Expand Down Expand Up @@ -100,7 +114,14 @@ TAutoPtr<TLogBackend> CreateAuditLogUnifiedAgentBackend(
auto logName = runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().HasLogName()
? runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().GetLogName()
: uaClientConfig.GetLogName();
logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
uaClientConfig,
uaCounters,
logName,
runConfig.TenantName == "" ? "static" : "slot",
runConfig.TenantName,
runConfig.ClusterName
);
}

return logBackend;
Expand Down
18 changes: 17 additions & 1 deletion ydb/core/log_backend/log_backend_build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromLogConfig(cons
return logBackend;
}

TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(const NKikimrConfig::TUAClientConfig& uaClientConfig, NMonitoring::TDynamicCounterPtr uaCounters, const TString& logName) {
TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(const NKikimrConfig::TUAClientConfig& uaClientConfig,
NMonitoring::TDynamicCounterPtr uaCounters,
const TString& logName, const TString& nodeType = "static",
const TString& tenant = "",
const TString& clusterName = "") {
auto parameters = NUnifiedAgent::TClientParameters(uaClientConfig.GetUri())
.SetCounters(uaCounters)
.SetMaxInflightBytes(uaClientConfig.GetMaxInflightBytes());
Expand Down Expand Up @@ -44,6 +48,18 @@ TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig
(*sessionParameters.Meta)["_log_name"] = logName;
}

if (nodeType) {
(*sessionParameters.Meta)["node_type"] = nodeType;
}

if (tenant) {
(*sessionParameters.Meta)["database"] = tenant;
}

if (clusterName) {
(*sessionParameters.Meta)["cluster"] = clusterName;
}

TAutoPtr<TLogBackend> uaLogBackend = MakeLogBackend(parameters, sessionParameters).Release();
return uaLogBackend;
}
Expand Down
5 changes: 4 additions & 1 deletion ydb/core/log_backend/log_backend_build.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ class TLogBackendBuildHelper {
static TAutoPtr<TLogBackend> CreateLogBackendFromUAClientConfig(
const NKikimrConfig::TUAClientConfig& uaClientConfig,
NMonitoring::TDynamicCounterPtr uaCounters,
const TString& logName);
const TString& logName,
const TString& nodeType,
const TString& tenant,
const TString& clusterName);
};
}
1 change: 1 addition & 0 deletions ydb/core/protos/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ message TLogConfig {
optional TUAClientConfig UAClientConfig = 13;
optional uint64 TimeThresholdMs = 14 [default = 1000];
optional bool IgnoreUnknownComponents = 15 [default = true];
optional string TenantName = 16;
}

message TInterconnectConfig {
Expand Down
4 changes: 4 additions & 0 deletions ydb/library/actors/core/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,10 @@ namespace NActors {
.WriteString(Settings->ShortHostName)
.WriteKey("cluster")
.WriteString(Settings->ClusterName)
.WriteKey("database")
.WriteString(Settings->TenantName ? Settings->TenantName : "static")
.WriteKey("node_id")
.WriteInt(Settings->NodeId)
.WriteKey("priority")
.WriteString(PriorityToString(priority))
.WriteKey("npriority")
Expand Down
2 changes: 2 additions & 0 deletions ydb/library/actors/core/log_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace NActors {
, Format(PLAIN_FULL_FORMAT)
, ShortHostName("")
, ClusterName("")
, TenantName("")
{
Append(minVal, maxVal, func);
}
Expand All @@ -47,6 +48,7 @@ namespace NActors {
, Format(PLAIN_FULL_FORMAT)
, ShortHostName("")
, ClusterName("")
, TenantName("")
{
}

Expand Down
2 changes: 2 additions & 0 deletions ydb/library/actors/core/log_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ namespace NActors {
ELogFormat Format;
TString ShortHostName;
TString ClusterName;
TString TenantName;
TString MessagePrefix;
ui32 NodeId;

// The best way to provide minVal, maxVal and func is to have
// protobuf enumeration of components. In this case protoc
Expand Down
Loading