Skip to content

Commit 0ce8b51

Browse files
noamsp-starkwarenoamsp-starkware
authored
apollo_dashboard: reorganize consensus panels (#10636)
1 parent 0d32194 commit 0ce8b51

File tree

2 files changed

+76
-76
lines changed

2 files changed

+76
-76
lines changed

‎crates/apollo_dashboard/resources/dev_grafana.json‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,139 +1149,139 @@
11491149
"extra_params": {}
11501150
},
11511151
{
1152-
"title": "Consensus Votes Number of Sent Messages",
1153-
"description": "The increase in the number of vote messages sent by consensus p2p (over the selected time range)",
1154-
"type": "stat",
1155-
"exprs": [
1156-
"increase(apollo_consensus_votes_num_sent_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1157-
],
1158-
"extra_params": {}
1159-
},
1160-
{
1161-
"title": "Consensus Votes Sent Message Size MB/sec",
1162-
"description": "The rate of MB per second sent by the consensus p2p component over the Votes topic",
1152+
"title": "Consensus Proposals Sent Message Size MB/sec",
1153+
"description": "The rate of MB per second sent by the consensus p2p component over the Proposals topic",
11631154
"type": "timeseries",
11641155
"exprs": [
1165-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1166-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1156+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1157+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
11671158
],
11681159
"extra_params": {
11691160
"unit": "decmbytes"
11701161
}
11711162
},
11721163
{
1173-
"title": "Consensus Votes Number of Received Messages",
1174-
"description": "The increase in the number of vote messages received by consensus p2p (over the selected time range)",
1175-
"type": "stat",
1164+
"title": "Consensus Proposals Received Message Size MB/sec",
1165+
"description": "The rate of MB per second received by the consensus p2p component over the Proposals topic",
1166+
"type": "timeseries",
11761167
"exprs": [
1177-
"increase(apollo_consensus_votes_num_received_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1168+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1169+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
11781170
],
1179-
"extra_params": {}
1171+
"extra_params": {
1172+
"unit": "decmbytes"
1173+
}
11801174
},
11811175
{
1182-
"title": "Consensus Votes Received Message Size MB/sec",
1183-
"description": "The rate of MB per second received by the consensus p2p component over the Votes topic",
1176+
"title": "Consensus Proposals Dropped Message Size MB/sec",
1177+
"description": "The rate of MB per second dropped by the consensus p2p component over the Proposals topic",
11841178
"type": "timeseries",
11851179
"exprs": [
1186-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1187-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1180+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1181+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
11881182
],
11891183
"extra_params": {
11901184
"unit": "decmbytes"
11911185
}
11921186
},
11931187
{
1194-
"title": "Consensus Votes Dropped Messages By Reason",
1195-
"description": "The number of dropped consensus votes messages, by reason (over the selected time range)",
1188+
"title": "Consensus Proposals Number of Sent Messages",
1189+
"description": "The increase in the number of proposal messages sent by consensus p2p (over the selected time range)",
11961190
"type": "stat",
11971191
"exprs": [
1198-
"sum by (drop_reason) (increase(apollo_consensus_votes_num_dropped_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])) > 0"
1192+
"increase(apollo_consensus_proposals_num_sent_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
11991193
],
12001194
"extra_params": {}
12011195
},
12021196
{
1203-
"title": "Consensus Votes Dropped Message Size Bytes/sec",
1204-
"description": "The rate of MB per second dropped by the consensus p2p component over the Votes topic",
1205-
"type": "timeseries",
1206-
"exprs": [
1207-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1208-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1209-
],
1210-
"extra_params": {
1211-
"unit": "decmbytes"
1212-
}
1213-
},
1214-
{
1215-
"title": "Consensus Conflicting Votes",
1216-
"description": "The increase in the number of conflicting votes (over the selected time range)",
1197+
"title": "Consensus Proposals Number of Received Messages",
1198+
"description": "The increase in the number of proposal messages received by consensus p2p (over the selected time range)",
12171199
"type": "stat",
12181200
"exprs": [
1219-
"increase(consensus_conflicting_votes{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1201+
"increase(apollo_consensus_proposals_num_received_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
12201202
],
12211203
"extra_params": {}
12221204
},
12231205
{
1224-
"title": "Consensus Proposals Number of Sent Messages",
1225-
"description": "The increase in the number of proposal messages sent by consensus p2p (over the selected time range)",
1206+
"title": "Consensus Proposals Dropped Messages By Reason",
1207+
"description": "The number of dropped consensus proposals messages, by reason (over the selected time range)",
12261208
"type": "stat",
12271209
"exprs": [
1228-
"increase(apollo_consensus_proposals_num_sent_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1210+
"sum by (drop_reason) (increase(apollo_consensus_proposals_num_dropped_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])) > 0"
12291211
],
12301212
"extra_params": {}
12311213
},
12321214
{
1233-
"title": "Consensus Proposals Sent Message Size MB/sec",
1234-
"description": "The rate of MB per second sent by the consensus p2p component over the Proposals topic",
1215+
"title": "Consensus Votes Sent Message Size MB/sec",
1216+
"description": "The rate of MB per second sent by the consensus p2p component over the Votes topic",
12351217
"type": "timeseries",
12361218
"exprs": [
1237-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1238-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1219+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1220+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_sent_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
12391221
],
12401222
"extra_params": {
12411223
"unit": "decmbytes"
12421224
}
12431225
},
12441226
{
1245-
"title": "Consensus Proposals Number of Received Messages",
1246-
"description": "The increase in the number of proposal messages received by consensus p2p (over the selected time range)",
1247-
"type": "stat",
1227+
"title": "Consensus Votes Received Message Size MB/sec",
1228+
"description": "The rate of MB per second received by the consensus p2p component over the Votes topic",
1229+
"type": "timeseries",
12481230
"exprs": [
1249-
"increase(apollo_consensus_proposals_num_received_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1231+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1232+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
12501233
],
1251-
"extra_params": {}
1234+
"extra_params": {
1235+
"unit": "decmbytes"
1236+
}
12521237
},
12531238
{
1254-
"title": "Consensus Proposals Received Message Size MB/sec",
1255-
"description": "The rate of MB per second received by the consensus p2p component over the Proposals topic",
1239+
"title": "Consensus Votes Dropped Message Size Bytes/sec",
1240+
"description": "The rate of MB per second dropped by the consensus p2p component over the Votes topic",
12561241
"type": "timeseries",
12571242
"exprs": [
1258-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1259-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_received_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1243+
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_votes_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1244+
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_votes_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
12601245
],
12611246
"extra_params": {
12621247
"unit": "decmbytes"
12631248
}
12641249
},
12651250
{
1266-
"title": "Consensus Proposals Dropped Messages By Reason",
1267-
"description": "The number of dropped consensus proposals messages, by reason (over the selected time range)",
1251+
"title": "Consensus Votes Number of Sent Messages",
1252+
"description": "The increase in the number of vote messages sent by consensus p2p (over the selected time range)",
12681253
"type": "stat",
12691254
"exprs": [
1270-
"sum by (drop_reason) (increase(apollo_consensus_proposals_num_dropped_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])) > 0"
1255+
"increase(apollo_consensus_votes_num_sent_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
12711256
],
12721257
"extra_params": {}
12731258
},
12741259
{
1275-
"title": "Consensus Proposals Dropped Message Size MB/sec",
1276-
"description": "The rate of MB per second dropped by the consensus p2p component over the Proposals topic",
1277-
"type": "timeseries",
1260+
"title": "Consensus Votes Number of Received Messages",
1261+
"description": "The increase in the number of vote messages received by consensus p2p (over the selected time range)",
1262+
"type": "stat",
12781263
"exprs": [
1279-
"histogram_quantile(0.50, sum by (le) (rate(apollo_consensus_proposals_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))",
1280-
"histogram_quantile(0.95, sum by (le) (rate(apollo_consensus_proposals_dropped_message_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\"}[5m])))"
1264+
"increase(apollo_consensus_votes_num_received_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
12811265
],
1282-
"extra_params": {
1283-
"unit": "decmbytes"
1284-
}
1266+
"extra_params": {}
1267+
},
1268+
{
1269+
"title": "Consensus Votes Dropped Messages By Reason",
1270+
"description": "The number of dropped consensus votes messages, by reason (over the selected time range)",
1271+
"type": "stat",
1272+
"exprs": [
1273+
"sum by (drop_reason) (increase(apollo_consensus_votes_num_dropped_messages{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])) > 0"
1274+
],
1275+
"extra_params": {}
1276+
},
1277+
{
1278+
"title": "Consensus Conflicting Votes",
1279+
"description": "The increase in the number of conflicting votes (over the selected time range)",
1280+
"type": "stat",
1281+
"exprs": [
1282+
"increase(consensus_conflicting_votes{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__range])"
1283+
],
1284+
"extra_params": {}
12851285
},
12861286
{
12871287
"title": "Consensus Network Events By Type",

‎crates/apollo_dashboard/src/panels/consensus.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -568,19 +568,19 @@ pub(crate) fn get_consensus_p2p_row() -> Row {
568568
"ConsensusP2p",
569569
vec![
570570
get_panel_consensus_num_connected_peers(),
571-
get_panel_consensus_votes_num_sent_messages(),
571+
get_panel_consensus_proposals_sent_message_size(),
572+
get_panel_consensus_proposals_received_message_size(),
573+
get_panel_consensus_proposals_dropped_message_size(),
574+
get_panel_consensus_proposals_num_sent_messages(),
575+
get_panel_consensus_proposals_num_received_messages(),
576+
get_panel_consensus_proposals_dropped_messages_by_reason(),
572577
get_panel_consensus_votes_sent_message_size(),
573-
get_panel_consensus_votes_num_received_messages(),
574578
get_panel_consensus_votes_received_message_size(),
575-
get_panel_consensus_votes_dropped_messages_by_reason(),
576579
get_panel_consensus_votes_dropped_message_size(),
580+
get_panel_consensus_votes_num_sent_messages(),
581+
get_panel_consensus_votes_num_received_messages(),
582+
get_panel_consensus_votes_dropped_messages_by_reason(),
577583
get_panel_consensus_conflicting_votes(),
578-
get_panel_consensus_proposals_num_sent_messages(),
579-
get_panel_consensus_proposals_sent_message_size(),
580-
get_panel_consensus_proposals_num_received_messages(),
581-
get_panel_consensus_proposals_received_message_size(),
582-
get_panel_consensus_proposals_dropped_messages_by_reason(),
583-
get_panel_consensus_proposals_dropped_message_size(),
584584
get_panel_consensus_network_events_by_type(),
585585
get_panel_consensus_ping_latency(),
586586
],

0 commit comments

Comments
 (0)