Skip to content

Commit 09f2ce3

Browse files
authored
add nodes group by state (#10877)
1 parent 2c423ef commit 09f2ce3

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

ydb/core/viewer/json_handlers_viewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void InitViewerHealthCheckJsonHandler(TJsonHandlers& handlers) {
244244
}
245245

246246
void InitViewerNodesJsonHandler(TJsonHandlers& handlers) {
247-
handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 11);
247+
handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 12);
248248
}
249249

250250
void InitViewerACLJsonHandler(TJsonHandlers &jsonHandlers) {

ydb/core/viewer/viewer_nodes.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,9 @@ class TJsonNodes : public TViewerPipeClient {
490490
case ENodeFields::Version:
491491
groupName = GetVersionForGroup();
492492
break;
493+
case ENodeFields::SystemState:
494+
groupName = NKikimrWhiteboard::EFlag_Name(GetOverall());
495+
break;
493496
default:
494497
break;
495498
}
@@ -515,6 +518,8 @@ class TJsonNodes : public TViewerPipeClient {
515518
return MissingDisks;
516519
case ENodeFields::Uptime:
517520
return UptimeSeconds;
521+
case ENodeFields::SystemState:
522+
return static_cast<int>(GetOverall());
518523
default:
519524
return TString();
520525
}
@@ -1115,12 +1120,12 @@ class TJsonNodes : public TViewerPipeClient {
11151120
case ENodeFields::DiskSpaceUsage:
11161121
case ENodeFields::Missing:
11171122
case ENodeFields::Version:
1123+
case ENodeFields::SystemState:
11181124
GroupCollection();
11191125
SortCollection(NodeGroups, [](const TNodeGroup& nodeGroup) { return nodeGroup.SortKey; }, true);
11201126
NeedGroup = false;
11211127
break;
11221128
case ENodeFields::NodeInfo:
1123-
case ENodeFields::SystemState:
11241129
case ENodeFields::PDisks:
11251130
case ENodeFields::VDisks:
11261131
case ENodeFields::Tablets:
@@ -1193,8 +1198,11 @@ class TJsonNodes : public TViewerPipeClient {
11931198
SortCollection(NodeView, [](const TNode* node) { return node->Database; }, ReverseSort);
11941199
NeedSort = false;
11951200
break;
1196-
case ENodeFields::NodeInfo:
11971201
case ENodeFields::SystemState:
1202+
SortCollection(NodeView, [](const TNode* node) { return static_cast<int>(node->GetOverall()); }, ReverseSort);
1203+
NeedSort = false;
1204+
break;
1205+
case ENodeFields::NodeInfo:
11981206
case ENodeFields::PDisks:
11991207
case ENodeFields::VDisks:
12001208
case ENodeFields::Tablets:
@@ -2516,6 +2524,7 @@ class TJsonNodes : public TViewerPipeClient {
25162524
* `Missing`
25172525
* `DiskSpaceUsage`
25182526
* `Database`
2527+
* `SystemState`
25192528
required: false
25202529
type: string
25212530
- name: group
@@ -2532,6 +2541,7 @@ class TJsonNodes : public TViewerPipeClient {
25322541
* `Missing`
25332542
* `Uptime`
25342543
* `Version`
2544+
* `SystemState`
25352545
required: false
25362546
type: string
25372547
- name: filter_group_by
@@ -2548,6 +2558,7 @@ class TJsonNodes : public TViewerPipeClient {
25482558
* `Missing`
25492559
* `Uptime`
25502560
* `Version`
2561+
* `SystemState`
25512562
required: false
25522563
type: string
25532564
- name: filter_group

0 commit comments

Comments
 (0)