IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Add checking for target datasources and add test (#70855)

Browse Source 
Add checking for target datasources and add test
This commit is contained in:
Kristina
2023-07-06 08:36:39 -05:00
committed by GitHub
parent ad5a36e7a3
commit b6fbf307d9
2 changed files with 85 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
public/app/features/correlations/CorrelationsPage.test.tsx
View File

@@ -555,6 +555,82 @@ describe('CorrelationsPage', () => {
});
});
describe('With correlations with datasources the user cannot access', () => {
let queryCellsByColumnName: (columnName: Matcher) => HTMLTableCellElement[];
beforeEach(async () => {
const renderResult = await renderWithContext(
{
loki: mockDataSource(
{
uid: 'loki',
name: 'loki',
readOnly: false,
jsonData: {},
access: 'direct',
type: 'datasource',
},
{
logs: true,
}
),
},
[
{
sourceUID: 'loki',
targetUID: 'loki',
uid: '1',
label: 'Loki to Loki',
config: {
field: 'line',
target: {},
type: 'query',
transformations: [
{ type: SupportedTransformationType.Regex, expression: 'url=http[s]?://(S*)', mapValue: 'path' },
],
},
},
{
sourceUID: 'loki',
targetUID: 'prometheus',
uid: '2',
label: 'Loki to Prometheus',
config: {
field: 'line',
target: {},
type: 'query',
transformations: [
{ type: SupportedTransformationType.Regex, expression: 'url=http[s]?://(S*)', mapValue: 'path' },
],
},
},
{
sourceUID: 'prometheus',
targetUID: 'loki',
uid: '3',
label: 'Prometheus to Loki',
config: { field: 'label', target: {}, type: 'query' },
},
{
sourceUID: 'prometheus',
targetUID: 'prometheus',
uid: '4',
label: 'Prometheus to Prometheus',
config: { field: 'label', target: {}, type: 'query' },
},
]
);
queryCellsByColumnName = renderResult.queryCellsByColumnName;
});
it("doesn't show correlations from source or target datasources the user doesn't have access to", async () => {
await screen.findByRole('table');
const labels = queryCellsByColumnName('Label');
expect(labels.length).toBe(1);
expect(labels[0].textContent).toBe('Loki to Loki');
});
});
describe('Read only correlations', () => {
const correlations: Correlation[] = [
{

11
public/app/features/correlations/useCorrelations.ts
View File

@@ -41,11 +41,18 @@ const toEnrichedCorrelationData = ({
...correlation
}: Correlation): CorrelationData | undefined => {
const sourceDatasource = getDataSourceSrv().getInstanceSettings(sourceUID);
if (sourceDatasource) {
const targetDatasource = getDataSourceSrv().getInstanceSettings(targetUID);
if (
sourceDatasource &&
sourceDatasource?.uid !== undefined &&
targetDatasource &&
targetDatasource.uid !== undefined
) {
return {
...correlation,
source: sourceDatasource,
target: getDataSourceSrv().getInstanceSettings(targetUID)!,
target: targetDatasource,
};
} else {
return undefined;