Skip to content

[metrics] Add switch/sled metadata to ddm/mgd related timeseries #6955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
53 changes: 53 additions & 0 deletions oximeter/db/schema/replicated/15/timeseries-to-delete.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
bgp_session:active_connections_accepted
bgp_session:connection_retries
bgp_session:hold_timer_expirations
bgp_session:idle_hold_timer_expirations
bgp_session:keepalive_send_failures
bgp_session:keepalives_received
bgp_session:keepalives_sent
bgp_session:notification_send_failures
bgp_session:open_handle_failures
bgp_session:open_send_failures
bgp_session:opens_received
bgp_session:opens_sent
bgp_session:passive_connections_accepted
bgp_session:prefixes_advertised
bgp_session:prefixes_imported
bgp_session:transition_to_active
bgp_session:transition_to_connect
bgp_session:transition_to_established
bgp_session:transition_to_idle
bgp_session:transition_to_open_confirm
bgp_session:transition_to_open_sent
bgp_session:transition_to_session_setup
bgp_session:unexpected_keepalive_messages
bgp_session:unexpected_open_messages
bgp_session:unexpected_update_messages
bgp_session:update_nexthop_missing
bgp_session:update_send_failures
bgp_session:updates_received
bgp_session:updates_sent
bfd_session:control_packet_send_failures
bfd_session:control_packets_sent
bfd_session:control_packets_received
bfd_session:message_receive_error
bfd_session:timeout_expired
bfd_session:transition_to_down
bfd_session:transition_to_init
bfd_session:transition_to_up
mg_lower:routes_blocked_by_link_state
switch_rib:active_routes
ddm_session:advertisements_received
ddm_session:advertisements_sent
ddm_session:imported_tunnel_endpoints
ddm_session:imported_underlay_prefixes
ddm_session:peer_address_changes
ddm_session:peer_expirations
ddm_session:peer_sessions_established
ddm_session:solicitations_received
ddm_session:solicitations_sent
ddm_session:update_send_fail
ddm_session:updates_received
ddm_session:updates_sent
ddm_router:originated_tunnel_endpoints
ddm_router:originated_underlay_prefixes
53 changes: 53 additions & 0 deletions oximeter/db/schema/single-node/15/timeseries-to-delete.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
bgp_session:active_connections_accepted
bgp_session:connection_retries
bgp_session:hold_timer_expirations
bgp_session:idle_hold_timer_expirations
bgp_session:keepalive_send_failures
bgp_session:keepalives_received
bgp_session:keepalives_sent
bgp_session:notification_send_failures
bgp_session:open_handle_failures
bgp_session:open_send_failures
bgp_session:opens_received
bgp_session:opens_sent
bgp_session:passive_connections_accepted
bgp_session:prefixes_advertised
bgp_session:prefixes_imported
bgp_session:transition_to_active
bgp_session:transition_to_connect
bgp_session:transition_to_established
bgp_session:transition_to_idle
bgp_session:transition_to_open_confirm
bgp_session:transition_to_open_sent
bgp_session:transition_to_session_setup
bgp_session:unexpected_keepalive_messages
bgp_session:unexpected_open_messages
bgp_session:unexpected_update_messages
bgp_session:update_nexthop_missing
bgp_session:update_send_failures
bgp_session:updates_received
bgp_session:updates_sent
bfd_session:control_packet_send_failures
bfd_session:control_packets_sent
bfd_session:control_packets_received
bfd_session:message_receive_error
bfd_session:timeout_expired
bfd_session:transition_to_down
bfd_session:transition_to_init
bfd_session:transition_to_up
mg_lower:routes_blocked_by_link_state
switch_rib:active_routes
ddm_session:advertisements_received
ddm_session:advertisements_sent
ddm_session:imported_tunnel_endpoints
ddm_session:imported_underlay_prefixes
ddm_session:peer_address_changes
ddm_session:peer_expirations
ddm_session:peer_sessions_established
ddm_session:solicitations_received
ddm_session:solicitations_sent
ddm_session:update_send_fail
ddm_session:updates_received
ddm_session:updates_sent
ddm_router:originated_tunnel_endpoints
ddm_router:originated_underlay_prefixes
2 changes: 1 addition & 1 deletion oximeter/db/src/model/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ pub mod to_block;
/// - [`crate::Client::initialize_db_with_version`]
/// - [`crate::Client::ensure_schema`]
/// - The `clickhouse-schema-updater` binary in this crate
pub const OXIMETER_VERSION: u64 = 14;
pub const OXIMETER_VERSION: u64 = 15;
60 changes: 56 additions & 4 deletions oximeter/oximeter/schema/bfd-session.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "bfd_session"
description = "A Bidirectional Forwarding Protocol (BFD) session"
authz_scope = "fleet"
versions = [
{ version = 1, fields = [ "hostname", "rack_id", "sled_id", "peer" ] },
{ 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" ] },
]

[[metrics]]
Expand Down Expand Up @@ -88,6 +88,10 @@ versions = [
type = "string"
description = "The hostname of the machine running the BFD session"

[fields.peer]
type = "ip_addr"
description = "Address of the BFD session peer"

[fields.rack_id]
type = "uuid"
description = "ID of the rack running the BFD session"
Expand All @@ -96,6 +100,54 @@ description = "ID of the rack running the BFD session"
type = "uuid"
description = "ID of the sled running the BFD session"

[fields.peer]
type = "ip_addr"
description = "Address of the BFD session peer"
[fields.sled_model]
type = "string"
description = "Model number of the sled running the BFD session"

[fields.sled_revision]
type = "u32"
description = "Revision number of the sled running the BFD session"

[fields.sled_serial]
type = "string"
description = "Serial number of the sled running the BFD session"

[fields.switch_id]
type = "uuid"
description = "ID of the switch running the BFD session"

[fields.switch_model]
type = "string"
description = "Model number of the switch running the BFD session"

[fields.switch_revision]
type = "u32"
description = "Revision number of the switch running the BFD session"

[fields.switch_serial]
type = "string"
description = "Serial number of the switch running the BFD session"

[fields.switch_slot]
type = "u16"
description = "Slot number of the switch running the BFD session"

[fields.asic_fab]
type = "string"
description = "Fabrication plant identifier of the switch ASIC running the BFD session"

[fields.asic_lot]
type = "string"
description = "Lot identifier of the switch ASIC running the BFD session"

[fields.asic_wafer]
type = "u8"
description = "Wafer identifier of the switch ASIC running the BFD session"

[fields.asic_wafer_loc_x]
type = "i16"
description = "X-coordinate wafer location of the switch ASIC running the BFD session"

[fields.asic_wafer_loc_y]
type = "i16"
description = "Y-coordinate wafer location of the switch ASIC running the BFD session"
54 changes: 53 additions & 1 deletion oximeter/oximeter/schema/bgp-session.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "bgp_session"
description = "A peer-to-peer session of the Border Gateway Protocol"
authz_scope = "fleet"
versions = [
{ version = 1, fields = [ "hostname", "local_asn", "peer", "rack_id", "sled_id" ] }
{ 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" ] }
]

[[metrics]]
Expand Down Expand Up @@ -291,3 +291,55 @@ description = "ID of the rack on which our BGP peer is running"
[fields.sled_id]
type = "uuid"
description = "ID of the sled on which our BGP peer is running"

[fields.sled_model]
type = "string"
description = "Model number of the sled on which our BGP peer is running"

[fields.sled_revision]
type = "u32"
description = "Revision number of the sled on which our BGP peer is running"

[fields.sled_serial]
type = "string"
description = "Serial number of the sled on which our BGP peer is running"

[fields.switch_id]
type = "uuid"
description = "ID of the switch on which our BGP peer is running"

[fields.switch_model]
type = "string"
description = "Model number of the switch on which our BGP peer is running"

[fields.switch_revision]
type = "u32"
description = "Revision number of the switch on which our BGP peer is running"

[fields.switch_serial]
type = "string"
description = "Serial number of the switch on which our BGP peer is running"

[fields.switch_slot]
type = "u16"
description = "Slot number of the switch on which our BGP peer is running"

[fields.asic_fab]
type = "string"
description = "Fabrication plant identifier of the switch ASIC on which our BGP peer is running"

[fields.asic_lot]
type = "string"
description = "Lot identifier of the switch ASIC on which our BGP peer is running"

[fields.asic_wafer]
type = "u8"
description = "Wafer identifier of the switch ASIC on which our BGP peer is running"

[fields.asic_wafer_loc_x]
type = "i16"
description = "X-coordinate wafer location of the switch ASIC on which our BGP peer is running"

[fields.asic_wafer_loc_y]
type = "i16"
description = "Y-coordinate wafer location of the switch ASIC on which our BGP peer is running"
54 changes: 53 additions & 1 deletion oximeter/oximeter/schema/ddm-router.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "ddm_router"
description = "A Delay-Driven Multipath (DDM) router"
authz_scope = "fleet"
versions = [
{ version = 1, fields = [ "hostname", "rack_id", "sled_id" ] },
{ 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" ] },
]

[[metrics]]
Expand Down Expand Up @@ -37,3 +37,55 @@ description = "ID of the rack running the DDM router"
[fields.sled_id]
type = "uuid"
description = "ID of the sled running the DDM router"

[fields.sled_model]
type = "string"
description = "Model number of the sled running the DDM router"

[fields.sled_revision]
type = "u32"
description = "Revision number of the sled running the DDM router"

[fields.sled_serial]
type = "string"
description = "Serial number of the sled running the DDM router"

[fields.switch_id]
type = "uuid"
description = "ID of the switch running the DDM router"

[fields.switch_model]
type = "string"
description = "Model number of the switch running the DDM router"

[fields.switch_revision]
type = "u32"
description = "Revision number of the switch running the DDM router"

[fields.switch_serial]
type = "string"
description = "Serial number of the switch running the DDM router"

[fields.switch_slot]
type = "u16"
description = "Slot number of the switch running the DDM router"

[fields.asic_fab]
type = "string"
description = "Fabrication plant identifier of the switch ASIC running the DDM router"

[fields.asic_lot]
type = "string"
description = "Lot identifier of the switch ASIC running the DDM router"

[fields.asic_wafer]
type = "u8"
description = "Wafer identifier of the switch ASIC running the DDM router"

[fields.asic_wafer_loc_x]
type = "i16"
description = "X-coordinate wafer location of the switch ASIC running the DDM router"

[fields.asic_wafer_loc_y]
type = "i16"
description = "Y-coordinate wafer location of the switch ASIC running the DDM router"
58 changes: 55 additions & 3 deletions oximeter/oximeter/schema/ddm-session.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "ddm_session"
description = "A session in a Delay-Driven Multipath (DDM) router"
authz_scope = "fleet"
versions = [
{ version = 1, fields = [ "hostname", "interface", "rack_id", "sled_id" ] },
{ 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" ] },
]

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

[fields.rack_id]
type = "uuid"
description = "ID of the rack running the DDM router"
description = "ID of the rack on which the DDM session is running"

[fields.sled_id]
type = "uuid"
description = "ID of the sled running the DDM router"
description = "ID of the sled on which the DDM session is running"

[fields.sled_model]
type = "string"
description = "Model number of the sled on which the DDM session is running"

[fields.sled_revision]
type = "u32"
description = "Revision number of the sled on which the DDM session is running"

[fields.sled_serial]
type = "string"
description = "Serial number of the sled on which the DDM session is running"

[fields.switch_id]
type = "uuid"
description = "ID of the switch on which the DDM session is running"

[fields.switch_model]
type = "string"
description = "Model number of the switch on which the DDM session is running"

[fields.switch_revision]
type = "u32"
description = "Revision number of the switch on which the DDM session is running"

[fields.switch_serial]
type = "string"
description = "Serial number of the switch on which the DDM session is running"

[fields.switch_slot]
type = "u16"
description = "Slot number of the switch on which the DDM session is running"

[fields.asic_fab]
type = "string"
description = "Fabrication plant identifier of the switch ASIC on which the DDM session is running"

[fields.asic_lot]
type = "string"
description = "Lot identifier of the switch ASIC on which the DDM session is running"

[fields.asic_wafer]
type = "u8"
description = "Wafer identifier of the switch ASIC on which the DDM session is running"

[fields.asic_wafer_loc_x]
type = "i16"
description = "X-coordinate wafer location of the switch ASIC on which the DDM session is running"

[fields.asic_wafer_loc_y]
type = "i16"
description = "Y-coordinate wafer location of the switch ASIC on which the DDM session is running"
Loading
Loading