Skip to content

Remove arbitrary numeric keys from OxQL timeseries data #2890

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 20, 2025
Merged

Remove arbitrary numeric keys from OxQL timeseries data #2890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2078560
Remove arbitrary numeric keys from timeseries data
charliepark Aug 19, 2025
ba120cd
remove Object.values calls on timeseries data
charliepark Aug 19, 2025
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
2 changes: 1 addition & 1 deletion OMICRON_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19e9f75ba5fe26df6ac3ada2f3a3bb8fa032186c
a9d9f1e1a17736aecc8d644c8d8c6174c1a5bc14
36 changes: 34 additions & 2 deletions app/api/__generated__/Api.ts
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion app/api/__generated__/OMICRON_VERSION
View file
Open in desktop

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

14 changes: 14 additions & 0 deletions app/api/__generated__/msw-handlers.ts
View file
Open in desktop

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

24 changes: 21 additions & 3 deletions app/api/__generated__/validate.ts
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion app/api/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if (typeof window !== 'undefined') {
const data = handleResult(result).tables
logHeading(data.length + ' timeseries returned')
for (const table of data) {
for (const ts of Object.values(table.timeseries)) {
for (const ts of table.timeseries) {
const fields = Object.entries(ts.fields)
.map(([k, v]) => `${k}: ${v.value}`)
.join(', ')
Expand Down
8 changes: 4 additions & 4 deletions app/components/oxql-metrics/util.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ const utilizationQueryResult1: OxqlQueryResult = {
tables: [
{
name: 'virtual_machine:vcpu_usage',
timeseries: {
'16671618930358432507': {
timeseries: [
{
fields: {
vcpuId: {
type: 'u32',
Expand All @@ -157,12 +157,12 @@ const utilizationQueryResult1: OxqlQueryResult = {
],
},
},
},
],
},
],
}

const timeseries1 = utilizationQueryResult1.tables[0].timeseries['16671618930358432507']
const timeseries1 = utilizationQueryResult1.tables[0].timeseries[0]

test('sumValues', () => {
expect(sumValues([], 0)).toEqual([])
Expand Down
2 changes: 1 addition & 1 deletion app/components/oxql-metrics/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export const sumValues = (timeseries: Timeseries[], arrLen: number): (number | n
export const composeOxqlData = (data: OxqlQueryResult | undefined) => {
let timeseriesCount = 0
if (!data) return { chartData: [], timeseriesCount }
const timeseriesData = Object.values(data.tables[0].timeseries)
const timeseriesData = data.tables[0].timeseries
timeseriesCount = timeseriesData.length
if (!timeseriesCount) return { chartData: [], timeseriesCount }
// Extract timestamps (all series should have the same timestamps)
Expand Down
3 changes: 2 additions & 1 deletion mock-api/msw/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@ export const handlers = makeHandlers({
// we use other-project to test certain response cases
if (query.project === 'other-project') {
// 1. return only one data point
const points = Object.values(data.tables[0].timeseries)[0].points
const points = data.tables[0].timeseries[0].points
if (body.query.includes('state == "run"')) {
points.timestamps = points.timestamps.slice(0, 2)
points.values = points.values.slice(0, 2)
Expand Down Expand Up @@ -1836,6 +1836,7 @@ export const handlers = makeHandlers({
networkingAddressLotCreate: NotImplemented,
networkingAddressLotDelete: NotImplemented,
networkingAddressLotList: NotImplemented,
networkingAddressLotView: NotImplemented,
networkingAllowListUpdate: NotImplemented,
networkingAllowListView: NotImplemented,
networkingBfdDisable: NotImplemented,
Expand Down
6 changes: 3 additions & 3 deletions mock-api/oxql-metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ export const getMockOxqlInstanceData = (
tables: [
{
name: name,
timeseries: {
timeseries: [
// This is a fake metric ID
'10607783231231666598': {
{
fields: {
instanceId: {
type: 'uuid',
Expand All @@ -309,7 +309,7 @@ export const getMockOxqlInstanceData = (
],
},
},
},
],
},
],
})
Expand Down
Loading