Skip to content

Commit a68d462

Browse files
zeeshanlakhanizeeshanlakhani
committed
Add switch/sled metadata to ddm/mgd related timeseries
Includes: - timeseries cleanup/migration
1 parent 9cd1105 commit a68d462

File tree

12 files changed

+590
-26
lines changed

12 files changed

+590
-26
lines changed

‎oximeter/db/schema/replicated/15/timeseries-to-delete.txt‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
bgp_session:active_connections_accepted
2+
bgp_session:connection_retries
3+
bgp_session:hold_timer_expirations
4+
bgp_session:idle_hold_timer_expirations
5+
bgp_session:keepalive_send_failures
6+
bgp_session:keepalives_received
7+
bgp_session:keepalives_sent
8+
bgp_session:notification_send_failures
9+
bgp_session:open_handle_failures
10+
bgp_session:open_send_failures
11+
bgp_session:opens_received
12+
bgp_session:opens_sent
13+
bgp_session:passive_connections_accepted
14+
bgp_session:prefixes_advertised
15+
bgp_session:prefixes_imported
16+
bgp_session:transition_to_active
17+
bgp_session:transition_to_connect
18+
bgp_session:transition_to_established
19+
bgp_session:transition_to_idle
20+
bgp_session:transition_to_open_confirm
21+
bgp_session:transition_to_open_sent
22+
bgp_session:transition_to_session_setup
23+
bgp_session:unexpected_keepalive_messages
24+
bgp_session:unexpected_open_messages
25+
bgp_session:unexpected_update_messages
26+
bgp_session:update_nexthop_missing
27+
bgp_session:update_send_failures
28+
bgp_session:updates_received
29+
bgp_session:updates_sent
30+
bfd_session:control_packet_send_failures
31+
bfd_session:control_packets_sent
32+
bfd_session:control_packets_received
33+
bfd_session:message_receive_error
34+
bfd_session:timeout_expired
35+
bfd_session:transition_to_down
36+
bfd_session:transition_to_init
37+
bfd_session:transition_to_up
38+
mg_lower:routes_blocked_by_link_state
39+
switch_rib:active_routes
40+
ddm_session:advertisements_received
41+
ddm_session:advertisements_sent
42+
ddm_session:imported_tunnel_endpoints
43+
ddm_session:imported_underlay_prefixes
44+
ddm_session:peer_address_changes
45+
ddm_session:peer_expirations
46+
ddm_session:peer_sessions_established
47+
ddm_session:solicitations_received
48+
ddm_session:solicitations_sent
49+
ddm_session:update_send_fail
50+
ddm_session:updates_received
51+
ddm_session:updates_sent
52+
ddm_router:originated_tunnel_endpoints
53+
ddm_router:originated_underlay_prefixes

‎oximeter/db/schema/single-node/15/timeseries-to-delete.txt‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
bgp_session:active_connections_accepted
2+
bgp_session:connection_retries
3+
bgp_session:hold_timer_expirations
4+
bgp_session:idle_hold_timer_expirations
5+
bgp_session:keepalive_send_failures
6+
bgp_session:keepalives_received
7+
bgp_session:keepalives_sent
8+
bgp_session:notification_send_failures
9+
bgp_session:open_handle_failures
10+
bgp_session:open_send_failures
11+
bgp_session:opens_received
12+
bgp_session:opens_sent
13+
bgp_session:passive_connections_accepted
14+
bgp_session:prefixes_advertised
15+
bgp_session:prefixes_imported
16+
bgp_session:transition_to_active
17+
bgp_session:transition_to_connect
18+
bgp_session:transition_to_established
19+
bgp_session:transition_to_idle
20+
bgp_session:transition_to_open_confirm
21+
bgp_session:transition_to_open_sent
22+
bgp_session:transition_to_session_setup
23+
bgp_session:unexpected_keepalive_messages
24+
bgp_session:unexpected_open_messages
25+
bgp_session:unexpected_update_messages
26+
bgp_session:update_nexthop_missing
27+
bgp_session:update_send_failures
28+
bgp_session:updates_received
29+
bgp_session:updates_sent
30+
bfd_session:control_packet_send_failures
31+
bfd_session:control_packets_sent
32+
bfd_session:control_packets_received
33+
bfd_session:message_receive_error
34+
bfd_session:timeout_expired
35+
bfd_session:transition_to_down
36+
bfd_session:transition_to_init
37+
bfd_session:transition_to_up
38+
mg_lower:routes_blocked_by_link_state
39+
switch_rib:active_routes
40+
ddm_session:advertisements_received
41+
ddm_session:advertisements_sent
42+
ddm_session:imported_tunnel_endpoints
43+
ddm_session:imported_underlay_prefixes
44+
ddm_session:peer_address_changes
45+
ddm_session:peer_expirations
46+
ddm_session:peer_sessions_established
47+
ddm_session:solicitations_received
48+
ddm_session:solicitations_sent
49+
ddm_session:update_send_fail
50+
ddm_session:updates_received
51+
ddm_session:updates_sent
52+
ddm_router:originated_tunnel_endpoints
53+
ddm_router:originated_underlay_prefixes

