mirror of https://github.com/grafana/grafana
Adela Almasan
2 days ago
commit
fc172be5fc
@ -0,0 +1,465 @@ |
||||
{ |
||||
"annotations": { |
||||
"list": [ |
||||
{ |
||||
"builtIn": 1, |
||||
"datasource": { |
||||
"type": "grafana", |
||||
"uid": "-- Grafana --" |
||||
}, |
||||
"enable": true, |
||||
"hide": true, |
||||
"iconColor": "rgba(0, 211, 255, 1)", |
||||
"name": "Annotations & Alerts", |
||||
"type": "dashboard" |
||||
} |
||||
] |
||||
}, |
||||
"editable": true, |
||||
"fiscalYearStartMonth": 0, |
||||
"graphTooltip": 0, |
||||
"id": 138, |
||||
"links": [], |
||||
"panels": [ |
||||
{ |
||||
"datasource": { |
||||
"type": "grafana-testdata-datasource", |
||||
"uid": "PD8C576611E62080A" |
||||
}, |
||||
"fieldConfig": { |
||||
"defaults": { |
||||
"color": { |
||||
"mode": "thresholds" |
||||
}, |
||||
"custom": { |
||||
"align": "auto", |
||||
"cellOptions": { |
||||
"type": "auto", |
||||
"wrapText": false |
||||
}, |
||||
"filterable": true, |
||||
"inspect": false, |
||||
"wrapHeaderText": false |
||||
}, |
||||
"fieldMinMax": true, |
||||
"links": [], |
||||
"mappings": [], |
||||
"thresholds": { |
||||
"mode": "absolute", |
||||
"steps": [ |
||||
{ |
||||
"color": "green", |
||||
"value": 0 |
||||
}, |
||||
{ |
||||
"color": "red", |
||||
"value": 80 |
||||
} |
||||
] |
||||
} |
||||
}, |
||||
"overrides": [ |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "A" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"mode": "lcd", |
||||
"type": "gauge" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "min", |
||||
"value": 0 |
||||
}, |
||||
{ |
||||
"id": "max", |
||||
"value": 100 |
||||
}, |
||||
{ |
||||
"id": "custom.width", |
||||
"value": 300 |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Info" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "links", |
||||
"value": [ |
||||
{ |
||||
"targetBlank": true, |
||||
"title": "Google this term", |
||||
"url": "https://google.com/search?q=${__value:percentencode}" |
||||
} |
||||
] |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Min" |
||||
}, |
||||
"properties": [] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Max" |
||||
}, |
||||
"properties": [] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "State" |
||||
}, |
||||
"properties": [] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Time" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"type": "auto" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "unit", |
||||
"value": "dateTimeFromNow" |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Image" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"alt": "${__value}", |
||||
"type": "image" |
||||
} |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byRegexp", |
||||
"options": "/(Time|Min|Max|Info|State|Image)/" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.width", |
||||
"value": 110 |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Info" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"type": "color-text" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "mappings", |
||||
"value": [ |
||||
{ |
||||
"options": { |
||||
"pattern": "up", |
||||
"result": { |
||||
"color": "green", |
||||
"index": 0 |
||||
} |
||||
}, |
||||
"type": "regex" |
||||
}, |
||||
{ |
||||
"options": { |
||||
"pattern": "down", |
||||
"result": { |
||||
"color": "red", |
||||
"index": 1 |
||||
} |
||||
}, |
||||
"type": "regex" |
||||
} |
||||
] |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Min" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"mode": "basic", |
||||
"type": "color-background" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "color", |
||||
"value": { |
||||
"fixedColor": "blue", |
||||
"mode": "continuous-YlRd" |
||||
} |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Max" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"mode": "gradient", |
||||
"type": "color-background" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "color", |
||||
"value": { |
||||
"mode": "continuous-purples" |
||||
} |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "State" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "displayName", |
||||
"value": "State" |
||||
}, |
||||
{ |
||||
"id": "custom.hidden", |
||||
"value": true |
||||
} |
||||
] |
||||
}, |
||||
{ |
||||
"matcher": { |
||||
"id": "byName", |
||||
"options": "Long Text" |
||||
}, |
||||
"properties": [ |
||||
{ |
||||
"id": "custom.cellOptions", |
||||
"value": { |
||||
"type": "auto", |
||||
"wrapText": true |
||||
} |
||||
} |
||||
] |
||||
} |
||||
] |
||||
}, |
||||
"gridPos": { |
||||
"h": 18, |
||||
"w": 24, |
||||
"x": 0, |
||||
"y": 0 |
||||
}, |
||||
"id": 1, |
||||
"options": { |
||||
"cellHeight": "sm", |
||||
"footer": { |
||||
"countRows": false, |
||||
"enablePagination": false, |
||||
"fields": "", |
||||
"reducer": [ |
||||
"max" |
||||
], |
||||
"show": true |
||||
}, |
||||
"frameIndex": 0, |
||||
"showHeader": true, |
||||
"sortBy": [] |
||||
}, |
||||
"pluginVersion": "12.1.0-pre", |
||||
"targets": [ |
||||
{ |
||||
"datasource": { |
||||
"type": "grafana-testdata-datasource", |
||||
"uid": "PD8C576611E62080A" |
||||
}, |
||||
"refId": "A", |
||||
"scenarioId": "random_walk_table" |
||||
}, |
||||
{ |
||||
"csvContent": "Info,Image,Long Text\ndown,https://placecats.com/millie/300/300,\"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tempus et augue et lacinia. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec eu pretium tortor. Cras venenatis sapien sed mauris gravida, ut scelerisque est fringilla. Cras lorem diam, facilisis nec malesuada in, vulputate vel enim. Etiam fringilla nisi quis felis blandit tincidunt. Cras id lacus ornare, ullamcorper nisl eget, bibendum odio. Pellentesque imperdiet, leo a imperdiet venenatis, ligula risus venenatis quam, vel euismod magna nisi sit amet leo.\"\nup,https://placecats.com/neo/300/300,\"Sed imperdiet eget diam sit amet fringilla. Curabitur quis lacus blandit, mollis diam non, accumsan tortor. Aliquam ac tellus eget dui facilisis tempor eu id nulla. Maecenas ultrices turpis eu elementum imperdiet. Fusce eget rhoncus mi, et egestas lectus. Mauris facilisis auctor enim sed malesuada. Maecenas placerat ultricies metus vitae viverra. In hac habitasse platea dictumst. Mauris ipsum nisl, dictum eu aliquam eleifend, rutrum id orci. Nullam eget dui et odio eleifend porttitor.\"\nup fast,https://placecats.com/bella/300/300,\"Proin ac libero vulputate ex vulputate pharetra ut vel lacus. Phasellus quis dolor sed leo finibus scelerisque. Ut vel finibus leo, sed viverra ipsum. Suspendisse vitae rutrum arcu. Donec sed tellus vel lectus bibendum vestibulum. Sed eu felis non velit dictum pulvinar eu et leo. Aenean et dignissim arcu. Nam luctus at neque quis efficitur. Fusce tempus at nibh a imperdiet. Nullam malesuada ac magna at facilisis. Duis pretium aliquam eros. Donec pharetra dignissim dolor non bibendum. Ut gravida mi id urna tempus, at ullamcorper felis vulputate. Duis congue augue ex, sed finibus leo ornare ut. Mauris non quam sodales, dignissim lorem eget, tincidunt mauris. Aliquam ut velit auctor, vestibulum metus sed, mollis massa.\"\ndown fast,https://placecats.com/neo_2/300/300,\"Nullam in pulvinar justo. Nunc dictum arcu ac pellentesque bibendum. Sed in erat turpis. Vestibulum eu orci ac ligula lobortis tempus. Fusce consectetur feugiat magna, eu tempor nibh vestibulum ac. Aliquam erat volutpat. Vivamus sit amet viverra enim. Quisque mollis odio nulla, nec vulputate sem placerat in. Etiam dolor sapien, pulvinar in accumsan at, consequat eget nisi. Nunc condimentum neque magna, congue consectetur dui efficitur interdum. Nam lobortis fringilla maximus. Vestibulum eu dui a velit condimentum eleifend consequat nec lectus.\"", |
||||
"datasource": { |
||||
"type": "grafana-testdata-datasource", |
||||
"uid": "PD8C576611E62080A" |
||||
}, |
||||
"refId": "B", |
||||
"scenarioId": "csv_content" |
||||
} |
||||
], |
||||
"title": "Table - Kitchen Sink", |
||||
"transformations": [ |
||||
{ |
||||
"id": "joinByField", |
||||
"options": { |
||||
"byField": "Info", |
||||
"mode": "outerTabular" |
||||
} |
||||
}, |
||||
{ |
||||
"id": "organize", |
||||
"options": { |
||||
"excludeByName": { |
||||
"A": false |
||||
}, |
||||
"includeByName": {}, |
||||
"indexByName": { |
||||
"A": 7, |
||||
"Image": 5, |
||||
"Info": 1, |
||||
"Long Text": 6, |
||||
"Max A": 3, |
||||
"Min A": 2, |
||||
"State A": 4, |
||||
"Time A": 0 |
||||
}, |
||||
"orderBy": [], |
||||
"orderByMode": "manual", |
||||
"renameByName": { |
||||
"A": "Gauge", |
||||
"Info": "", |
||||
"Max A": "Max", |
||||
"Min A": "Min", |
||||
"State A": "State", |
||||
"Time": "Some really long title that requires wrapping", |
||||
"Time A": "Time", |
||||
"img_url": "Cat" |
||||
} |
||||
} |
||||
} |
||||
], |
||||
"type": "table" |
||||
}, |
||||
{ |
||||
"id": 2, |
||||
"type": "table", |
||||
"title": "Empty Table Panel", |
||||
"gridPos": { |
||||
"x": 0, |
||||
"y": 0, |
||||
"h": 6, |
||||
"w": 24 |
||||
}, |
||||
"fieldConfig": { |
||||
"defaults": { |
||||
"custom": { |
||||
"align": "auto", |
||||
"cellOptions": { |
||||
"type": "auto" |
||||
}, |
||||
"inspect": false, |
||||
"wrapHeaderText": false |
||||
}, |
||||
"mappings": [], |
||||
"thresholds": { |
||||
"mode": "absolute", |
||||
"steps": [ |
||||
{ |
||||
"value": null, |
||||
"color": "green" |
||||
}, |
||||
{ |
||||
"value": 80, |
||||
"color": "red" |
||||
} |
||||
] |
||||
}, |
||||
"color": { |
||||
"mode": "thresholds" |
||||
} |
||||
}, |
||||
"overrides": [] |
||||
}, |
||||
"pluginVersion": "12.1.0-pre", |
||||
"targets": [ |
||||
{ |
||||
"scenarioId": "csv_content", |
||||
"refId": "A", |
||||
"csvContent": "a,b,c" |
||||
} |
||||
], |
||||
"datasource": { |
||||
"uid": "PD8C576611E62080A", |
||||
"type": "grafana-testdata-datasource" |
||||
}, |
||||
"options": { |
||||
"showHeader": true, |
||||
"cellHeight": "sm", |
||||
"footer": { |
||||
"show": false, |
||||
"reducer": [ |
||||
"sum" |
||||
], |
||||
"countRows": false, |
||||
"fields": "" |
||||
} |
||||
} |
||||
} |
||||
], |
||||
"preload": false, |
||||
"schemaVersion": 41, |
||||
"tags": [], |
||||
"templating": { |
||||
"list": [ |
||||
{ |
||||
"baseFilters": [], |
||||
"datasource": { |
||||
"type": "grafana-testdata-datasource", |
||||
"uid": "PD8C576611E62080A" |
||||
}, |
||||
"filters": [], |
||||
"name": "Filters", |
||||
"type": "adhoc" |
||||
} |
||||
] |
||||
}, |
||||
"time": { |
||||
"from": "now-6h", |
||||
"to": "now" |
||||
}, |
||||
"timepicker": {}, |
||||
"timezone": "", |
||||
"title": "Panel Tests - Table - Kitchen Sink", |
||||
"uid": "dcb9f5e9-8066-4397-889e-864b99555dbb", |
||||
"version": 1 |
||||
} |
||||
@ -0,0 +1,331 @@ |
||||
import { Page, Locator } from '@playwright/test'; |
||||
|
||||
import { test, expect } from '@grafana/plugin-e2e'; |
||||
|
||||
test.use({ |
||||
viewport: { width: 1600, height: 1080 }, |
||||
featureToggles: { |
||||
tableNextGen: true, |
||||
}, |
||||
}); |
||||
|
||||
// helper utils
|
||||
const getCell = async (loc: Page | Locator, rowIdx: number, colIdx: number) => |
||||
loc |
||||
.getByRole('row') |
||||
.nth(rowIdx) |
||||
.getByRole(rowIdx === 0 ? 'columnheader' : 'gridcell') |
||||
.nth(colIdx); |
||||
|
||||
const getCellHeight = async (loc: Page | Locator, rowIdx: number, colIdx: number) => { |
||||
const cell = await getCell(loc, rowIdx, colIdx); |
||||
return (await cell.boundingBox())?.height ?? 0; |
||||
}; |
||||
|
||||
test.describe( |
||||
'Panels test: Table - Kitchen Sink', |
||||
{ |
||||
tag: ['@panels'], |
||||
}, |
||||
() => { |
||||
test('Tests word wrap, hover overflow, and cell inspect', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
// text wrapping is enabled by default on this panel.
|
||||
await expect(getCellHeight(page, 1, 5)).resolves.toBeGreaterThan(100); |
||||
|
||||
// toggle the lorem ipsum column's wrap text toggle and confirm that the height shrinks.
|
||||
await dashboardPage |
||||
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')) |
||||
.last() |
||||
.click(); |
||||
await expect(getCellHeight(page, 1, 5)).resolves.toBeLessThan(100); |
||||
|
||||
// test that hover overflow works.
|
||||
const loremIpsumCell = await getCell(page, 1, 5); |
||||
await loremIpsumCell.hover(); |
||||
await expect(getCellHeight(page, 1, 5)).resolves.toBeGreaterThan(100); |
||||
await (await getCell(page, 1, 6)).hover(); |
||||
await expect(getCellHeight(page, 1, 5)).resolves.toBeLessThan(100); |
||||
|
||||
// enable cell inspect, confirm that hover no longer triggers.
|
||||
await dashboardPage |
||||
.getByGrafanaSelector( |
||||
selectors.components.PanelEditor.OptionsPane.fieldLabel('Cell options Cell value inspect') |
||||
) |
||||
.first() |
||||
.locator('label[for="custom.inspect"]') |
||||
.click(); |
||||
await loremIpsumCell.hover(); |
||||
await expect(getCellHeight(page, 1, 5)).resolves.toBeLessThan(100); |
||||
|
||||
// click cell inspect, check that cell inspection pops open in the side as we'd expect.
|
||||
await loremIpsumCell.getByLabel('Inspect value').click(); |
||||
const loremIpsumText = await loremIpsumCell.textContent(); |
||||
expect(loremIpsumText).toBeDefined(); |
||||
await expect(page.getByRole('dialog').getByText(loremIpsumText!)).toBeVisible(); |
||||
}); |
||||
|
||||
test('Tests visibility and display name via overrides', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
// confirm that "State" column is hidden by default.
|
||||
expect(page.getByRole('row').nth(0)).not.toContainText('State'); |
||||
|
||||
// toggle the "State" column visibility and test that it appears before re-hiding it.
|
||||
// FIXME this selector is utterly godawful, but there's no way to give testIds or aria-labels or anything to
|
||||
// the panel editor builder. we should fix that to make e2e's easier to write for our team.
|
||||
const hideStateColumnSwitch = page.locator('[id="Override 12"]').locator('label').last(); |
||||
await hideStateColumnSwitch.click(); |
||||
expect(page.getByRole('row').nth(0)).toContainText('State'); |
||||
|
||||
// now change the display name of the "State" column.
|
||||
// FIXME it would be good to have a better selector here too.
|
||||
const displayNameInput = page.locator('[id="Override 12"]').locator('input[value="State"]').last(); |
||||
await displayNameInput.fill('State (renamed)'); |
||||
await displayNameInput.press('Enter'); |
||||
expect(page.getByRole('row').nth(0)).toContainText('State (renamed)'); |
||||
}); |
||||
|
||||
// we test niche cases for sorting, filtering, pagination, etc. in a unit tests already.
|
||||
// we mainly want to test the happiest paths for these in e2es as well to check for integration
|
||||
// issues, but the unit tests can confirm that the internal logic works as expected much more quickly and thoroughly.
|
||||
// hashtag testing pyramid.
|
||||
test('Tests sorting by column', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
// click the "State" column header to sort it.
|
||||
const stateColumnHeader = await getCell(page, 0, 1); |
||||
|
||||
await stateColumnHeader.getByText('Info').click(); |
||||
await expect(stateColumnHeader).toHaveAttribute('aria-sort', 'ascending'); |
||||
expect(getCell(page, 1, 1)).resolves.toContainText('down'); // down or down fast
|
||||
|
||||
await stateColumnHeader.getByText('Info').click(); |
||||
await expect(stateColumnHeader).toHaveAttribute('aria-sort', 'descending'); |
||||
expect(getCell(page, 1, 1)).resolves.toContainText('up'); // up or up fast
|
||||
|
||||
await stateColumnHeader.getByText('Info').click(); |
||||
await expect(stateColumnHeader).not.toHaveAttribute('aria-sort'); |
||||
}); |
||||
|
||||
test('Tests filtering within a column', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
const stateColumnHeader = page.getByRole('columnheader').filter({ hasText: 'Info' }); |
||||
|
||||
// get the first value in the "State" column, filter it out, then check that it went away.
|
||||
const firstStateValue = (await (await getCell(page, 1, 1)).textContent())!; |
||||
await stateColumnHeader |
||||
.getByTestId(selectors.components.Panels.Visualization.TableNG.Filters.HeaderButton) |
||||
.click(); |
||||
const filterContainer = dashboardPage.getByGrafanaSelector( |
||||
selectors.components.Panels.Visualization.TableNG.Filters.Container |
||||
); |
||||
|
||||
await expect(filterContainer).toBeVisible(); |
||||
|
||||
// select all, then click the first value to unselect it, filtering it out.
|
||||
await filterContainer.getByTestId(selectors.components.Panels.Visualization.TableNG.Filters.SelectAll).click(); |
||||
await filterContainer.getByTitle(firstStateValue, { exact: true }).locator('label').click(); |
||||
await filterContainer.getByRole('button', { name: 'Ok' }).click(); |
||||
|
||||
// make sure the filter container closed when we clicked "Ok".
|
||||
await expect(filterContainer).not.toBeVisible(); |
||||
|
||||
// did it actually filter out our value?
|
||||
await expect(getCell(page, 1, 1)).resolves.not.toHaveText(firstStateValue); |
||||
}); |
||||
|
||||
test('Tests pagination, row height adjustment', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const rowRe = /([\d]+) - ([\d]+) of ([\d]+) rows/; |
||||
const getRowStatus = async (page: Page | Locator) => { |
||||
const text = (await page.getByText(rowRe).textContent()) ?? ''; |
||||
const match = text.match(rowRe); |
||||
return { |
||||
start: parseInt(match?.[1] ?? '0', 10), |
||||
end: parseInt(match?.[2] ?? '0', 10), |
||||
total: parseInt(match?.[3] ?? '0', 10), |
||||
}; |
||||
}; |
||||
|
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
await page |
||||
.getByLabel(selectors.components.PanelEditor.OptionsPane.fieldLabel(`Enable pagination`), { exact: true }) |
||||
.click(); |
||||
|
||||
// because of text wrapping, we're guaranteed to only be showing a single row when we enable pagination.
|
||||
await expect(page.getByText(/([\d]+) - ([\d]+) of ([\d]+) rows/)).toBeVisible(); |
||||
|
||||
// disable text wrap and see the number of rows.
|
||||
await dashboardPage |
||||
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')) |
||||
.last() |
||||
.click(); |
||||
|
||||
// any number of rows that is not "1" is allowed here, we don't want to police the exact number of rows that
|
||||
// are rendered since there are tons of factors which could effect this. we do want to grab this number for comparison
|
||||
// in a second, though.
|
||||
const smallRowStatus = await getRowStatus(page); |
||||
expect(smallRowStatus.end).toBeGreaterThan(1); |
||||
expect(page.getByRole('grid').getByRole('row')).toHaveCount(smallRowStatus.end + 1); |
||||
|
||||
// change cell height to Large
|
||||
await dashboardPage |
||||
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Table Cell height')) |
||||
.locator('input') |
||||
.last() |
||||
.click(); |
||||
const largeRowStatus = await getRowStatus(page); |
||||
expect(largeRowStatus.end).toBeLessThan(smallRowStatus.end); |
||||
expect(page.getByRole('grid').getByRole('row')).toHaveCount(largeRowStatus.end + 1); |
||||
|
||||
// click a page over with the directional nav
|
||||
await page.getByLabel('next page').click(); |
||||
const nextPageStatus = await getRowStatus(page); |
||||
expect(nextPageStatus.start).toBe(largeRowStatus.end + 1); |
||||
expect(nextPageStatus.end).toBe(largeRowStatus.end * 2); |
||||
expect(nextPageStatus.total).toBe(largeRowStatus.total); |
||||
|
||||
// click a page number
|
||||
await page |
||||
.getByTestId('data-testid panel content') |
||||
.getByRole('navigation') |
||||
.getByText('4', { exact: true }) |
||||
.click(); |
||||
const fourthPageStatus = await getRowStatus(page); |
||||
expect(fourthPageStatus.start).toBe(largeRowStatus.end * 3 + 1); |
||||
expect(fourthPageStatus.end).toBe(largeRowStatus.end * 4); |
||||
expect(fourthPageStatus.total).toBe(largeRowStatus.total); |
||||
}); |
||||
|
||||
test('Tests DataLinks (single and multi) and actions', async ({ gotoDashboardPage, selectors, page }) => { |
||||
const addDataLink = async (title: string, url: string) => { |
||||
await dashboardPage |
||||
.getByGrafanaSelector( |
||||
selectors.components.PanelEditor.OptionsPane.fieldLabel('Data links and actions Data links') |
||||
) |
||||
.locator('button') |
||||
.filter({ hasText: 'Add link' }) |
||||
.click(); |
||||
|
||||
// DataLinks dialog has popped open - fill it in and add a global datalink.
|
||||
await expect(page.getByRole('dialog')).toBeVisible(); |
||||
await page.getByRole('dialog').locator('#link-title').fill(title); |
||||
await page.getByRole('dialog').locator('#data-link-input [contenteditable="true"]').focus(); |
||||
await page.getByRole('dialog').locator('#data-link-input [contenteditable="true"]').fill(url); |
||||
await page.getByRole('dialog').locator('#data-link-input [contenteditable="true"]').blur(); |
||||
await page.getByRole('dialog').getByRole('button', { name: 'Save' }).click(); |
||||
await expect(page.getByRole('dialog')).not.toBeVisible(); |
||||
}; |
||||
|
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '1' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).toBeVisible(); |
||||
|
||||
// disable text wrapping for this test to make it easier to click the links, the long lorem ipsum
|
||||
// can push the links off the screen.
|
||||
await dashboardPage |
||||
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')) |
||||
.last() |
||||
.click(); |
||||
|
||||
// Info column has a single DataLink by default.
|
||||
const infoCell = await getCell(page, 1, 1); |
||||
await expect(infoCell.locator('a')).toBeVisible(); |
||||
expect(infoCell.locator('a')).toHaveAttribute('href'); |
||||
expect(infoCell.locator('a')).not.toHaveAttribute('aria-haspopup'); |
||||
|
||||
// now, add a DataLink to the whole table
|
||||
await addDataLink('Test link', 'https://grafana.com'); |
||||
|
||||
// add a DataLink to the whole table, all cells will now have a single link.
|
||||
const colCount = await page.getByRole('row').nth(1).getByRole('gridcell').count(); |
||||
for (let colIdx = 0; colIdx < colCount; colIdx++) { |
||||
const cell = await getCell(page, 1, colIdx); |
||||
await expect(cell.locator('a')).toBeVisible(); |
||||
expect(cell.locator('a')).toHaveAttribute('href'); |
||||
expect(cell.locator('a')).not.toHaveAttribute('aria-haspopup', 'menu'); |
||||
} |
||||
|
||||
const headerContainer = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerContainer); |
||||
|
||||
// add another data link. now we'll check that the multi-link popups work.
|
||||
await addDataLink('Another test link', 'https://grafana.com/foo'); |
||||
|
||||
// loop thru the columns, click the links, observe that the tooltip appears, and close the tooltip.
|
||||
for (let colIdx = 0; colIdx < colCount; colIdx++) { |
||||
const cell = await getCell(page, 1, colIdx); |
||||
if (colIdx === 1) { |
||||
// the Info column should still have its single link.
|
||||
expect(cell.locator('a')).not.toHaveAttribute('aria-haspopup', 'menu'); |
||||
continue; |
||||
} |
||||
|
||||
await cell.locator('a').click({ force: true }); |
||||
await expect(page.getByTestId(selectors.components.DataLinksActionsTooltip.tooltipWrapper)).toBeVisible(); |
||||
|
||||
await headerContainer.click(); // convenient just to click the header to close the tooltip.
|
||||
await expect(page.getByTestId(selectors.components.DataLinksActionsTooltip.tooltipWrapper)).not.toBeVisible(); |
||||
} |
||||
|
||||
// add an Action to the whole table and check that the action button is added to the tooltip.
|
||||
// TODO -- saving for another day.
|
||||
}); |
||||
|
||||
test('Empty Table panel', async ({ gotoDashboardPage, selectors }) => { |
||||
const dashboardPage = await gotoDashboardPage({ |
||||
uid: 'dcb9f5e9-8066-4397-889e-864b99555dbb', |
||||
queryParams: new URLSearchParams({ editPanel: '2' }), |
||||
}); |
||||
|
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage) |
||||
).toBeVisible(); |
||||
await expect( |
||||
dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')) |
||||
).not.toBeVisible(); |
||||
}); |
||||
} |
||||
); |
||||
@ -0,0 +1,29 @@ |
||||
import { test, expect } from '@grafana/plugin-e2e'; |
||||
|
||||
test.use({ |
||||
viewport: { width: 1280, height: 1080 }, |
||||
featureToggles: { |
||||
tableNextGen: true, |
||||
}, |
||||
}); |
||||
|
||||
test.describe( |
||||
'Panels test: Table - Sparkline', |
||||
{ |
||||
tag: ['@panels'], |
||||
}, |
||||
() => { |
||||
test('Tests sparkline tables are successfully rendered', async ({ gotoDashboardPage, selectors, page }) => { |
||||
await gotoDashboardPage({ |
||||
uid: 'd6373b49-1957-4f00-9218-ee2120d3ecd9', |
||||
queryParams: new URLSearchParams({ editPanel: '2' }), |
||||
}); |
||||
|
||||
await expect(page.getByRole('grid')).toBeVisible(); |
||||
|
||||
const uplotCount = await page.locator('.uplot').count(); |
||||
const rowCount = await page.getByRole('row').count(); |
||||
expect(uplotCount).toBe(rowCount - 1); |
||||
}); |
||||
} |
||||
); |
||||
@ -1,57 +1,134 @@ |
||||
import { TimeOption } from '@grafana/data'; |
||||
import { t } from '@grafana/i18n'; |
||||
|
||||
import { ComboboxOption } from '../Combobox/types'; |
||||
|
||||
export const quickOptions: TimeOption[] = [ |
||||
{ from: 'now-5m', to: 'now', display: 'Last 5 minutes' }, |
||||
{ from: 'now-15m', to: 'now', display: 'Last 15 minutes' }, |
||||
{ from: 'now-30m', to: 'now', display: 'Last 30 minutes' }, |
||||
{ from: 'now-1h', to: 'now', display: 'Last 1 hour' }, |
||||
{ from: 'now-3h', to: 'now', display: 'Last 3 hours' }, |
||||
{ from: 'now-6h', to: 'now', display: 'Last 6 hours' }, |
||||
{ from: 'now-12h', to: 'now', display: 'Last 12 hours' }, |
||||
{ from: 'now-24h', to: 'now', display: 'Last 24 hours' }, |
||||
{ from: 'now-2d', to: 'now', display: 'Last 2 days' }, |
||||
{ from: 'now-7d', to: 'now', display: 'Last 7 days' }, |
||||
{ from: 'now-30d', to: 'now', display: 'Last 30 days' }, |
||||
{ from: 'now-90d', to: 'now', display: 'Last 90 days' }, |
||||
{ from: 'now-6M', to: 'now', display: 'Last 6 months' }, |
||||
{ from: 'now-1y', to: 'now', display: 'Last 1 year' }, |
||||
{ from: 'now-2y', to: 'now', display: 'Last 2 years' }, |
||||
{ from: 'now-5y', to: 'now', display: 'Last 5 years' }, |
||||
{ from: 'now-1d/d', to: 'now-1d/d', display: 'Yesterday' }, |
||||
{ from: 'now-2d/d', to: 'now-2d/d', display: 'Day before yesterday' }, |
||||
{ from: 'now-7d/d', to: 'now-7d/d', display: 'This day last week' }, |
||||
{ from: 'now-1w/w', to: 'now-1w/w', display: 'Previous week' }, |
||||
{ from: 'now-1M/M', to: 'now-1M/M', display: 'Previous month' }, |
||||
{ from: 'now-1Q/fQ', to: 'now-1Q/fQ', display: 'Previous fiscal quarter' }, |
||||
{ from: 'now-1y/y', to: 'now-1y/y', display: 'Previous year' }, |
||||
{ from: 'now-1y/fy', to: 'now-1y/fy', display: 'Previous fiscal year' }, |
||||
{ from: 'now/d', to: 'now/d', display: 'Today' }, |
||||
{ from: 'now/d', to: 'now', display: 'Today so far' }, |
||||
{ from: 'now/w', to: 'now/w', display: 'This week' }, |
||||
{ from: 'now/w', to: 'now', display: 'This week so far' }, |
||||
{ from: 'now/M', to: 'now/M', display: 'This month' }, |
||||
{ from: 'now/M', to: 'now', display: 'This month so far' }, |
||||
{ from: 'now/y', to: 'now/y', display: 'This year' }, |
||||
{ from: 'now/y', to: 'now', display: 'This year so far' }, |
||||
{ from: 'now/fQ', to: 'now', display: 'This fiscal quarter so far' }, |
||||
{ from: 'now/fQ', to: 'now/fQ', display: 'This fiscal quarter' }, |
||||
{ from: 'now/fy', to: 'now', display: 'This fiscal year so far' }, |
||||
{ from: 'now/fy', to: 'now/fy', display: 'This fiscal year' }, |
||||
export const getQuickOptions: () => TimeOption[] = () => [ |
||||
{ from: 'now-5m', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-5-mins', 'Last 5 minutes') }, |
||||
{ |
||||
from: 'now-15m', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.last-15-mins', 'Last 15 minutes'), |
||||
}, |
||||
{ |
||||
from: 'now-30m', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.last-30-mins', 'Last 30 minutes'), |
||||
}, |
||||
{ from: 'now-1h', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-1-hour', 'Last 1 hour') }, |
||||
{ from: 'now-3h', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-3-hours', 'Last 3 hours') }, |
||||
{ from: 'now-6h', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-6-hours', 'Last 6 hours') }, |
||||
{ |
||||
from: 'now-12h', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.last-12-hours', 'Last 12 hours'), |
||||
}, |
||||
{ |
||||
from: 'now-24h', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.last-24-hours', 'Last 24 hours'), |
||||
}, |
||||
{ from: 'now-2d', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-2-days', 'Last 2 days') }, |
||||
{ from: 'now-7d', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-7-days', 'Last 7 days') }, |
||||
{ from: 'now-30d', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-30-days', 'Last 30 days') }, |
||||
{ from: 'now-90d', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-90-days', 'Last 90 days') }, |
||||
{ |
||||
from: 'now-6M', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.last-6-months', 'Last 6 months'), |
||||
}, |
||||
{ from: 'now-1y', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-1-year', 'Last 1 year') }, |
||||
{ from: 'now-2y', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-2-years', 'Last 2 years') }, |
||||
{ from: 'now-5y', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.last-5-years', 'Last 5 years') }, |
||||
{ from: 'now-1d/d', to: 'now-1d/d', display: t('grafana-ui.date-time-pickers.quick-options.yesterday', 'Yesterday') }, |
||||
{ |
||||
from: 'now-2d/d', |
||||
to: 'now-2d/d', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.day-before-yesterday', 'Day before yesterday'), |
||||
}, |
||||
{ |
||||
from: 'now-7d/d', |
||||
to: 'now-7d/d', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-day-last-week', 'This day last week'), |
||||
}, |
||||
{ |
||||
from: 'now-1w/w', |
||||
to: 'now-1w/w', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.previous-week', 'Previous week'), |
||||
}, |
||||
{ |
||||
from: 'now-1M/M', |
||||
to: 'now-1M/M', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.previous-month', 'Previous month'), |
||||
}, |
||||
{ |
||||
from: 'now-1Q/fQ', |
||||
to: 'now-1Q/fQ', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.previous-fiscal-quarter', 'Previous fiscal quarter'), |
||||
}, |
||||
{ |
||||
from: 'now-1y/y', |
||||
to: 'now-1y/y', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.previous-year', 'Previous year'), |
||||
}, |
||||
{ |
||||
from: 'now-1y/fy', |
||||
to: 'now-1y/fy', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.previous-fiscal-year', 'Previous fiscal year'), |
||||
}, |
||||
{ from: 'now/d', to: 'now/d', display: t('grafana-ui.date-time-pickers.quick-options.today', 'Today') }, |
||||
{ from: 'now/d', to: 'now', display: t('grafana-ui.date-time-pickers.quick-options.today-so-far', 'Today so far') }, |
||||
{ from: 'now/w', to: 'now/w', display: t('grafana-ui.date-time-pickers.quick-options.this-week', 'This week') }, |
||||
{ |
||||
from: 'now/w', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-week-so-far', 'This week so far'), |
||||
}, |
||||
{ from: 'now/M', to: 'now/M', display: t('grafana-ui.date-time-pickers.quick-options.this-month', 'This month') }, |
||||
{ |
||||
from: 'now/M', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-month-so-far', 'This month so far'), |
||||
}, |
||||
{ from: 'now/y', to: 'now/y', display: t('grafana-ui.date-time-pickers.quick-options.this-year', 'This year') }, |
||||
{ |
||||
from: 'now/y', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-year-so-far', 'This year so far'), |
||||
}, |
||||
{ |
||||
from: 'now/fQ', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-fiscal-quarter-so-far', 'This fiscal quarter so far'), |
||||
}, |
||||
{ |
||||
from: 'now/fQ', |
||||
to: 'now/fQ', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-fiscal-quarter', 'This fiscal quarter'), |
||||
}, |
||||
{ |
||||
from: 'now/fy', |
||||
to: 'now', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-fiscal-year-so-far', 'This fiscal year so far'), |
||||
}, |
||||
{ |
||||
from: 'now/fy', |
||||
to: 'now/fy', |
||||
display: t('grafana-ui.date-time-pickers.quick-options.this-fiscal-year', 'This fiscal year'), |
||||
}, |
||||
]; |
||||
|
||||
export const monthOptions: Array<ComboboxOption<number>> = [ |
||||
{ label: 'January', value: 0 }, |
||||
{ label: 'February', value: 1 }, |
||||
{ label: 'March', value: 2 }, |
||||
{ label: 'April', value: 3 }, |
||||
{ label: 'May', value: 4 }, |
||||
{ label: 'June', value: 5 }, |
||||
{ label: 'July', value: 6 }, |
||||
{ label: 'August', value: 7 }, |
||||
{ label: 'September', value: 8 }, |
||||
{ label: 'October', value: 9 }, |
||||
{ label: 'November', value: 10 }, |
||||
{ label: 'December', value: 11 }, |
||||
export const getMonthOptions: () => Array<ComboboxOption<number>> = () => [ |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-january', 'January'), value: 0 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-february', 'February'), value: 1 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-march', 'March'), value: 2 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-april', 'April'), value: 3 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-may', 'May'), value: 4 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-june', 'June'), value: 5 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-july', 'July'), value: 6 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-august', 'August'), value: 7 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-september', 'September'), value: 8 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-october', 'October'), value: 9 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-november', 'November'), value: 10 }, |
||||
{ label: t('grafana-ui.date-time-pickers.month-options.label-december', 'December'), value: 11 }, |
||||
]; |
||||
|
||||
@ -1,78 +0,0 @@ |
||||
package provisioning |
||||
|
||||
import ( |
||||
"context" |
||||
"fmt" |
||||
|
||||
"go.opentelemetry.io/otel/attribute" |
||||
"go.opentelemetry.io/otel/codes" |
||||
"k8s.io/apimachinery/pkg/labels" |
||||
"k8s.io/apiserver/pkg/endpoints/request" |
||||
|
||||
"github.com/grafana/grafana/pkg/apimachinery/identity" |
||||
"github.com/grafana/grafana/pkg/storage/unified/resourcepb" |
||||
) |
||||
|
||||
func (b *APIBuilder) collectProvisioningStats(ctx context.Context) (metrics map[string]any, err error) { |
||||
ctx, span := b.tracer.Start(ctx, "Provisioning.Usage.collectProvisioningStats") |
||||
defer func() { |
||||
span.SetStatus(codes.Error, fmt.Sprintf("failed to fetch provisioning usage stats: %v", err)) |
||||
span.End() |
||||
}() |
||||
|
||||
m := map[string]any{} |
||||
if b.unified == nil { |
||||
span.SetStatus(codes.Ok, "unified storage is not available") |
||||
return m, nil |
||||
} |
||||
|
||||
// FIXME: hardcoded to "default" for now -- it works for single tenant deployments
|
||||
// we could discover the set of valid namespaces, but that would count everything for
|
||||
// each instance in cloud.
|
||||
ns := "default" |
||||
ctx, _, err = identity.WithProvisioningIdentity(ctx, ns) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
ctx = request.WithNamespace(ctx, ns) |
||||
|
||||
// FIXME: hardcoded to "default" for now -- it works for single tenant deployments
|
||||
// we could discover the set of valid namespaces, but that would count everything for
|
||||
// each instance in cloud.
|
||||
//
|
||||
// We could get namespaces from the list of repos below, but that could be zero
|
||||
// while we still have resources managed by terraform, etc
|
||||
count, err := b.unified.CountManagedObjects(ctx, &resourcepb.CountManagedObjectsRequest{ |
||||
Namespace: ns, |
||||
}) |
||||
if err != nil { |
||||
return m, fmt.Errorf("count managed objects: %w", err) |
||||
} |
||||
counts := make(map[string]int, 10) |
||||
for _, v := range count.Items { |
||||
counts[v.Kind] = counts[v.Kind] + int(v.Count) |
||||
} |
||||
|
||||
span.SetAttributes(attribute.Int("totalManagedObjectsCount", len(count.Items))) |
||||
for k, v := range counts { |
||||
m[fmt.Sprintf("stats.managed_by.%s.count", k)] = v |
||||
} |
||||
|
||||
// Inspect all configs
|
||||
repos, err := b.repositoryLister.List(labels.Everything()) |
||||
if err != nil { |
||||
return m, fmt.Errorf("list repositories: %w", err) |
||||
} |
||||
clear(counts) |
||||
for _, repo := range repos { |
||||
counts[string(repo.Spec.Type)] = counts[string(repo.Spec.Type)] + 1 |
||||
} |
||||
|
||||
span.SetAttributes(attribute.Int("repositoryCount", len(repos))) |
||||
// Count how many items of each repository type
|
||||
for k, v := range counts { |
||||
m[fmt.Sprintf("stats.repository.%s.count", k)] = v |
||||
} |
||||
|
||||
return m, nil |
||||
} |
||||
@ -0,0 +1,85 @@ |
||||
package usage |
||||
|
||||
import ( |
||||
"context" |
||||
"fmt" |
||||
|
||||
"go.opentelemetry.io/otel/attribute" |
||||
"go.opentelemetry.io/otel/codes" |
||||
"k8s.io/apimachinery/pkg/labels" |
||||
"k8s.io/apiserver/pkg/endpoints/request" |
||||
|
||||
"github.com/grafana/grafana/pkg/apimachinery/identity" |
||||
listers "github.com/grafana/grafana/pkg/generated/listers/provisioning/v0alpha1" |
||||
"github.com/grafana/grafana/pkg/infra/tracing" |
||||
"github.com/grafana/grafana/pkg/infra/usagestats" |
||||
"github.com/grafana/grafana/pkg/storage/unified/resource" |
||||
"github.com/grafana/grafana/pkg/storage/unified/resourcepb" |
||||
) |
||||
|
||||
func MetricCollector(tracer tracing.Tracer, repositoryLister listers.RepositoryLister, unified resource.ResourceClient) usagestats.MetricsFunc { |
||||
return func(ctx context.Context) (metrics map[string]any, err error) { |
||||
ctx, span := tracer.Start(ctx, "Provisioning.Usage.collectProvisioningStats") |
||||
defer func() { |
||||
span.SetStatus(codes.Error, fmt.Sprintf("failed to fetch provisioning usage stats: %v", err)) |
||||
span.End() |
||||
}() |
||||
|
||||
m := map[string]any{} |
||||
if unified == nil { |
||||
// FIXME: does this case make any sense? no unified storage -> no game
|
||||
span.SetStatus(codes.Ok, "unified storage is not available") |
||||
return m, nil |
||||
} |
||||
|
||||
// FIXME: hardcoded to "default" for now -- it works for single tenant deployments
|
||||
// we could discover the set of valid namespaces, but that would count everything for
|
||||
// each instance in cloud.
|
||||
ns := "default" |
||||
ctx, _, err = identity.WithProvisioningIdentity(ctx, ns) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
ctx = request.WithNamespace(ctx, ns) |
||||
|
||||
// FIXME: hardcoded to "default" for now -- it works for single tenant deployments
|
||||
// we could discover the set of valid namespaces, but that would count everything for
|
||||
// each instance in cloud.
|
||||
//
|
||||
// We could get namespaces from the list of repos below, but that could be zero
|
||||
// while we still have resources managed by terraform, etc
|
||||
count, err := unified.CountManagedObjects(ctx, &resourcepb.CountManagedObjectsRequest{ |
||||
Namespace: ns, |
||||
}) |
||||
if err != nil { |
||||
return m, fmt.Errorf("count managed objects: %w", err) |
||||
} |
||||
counts := make(map[string]int, 10) |
||||
for _, v := range count.Items { |
||||
counts[v.Kind] = counts[v.Kind] + int(v.Count) |
||||
} |
||||
|
||||
span.SetAttributes(attribute.Int("totalManagedObjectsCount", len(count.Items))) |
||||
for k, v := range counts { |
||||
m[fmt.Sprintf("stats.managed_by.%s.count", k)] = v |
||||
} |
||||
|
||||
// Inspect all configs
|
||||
repos, err := repositoryLister.List(labels.Everything()) |
||||
if err != nil { |
||||
return m, fmt.Errorf("list repositories: %w", err) |
||||
} |
||||
clear(counts) |
||||
for _, repo := range repos { |
||||
counts[string(repo.Spec.Type)] = counts[string(repo.Spec.Type)] + 1 |
||||
} |
||||
|
||||
span.SetAttributes(attribute.Int("repositoryCount", len(repos))) |
||||
// Count how many items of each repository type
|
||||
for k, v := range counts { |
||||
m[fmt.Sprintf("stats.repository.%s.count", k)] = v |
||||
} |
||||
|
||||
return m, nil |
||||
} |
||||
} |
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue