aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDMokhnatkin <dmitriy.mokhnatkin@gmail.com>2022-05-12 19:50:04 +0300
committerVitalii Gridnev <gvit@qavm-ff2ff183.qemu>2022-05-12 20:00:36 +0300
commitc7bef2e343fca6147e52a7dc84480766f16898fe (patch)
tree654af6219c8a5a86a6061273074563d8c9dc2212
parentbd7c734c0fd74d79bce6510d2c636af569e9dfe0 (diff)
downloadydb-c7bef2e343fca6147e52a7dc84480766f16898fe.tar.gz
YQ-320: add metrics for audit trails
ref:82e6e7104315c71009a786600d3ac08537641225
-rw-r--r--ydb/core/driver_lib/run/factories.h2
-rw-r--r--ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp3
-rw-r--r--ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h3
-rw-r--r--ydb/core/yq/libs/init/init.cpp8
-rw-r--r--ydb/core/yq/libs/init/init.h2
5 files changed, 11 insertions, 7 deletions
diff --git a/ydb/core/driver_lib/run/factories.h b/ydb/core/driver_lib/run/factories.h
index e5d12f2494c..884eb75cc80 100644
--- a/ydb/core/driver_lib/run/factories.h
+++ b/ydb/core/driver_lib/run/factories.h
@@ -46,7 +46,7 @@ struct TModuleFactories {
IActor*(*CreateTicketParser)(const NKikimrProto::TAuthConfig&);
IActor*(*FolderServiceFactory)(const NKikimrProto::NFolderService::TFolderServiceConfig&);
- std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig)> YqAuditServiceFactory;
+ std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)> YqAuditServiceFactory;
NKikimr::TYdbCredentialsProviderFactory YdbCredentialProviderFactory;
// Factory for grpc services
TGrpcServiceFactory GrpcServiceFactory;
diff --git a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp
index 74f994e0df9..f9181014538 100644
--- a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp
+++ b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp
@@ -67,8 +67,9 @@ private:
}
};
-NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config) {
+NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const NMonitoring::TDynamicCounterPtr& counters) {
Y_UNUSED(config);
+ Y_UNUSED(counters);
return new TYqMockAuditServiceActor();
}
diff --git a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h
index f00bf089599..2c4eadab2ca 100644
--- a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h
+++ b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h
@@ -3,12 +3,13 @@
#include <ydb/core/yq/libs/config/protos/audit.pb.h>
#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/monlib/dynamic_counters/counters.h>
#include <util/system/types.h>
namespace NYq {
-NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config);
+NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const NMonitoring::TDynamicCounterPtr& counters);
} // namespace NYq
diff --git a/ydb/core/yq/libs/init/init.cpp b/ydb/core/yq/libs/init/init.cpp
index bf27ed81006..f112537737c 100644
--- a/ydb/core/yq/libs/init/init.cpp
+++ b/ydb/core/yq/libs/init/init.cpp
@@ -54,7 +54,7 @@ void Init(
::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
const IYqSharedResources::TPtr& iyqSharedResources,
const std::function<IActor*(const NKikimrProto::NFolderService::TFolderServiceConfig& authConfig)>& folderServiceFactory,
- const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig)>& auditServiceFactory,
+ const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory,
const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
const ui32& icPort
)
@@ -83,7 +83,9 @@ void Init(
}
if (protoConfig.GetAudit().GetEnabled()) {
- auto* auditSerive = auditServiceFactory(protoConfig.GetAudit());
+ auto* auditSerive = auditServiceFactory(
+ protoConfig.GetAudit(),
+ appData->Counters->GetSubgroup("counters", "yq")->GetSubgroup("subsystem", "audit"));
actorRegistrator(NYq::YqAuditServiceActorId(), auditSerive);
}
@@ -265,7 +267,7 @@ void Init(
protoConfig.GetQuotasManager(),
/* yqSharedResources, */
serviceCounters.Counters,
- {
+ {
TQuotaDescription(SUBJECT_TYPE_CLOUD, QUOTA_RESULT_LIMIT, 20_MB),
TQuotaDescription(SUBJECT_TYPE_CLOUD, QUOTA_COUNT_LIMIT, 100, NYq::ControlPlaneStorageServiceActorId())
});
diff --git a/ydb/core/yq/libs/init/init.h b/ydb/core/yq/libs/init/init.h
index fa26651f185..8cbc1a6a8cf 100644
--- a/ydb/core/yq/libs/init/init.h
+++ b/ydb/core/yq/libs/init/init.h
@@ -35,7 +35,7 @@ void Init(
::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
const IYqSharedResources::TPtr& yqSharedResources,
const std::function<IActor*(const NKikimrProto::NFolderService::TFolderServiceConfig& authConfig)>& folderServiceFactory,
- const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig)>& auditServiceFactory,
+ const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory,
const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
const ui32& icPort
);