ignore columnshard metrics by default

2 files changed, 15 insertions, 4 deletions

diff --git a/ydb/core/mind/hive/hive_impl.cpp b/ydb/core/mind/hive/hive_impl.cpp
index 5f27a0ab6cb..f7e86ba3dac 100644
--- a/ydb/core/mind/hive/hive_impl.cpp
+++ b/ydb/core/mind/hive/hive_impl.cpp
@@ -2409,7 +2409,7 @@ NKikimrTabletBase::TMetrics THive::GetDefaultResourceValuesForProfile(TTabletTyp
     return resourceValues;
 }
 
-const TVector<i64>& THive::GetDefaultAllowedMetricIds() {
+const TVector<i64>& THive::GetDefaultAllowedMetricIdsForType(TTabletTypes::EType type) {
     static const TVector<i64> defaultAllowedMetricIds = {
         NKikimrTabletBase::TMetrics::kCounterFieldNumber,
         NKikimrTabletBase::TMetrics::kCPUFieldNumber,
@@ -2419,11 +2419,22 @@ const TVector<i64>& THive::GetDefaultAllowedMetricIds() {
         NKikimrTabletBase::TMetrics::kGroupReadThroughputFieldNumber,
         NKikimrTabletBase::TMetrics::kGroupWriteThroughputFieldNumber
     };
-    return defaultAllowedMetricIds;
+    static const TVector<i64> onlyCounterAndStorage = {
+        NKikimrTabletBase::TMetrics::kCounterFieldNumber,
+        NKikimrTabletBase::TMetrics::kStorageFieldNumber,
+        NKikimrTabletBase::TMetrics::kGroupReadThroughputFieldNumber,
+        NKikimrTabletBase::TMetrics::kGroupWriteThroughputFieldNumber,
+    };
+    switch (type) {
+        case TTabletTypes::ColumnShard:
+            return onlyCounterAndStorage;
+        default:
+            return defaultAllowedMetricIds;
+    }
 }
 
 const TVector<i64>& THive::GetTabletTypeAllowedMetricIds(TTabletTypes::EType type) const {
-    const TVector<i64>& defaultAllowedMetricIds = GetDefaultAllowedMetricIds();
+    const TVector<i64>& defaultAllowedMetricIds = GetDefaultAllowedMetricIdsForType(type);
     auto it = TabletTypeAllowedMetrics.find(type);
     if (it != TabletTypeAllowedMetrics.end()) {
         return it->second;
diff --git a/ydb/core/mind/hive/hive_impl.h b/ydb/core/mind/hive/hive_impl.h
index f935a090e07..1d3238e694d 100644
--- a/ydb/core/mind/hive/hive_impl.h
+++ b/ydb/core/mind/hive/hive_impl.h
@@ -628,7 +628,7 @@ public:
     void ProcessPendingOperations();
     void ProcessTabletBalancer();
     const TVector<i64>& GetTabletTypeAllowedMetricIds(TTabletTypes::EType type) const;
-    static const TVector<i64>& GetDefaultAllowedMetricIds();
+    static const TVector<i64>& GetDefaultAllowedMetricIdsForType(TTabletTypes::EType type);
     static bool IsValidMetrics(const NKikimrTabletBase::TMetrics& metrics);
     static bool IsValidMetricsCPU(const NKikimrTabletBase::TMetrics& metrics);
     static bool IsValidMetricsMemory(const NKikimrTabletBase::TMetrics& metrics);