Skip to content
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

Update SMF properties for Dendrite to include sled identifiers #6793

Merged
merged 8 commits into from
Nov 7, 2024

Conversation

zeeshanlakhani
Copy link
Collaborator

@zeeshanlakhani zeeshanlakhani commented Oct 7, 2024

Update SMF properties for Dendrite to include sled identifiers

Includes:

  • package-manifest update to match the properties added to dpd
  • removal of client call to get sled idenifier information (no longer used)
  • switch_slot added to oximeter schemas for dendrite/switch-data-link

Related:

@zeeshanlakhani zeeshanlakhani force-pushed the zl/smf-sled-idents branch 3 times, most recently from 8a554ca to 74703e1 Compare October 9, 2024 16:32
@zeeshanlakhani zeeshanlakhani marked this pull request as ready for review October 9, 2024 19:41
source.commit = "f3810e7bc1f0d746b5e95b3aaff32e52b02dfdfa"
source.sha256 = "c1506f6f818327523e6ff3102432a2038d319338b883235664b34f9132ff676a"
source.commit = "f79076d4630895a0177839ea041c355e2589b9c1"
source.sha256 = "7dbd752327234d6321ae9b06fb1eb72874bd3bcf0122ee545f60fe2579d9746c"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: settle these hashes when https://github.com/oxidecomputer/dendrite/pull/1031 is settled.

@zeeshanlakhani zeeshanlakhani force-pushed the zl/smf-sled-idents branch 2 times, most recently from 95605dc to 30441ac Compare October 10, 2024 20:01
@zeeshanlakhani zeeshanlakhani added this to the 12 milestone Oct 11, 2024
@zeeshanlakhani zeeshanlakhani force-pushed the zl/smf-sled-idents branch 12 times, most recently from dbdd3c7 to ca76be2 Compare October 16, 2024 13:52
versions = [
{ version = 1, fields = [ "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_model", "switch_revision", "switch_serial" ] },
{ version = 1, fields = [ "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] },
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separated out x,y fields here for wafer location (vs storing a tuple).

Copy link
Collaborator

@bnaecker bnaecker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty straightforward, thanks! I've a couple of questions, the most important is around making sure that this sequence of commits won't break development or CI workflows. Thanks for taking this on!

oximeter/oximeter/schema/dendrite.toml Show resolved Hide resolved
oximeter/oximeter/schema/switch-data-link.toml Outdated Show resolved Hide resolved
oximeter/oximeter/schema/switch-data-link.toml Outdated Show resolved Hide resolved
tools/dendrite_openapi_version Outdated Show resolved Hide resolved
@zeeshanlakhani
Copy link
Collaborator Author

working on incorporating new updates from upstream.

@zeeshanlakhani
Copy link
Collaborator Author

Rust issues stuck behind: #6914.

@zeeshanlakhani zeeshanlakhani changed the base branch from main to txeq November 1, 2024 19:06
@zeeshanlakhani
Copy link
Collaborator Author

zeeshanlakhani commented Nov 1, 2024

PR'ed against #6914 currently (as it's further in the dendrite tree with breaking changes)

Base automatically changed from txeq to main November 1, 2024 20:54
@zeeshanlakhani zeeshanlakhani force-pushed the zl/smf-sled-idents branch 2 times, most recently from bb6c78e to 50648d2 Compare November 3, 2024 15:34
Includes:

- package-manifest update to match the properties added to dpd
- removal of client call to get sled idenifier information (no longer used)
- switch_slot added to oximeter schemas for dendrite/switch-data-link
@zeeshanlakhani zeeshanlakhani merged commit 520c4d1 into main Nov 7, 2024
16 checks passed
@zeeshanlakhani zeeshanlakhani deleted the zl/smf-sled-idents branch November 7, 2024 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants