Skip to content

Adds versions to timeseries schema #3996

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

Closed
wants to merge 1 commit into from
Closed
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
21 changes: 14 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ ciborium = "0.2.1"
cfg-if = "1.0"
chrono = { version = "0.4", features = [ "serde" ] }
clap = { version = "4.4", features = ["derive"] }
console = { version = "0.15.7", default-feautres = false }
cookie = "0.16"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
Expand Down Expand Up @@ -305,6 +306,7 @@ sha3 = "0.10.8"
shell-words = "1.1.0"
signal-hook = "0.3"
signal-hook-tokio = { version = "0.3", features = [ "futures-v0_3" ] }
similar = "2.2.1"
sled = "0.34"
sled-agent-client = { path = "sled-agent-client" }
sled-hardware = { path = "sled-hardware" }
Expand Down
33 changes: 32 additions & 1 deletion openapi/nexus-internal.json
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,12 @@
},
"name": {
"type": "string"
},
"version": {
"default": 1,
"type": "integer",
"format": "uint8",
"minimum": 1
}
},
"required": [
Expand Down Expand Up @@ -2223,6 +2229,21 @@
"content",
"type"
]
},
{
"description": "A timeseries name is not valid.",
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": [
"invalid_timeseries_name"
]
}
},
"required": [
"type"
]
}
]
},
Expand Down Expand Up @@ -2776,7 +2797,11 @@
},
"timeseries_name": {
"description": "The name of the timeseries this sample belongs to",
"type": "string"
"allOf": [
{
"$ref": "#/components/schemas/TimeseriesName"
}
]
}
},
"required": [
Expand Down Expand Up @@ -3242,6 +3267,12 @@
"SwitchPutResponse": {
"type": "object"
},
"TimeseriesName": {
"title": "The name of a timeseries",
"description": "Names are constructed by concatenating the target and metric names with ':'. Target and metric names must be lowercase alphanumeric characters with '_' separating words. Each may be followed by an optional @ and non-zero version number.",
"type": "string",
"pattern": "(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*(@(([1-9])|([1-9][0-9])|(1[0-9][0-9])|(2[0-1][0-9])|(22[0-4])))?):(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*(@(([1-9])|([1-9][0-9])|(1[0-9][0-9])|(2[0-1][0-9])|(22[0-4])))?)"
},
"UplinkConfig": {
"type": "object",
"properties": {
Expand Down
232 changes: 0 additions & 232 deletions oximeter/db/notes.txt

This file was deleted.

Loading