‎oximeter/db/src/model/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ pub mod to_block;
1919
/// - [`crate::Client::initialize_db_with_version`]
2020
/// - [`crate::Client::ensure_schema`]
2121
/// - The `clickhouse-schema-updater` binary in this crate
22-
pub const OXIMETER_VERSION: u64 = 14;
22+
pub const OXIMETER_VERSION: u64 = 15;

‎oximeter/oximeter/schema/bfd-session.toml‎

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "bfd_session"
55
description = "A Bidirectional Forwarding Protocol (BFD) session"
66
authz_scope = "fleet"
77
versions = [
8-
{ version = 1, fields = [ "hostname", "rack_id", "sled_id", "peer" ] },
8+
{ version = 1, fields = [ "hostname", "peer", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_model", "switch_revision", "switch_serial", "switch_slot","asic_fab", "asic_lot", "asic_wafer", "asic_wafer_loc_x", "asic_wafer_loc_y" ] },
99
]
1010

1111
[[metrics]]
@@ -88,6 +88,10 @@ versions = [
8888
type = "string"
8989
description = "The hostname of the machine running the BFD session"
9090

91+
[fields.peer]
92+
type = "ip_addr"
93+
description = "Address of the BFD session peer"
94+
9195
[fields.rack_id]
9296
type = "uuid"
9397
description = "ID of the rack running the BFD session"
@@ -96,6 +100,54 @@ description = "ID of the rack running the BFD session"
96100
type = "uuid"
97101
description = "ID of the sled running the BFD session"
98102

99-
[fields.peer]
100-
type = "ip_addr"
101-
description = "Address of the BFD session peer"
103+
[fields.sled_model]
104+
type = "string"
105+
description = "Model number of the sled running the BFD session"
106+
107+
[fields.sled_revision]
108+
type = "u32"
109+
description = "Revision number of the sled running the BFD session"
110+
111+
[fields.sled_serial]
112+
type = "string"
113+
description = "Serial number of the sled running the BFD session"
114+
115+
[fields.switch_id]
116+
type = "uuid"
117+
description = "ID of the switch running the BFD session"
118+
119+
[fields.switch_model]
120+
type = "string"
121+
description = "Model number of the switch running the BFD session"
122+
123+
[fields.switch_revision]
124+
type = "u32"
125+
description = "Revision number of the switch running the BFD session"
126+
127+
[fields.switch_serial]
128+
type = "string"
129+
description = "Serial number of the switch running the BFD session"
130+
131+
[fields.switch_slot]
132+
type = "u16"
133+
description = "Slot number of the switch running the BFD session"
134+
135+
[fields.asic_fab]
136+
type = "string"
137+
description = "Fabrication plant identifier of the switch ASIC running the BFD session"
138+
139+
[fields.asic_lot]
140+
type = "string"
141+
description = "Lot identifier of the switch ASIC running the BFD session"
142+
143+
[fields.asic_wafer]
144+
type = "u8"
145+
description = "Wafer identifier of the switch ASIC running the BFD session"
146+
147+
[fields.asic_wafer_loc_x]
148+
type = "i16"
149+
description = "X-coordinate wafer location of the switch ASIC running the BFD session"
150+
151+
[fields.asic_wafer_loc_y]
152+
type = "i16"
153+
description = "Y-coordinate wafer location of the switch ASIC running the BFD session"

‎oximeter/oximeter/schema/bgp-session.toml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "bgp_session"
55
description = "A peer-to-peer session of the Border Gateway Protocol"
66
authz_scope = "fleet"
77
versions = [
8-
{ version = 1, fields = [ "hostname", "local_asn", "peer", "rack_id", "sled_id" ] }
8+
{ version = 1, fields = [ "hostname", "local_asn", "peer", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_model", "switch_revision", "switch_serial", "switch_slot","asic_fab", "asic_lot", "asic_wafer", "asic_wafer_loc_x", "asic_wafer_loc_y" ] }
99
]
1010

1111
[[metrics]]
@@ -291,3 +291,55 @@ description = "ID of the rack on which our BGP peer is running"
291291
[fields.sled_id]
292292
type = "uuid"
293293
description = "ID of the sled on which our BGP peer is running"
294+
295+
[fields.sled_model]
296+
type = "string"
297+
description = "Model number of the sled on which our BGP peer is running"
298+
299+
[fields.sled_revision]
300+
type = "u32"
301+
description = "Revision number of the sled on which our BGP peer is running"
302+
303+
[fields.sled_serial]
304+
type = "string"
305+
description = "Serial number of the sled on which our BGP peer is running"
306+
307+
[fields.switch_id]
308+
type = "uuid"
309+
description = "ID of the switch on which our BGP peer is running"
310+
311+
[fields.switch_model]
312+
type = "string"
313+
description = "Model number of the switch on which our BGP peer is running"
314+
315+
[fields.switch_revision]
316+
type = "u32"
317+
description = "Revision number of the switch on which our BGP peer is running"
318+
319+
[fields.switch_serial]
320+
type = "string"
321+
description = "Serial number of the switch on which our BGP peer is running"
322+
323+
[fields.switch_slot]
324+
type = "u16"
325+
description = "Slot number of the switch on which our BGP peer is running"
326+
327+
[fields.asic_fab]
328+
type = "string"
329+
description = "Fabrication plant identifier of the switch ASIC on which our BGP peer is running"
330+
331+
[fields.asic_lot]
332+
type = "string"
333+
description = "Lot identifier of the switch ASIC on which our BGP peer is running"
334+
335+
[fields.asic_wafer]
336+
type = "u8"
337+
description = "Wafer identifier of the switch ASIC on which our BGP peer is running"
338+
339+
[fields.asic_wafer_loc_x]
340+
type = "i16"
341+
description = "X-coordinate wafer location of the switch ASIC on which our BGP peer is running"
342+
343+
[fields.asic_wafer_loc_y]
344+
type = "i16"
345+
description = "Y-coordinate wafer location of the switch ASIC on which our BGP peer is running"

‎oximeter/oximeter/schema/ddm-router.toml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "ddm_router"
55
description = "A Delay-Driven Multipath (DDM) router"
66
authz_scope = "fleet"
77
versions = [
8-
{ version = 1, fields = [ "hostname", "rack_id", "sled_id" ] },
8+
{ version = 1, fields = [ "hostname", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_model", "switch_revision", "switch_serial", "switch_slot","asic_fab", "asic_lot", "asic_wafer", "asic_wafer_loc_x", "asic_wafer_loc_y" ] },
99
]
1010

1111
[[metrics]]
@@ -37,3 +37,55 @@ description = "ID of the rack running the DDM router"
3737
[fields.sled_id]
3838
type = "uuid"
3939
description = "ID of the sled running the DDM router"
40+
41+
[fields.sled_model]
42+
type = "string"
43+
description = "Model number of the sled running the DDM router"
44+
45+
[fields.sled_revision]
46+
type = "u32"
47+
description = "Revision number of the sled running the DDM router"
48+
49+
[fields.sled_serial]
50+
type = "string"
51+
description = "Serial number of the sled running the DDM router"
52+
53+
[fields.switch_id]
54+
type = "uuid"
55+
description = "ID of the switch running the DDM router"
56+
57+
[fields.switch_model]
58+
type = "string"
59+
description = "Model number of the switch running the DDM router"
60+
61+
[fields.switch_revision]
62+
type = "u32"
63+
description = "Revision number of the switch running the DDM router"
64+
65+
[fields.switch_serial]
66+
type = "string"
67+
description = "Serial number of the switch running the DDM router"
68+
69+
[fields.switch_slot]
70+
type = "u16"
71+
description = "Slot number of the switch running the DDM router"
72+
73+
[fields.asic_fab]
74+
type = "string"
75+
description = "Fabrication plant identifier of the switch ASIC running the DDM router"
76+
77+
[fields.asic_lot]
78+
type = "string"
79+
description = "Lot identifier of the switch ASIC running the DDM router"
80+
81+
[fields.asic_wafer]
82+
type = "u8"
83+
description = "Wafer identifier of the switch ASIC running the DDM router"
84+
85+
[fields.asic_wafer_loc_x]
86+
type = "i16"
87+
description = "X-coordinate wafer location of the switch ASIC running the DDM router"
88+
89+
[fields.asic_wafer_loc_y]
90+
type = "i16"
91+
description = "Y-coordinate wafer location of the switch ASIC running the DDM router"

‎oximeter/oximeter/schema/ddm-session.toml‎

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "ddm_session"
55
description = "A session in a Delay-Driven Multipath (DDM) router"
66
authz_scope = "fleet"
77
versions = [
8-
{ version = 1, fields = [ "hostname", "interface", "rack_id", "sled_id" ] },
8+
{ version = 1, fields = [ "hostname", "interface", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_model", "switch_revision", "switch_serial", "switch_slot","asic_fab", "asic_lot", "asic_wafer", "asic_wafer_loc_x", "asic_wafer_loc_y" ] },
99
]
1010

1111
[[metrics]]
@@ -129,8 +129,60 @@ description = "The host interface on which the DDM session is running"
129129

130130
[fields.rack_id]
131131
type = "uuid"
132-
description = "ID of the rack running the DDM router"
132+
description = "ID of the rack on which the DDM session is running"
133133

134134
[fields.sled_id]
135135
type = "uuid"
136-
description = "ID of the sled running the DDM router"
136+
description = "ID of the sled on which the DDM session is running"
137+
138+
[fields.sled_model]
139+
type = "string"
140+
description = "Model number of the sled on which the DDM session is running"
141+
142+
[fields.sled_revision]
143+
type = "u32"
144+
description = "Revision number of the sled on which the DDM session is running"
145+
146+
[fields.sled_serial]
147+
type = "string"
148+
description = "Serial number of the sled on which the DDM session is running"
149+
150+
[fields.switch_id]
151+
type = "uuid"
152+
description = "ID of the switch on which the DDM session is running"
153+
154+
[fields.switch_model]
155+
type = "string"
156+
description = "Model number of the switch on which the DDM session is running"
157+
158+
[fields.switch_revision]
159+
type = "u32"
160+
description = "Revision number of the switch on which the DDM session is running"
161+
162+
[fields.switch_serial]
163+
type = "string"
164+
description = "Serial number of the switch on which the DDM session is running"
165+
166+
[fields.switch_slot]
167+
type = "u16"
168+
description = "Slot number of the switch on which the DDM session is running"
169+
170+
[fields.asic_fab]
171+
type = "string"
172+
description = "Fabrication plant identifier of the switch ASIC on which the DDM session is running"
173+
174+
[fields.asic_lot]
175+
type = "string"
176+
description = "Lot identifier of the switch ASIC on which the DDM session is running"
177+
178+
[fields.asic_wafer]
179+
type = "u8"
180+
description = "Wafer identifier of the switch ASIC on which the DDM session is running"
181+
182+
[fields.asic_wafer_loc_x]
183+
type = "i16"
184+
description = "X-coordinate wafer location of the switch ASIC on which the DDM session is running"
185+
186+
[fields.asic_wafer_loc_y]
187+
type = "i16"
188+
description = "Y-coordinate wafer location of the switch ASIC on which the DDM session is running"

0 commit comments

Comments
 (0)