Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ydb/core/viewer/json_handlers_viewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,12 @@ void InitViewerHealthCheckJsonHandler(TJsonHandlers& handlers) {
}

void InitViewerNodesJsonHandler(TJsonHandlers& handlers) {
handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 19);
handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 20);
}

void InitViewerGroupsJsonHandler(TJsonHandlers& jsonHandlers) {
jsonHandlers.AddHandler("/viewer/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()), 9);
jsonHandlers.AddHandler("/storage/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()), 9);
jsonHandlers.AddHandler("/viewer/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()), 10);
jsonHandlers.AddHandler("/storage/groups", new TJsonHandler<TStorageGroups>(TStorageGroups::GetSwagger()), 10);
}

void InitViewerACLJsonHandler(TJsonHandlers &jsonHandlers) {
Expand Down
9 changes: 7 additions & 2 deletions ydb/core/viewer/pdisk_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
namespace NKikimr::NViewer {

using namespace NActors;
using namespace NNodeWhiteboard;

class TPDiskInfo : public TViewerPipeClient {
enum EEv {
Expand Down Expand Up @@ -85,14 +86,18 @@ class TPDiskInfo : public TViewerPipeClient {

void SendWhiteboardRequests() {
TActorId whiteboardServiceId = NNodeWhiteboard::MakeNodeWhiteboardServiceId(NodeId);
auto pdiskRequest = new NNodeWhiteboard::TEvWhiteboard::TEvPDiskStateRequest();
pdiskRequest->Record.AddFieldsRequired(-1);
WhiteboardPDisk = TBase::MakeRequest<NNodeWhiteboard::TEvWhiteboard::TEvPDiskStateResponse>(
whiteboardServiceId,
new NNodeWhiteboard::TEvWhiteboard::TEvPDiskStateRequest,
pdiskRequest,
IEventHandle::FlagTrackDelivery | IEventHandle::FlagSubscribeOnSession, // we only need it once because we are sending to the same node
NodeId);
auto vdiskRequest = new NNodeWhiteboard::TEvWhiteboard::TEvVDiskStateRequest();
vdiskRequest->Record.AddFieldsRequired(-1);
WhiteboardVDisk = TBase::MakeRequest<NNodeWhiteboard::TEvWhiteboard::TEvVDiskStateResponse>(
whiteboardServiceId,
new NNodeWhiteboard::TEvWhiteboard::TEvVDiskStateRequest,
vdiskRequest,
0,
NodeId);
}
Expand Down
11 changes: 10 additions & 1 deletion ydb/core/viewer/protos/viewer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,11 @@ message TStorageGroupInfo {
optional uint64 LatencyPutUserData = 21;
optional uint64 LatencyGetFast = 22;
string PileName = 23;
optional double MaxPDiskUsage = 24;
optional double MaxVDiskSlotUsage = 25;
optional double MaxVDiskRawUsage = 26;
optional double MaxNormalizedOccupancy = 27;
optional string CapacityAlert = 28;
repeated TStorageVDisk VDisks = 30;
}

Expand Down Expand Up @@ -574,6 +579,11 @@ message TNodeInfo {
optional uint64 PingTimeMinUs = 41;
optional uint64 PingTimeMaxUs = 42;
optional uint64 ReversePingTimeUs = 43; // Avg
optional double MaxPDiskUsage = 44;
optional double MaxVDiskSlotUsage = 45;
optional double MaxVDiskRawUsage = 46;
optional string CapacityAlert = 47; // the highest across VDisks on this node
optional double MaxNormalizedOccupancy = 48;
NKikimrWhiteboard.TSystemStateInfo SystemState = 50;
repeated NKikimrWhiteboard.TPDiskStateInfo PDisks = 51;
repeated NKikimrWhiteboard.TVDiskStateInfo VDisks = 52;
Expand Down Expand Up @@ -913,4 +923,3 @@ message TTopicDataResponse {
repeated TMessage Messages = 3;
bool Truncated = 4;
}

Loading
Loading