Show overridden AgentParams on monitoring page (#228)

* Show overridden AgentParams on monitoring page * review fixes --------- Co-authored-by: Dmitry Razumov <[email protected]>
ydb-platform · Jan 26, 2024 · c35fabe · c35fabe
1 parent 3629a21
commit c35fabe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring.cpp
@@ -1661,18 +1661,28 @@ void TDiskRegistryActor::RenderAgentList(
         TABLE_SORTABLE_CLASS("table table-bordered") {
             TABLEHEAD() {
                 TABLER() {
-                    TABLEH() { out << "Name"; }
-                    TABLEH() { out << "Value"; }
+                    TABLEH() { out << "Agent"; }
+                    TABLEH() { out << "RejectAgentTimeout (" << now << ")"; }
                 }
 
                 TABLER() {
                     TABLED() {
-                        out << "RejectAgentTimeout(" << now << ")";
+                        out << "default";
                     }
                     TABLED() {
                         out << State->GetRejectAgentTimeout(now, "");
                     }
                 }
+                for (const auto& agentId: State->GetAgentIdsWithOverriddenListParams()) {
+                    TABLER() {
+                        TABLED() {
+                            out << agentId << " (overridden)";
+                        }
+                        TABLED() {
+                            out << State->GetRejectAgentTimeout(now, agentId);
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.h b/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.h
@@ -800,6 +800,11 @@ class TDiskRegistryState
         AgentList.OnAgentDisconnected(now, agentId);
     }
 
+    TVector<TAgentId> GetAgentIdsWithOverriddenListParams() const
+    {
+        return AgentList.GetAgentIdsWithOverriddenListParams();
+    }
+
     void SetDiskRegistryAgentListParams(
         TDiskRegistryDatabase& db,
         const TString& agentId,

diff --git a/cloud/blockstore/libs/storage/disk_registry/model/agent_list.cpp b/cloud/blockstore/libs/storage/disk_registry/model/agent_list.cpp
@@ -604,4 +604,13 @@ void TAgentList::SetDiskRegistryAgentListParams(
     DiskRegistryAgentListParams[agentId] = params;
 }
 
+TVector<TString> TAgentList::GetAgentIdsWithOverriddenListParams() const
+{
+    TVector<TAgentId> agentIds(Reserve(DiskRegistryAgentListParams.size()));
+    for (const auto& [agentId, _]: DiskRegistryAgentListParams) {
+        agentIds.push_back(agentId);
+    }
+    return agentIds;
+}
+
 }   // namespace NCloud::NBlockStore::NStorage
diff --git a/cloud/blockstore/libs/storage/disk_registry/model/agent_list.h b/cloud/blockstore/libs/storage/disk_registry/model/agent_list.h
@@ -119,6 +119,7 @@ class TAgentList
     void SetDiskRegistryAgentListParams(
         const TString& agentId, const NProto::TDiskRegistryAgentParams& params);
     TVector<TString> CleanupExpiredAgentListParams(TInstant now);
+    TVector<TString> GetAgentIdsWithOverriddenListParams() const;
 
 private:
     NProto::TAgentConfig& AddAgent(NProto::TAgentConfig config);