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

Tempo: Tempo/Prometheus links select ds in new tab (cmd + click) (#52319)

Browse Source 
* Set tempo/prom ds name when clicking trace links

* Updated tests

* Removed vars
This commit is contained in:
Joey Tawadrous 2022-07-18 15:36:16 +01:00 committed by GitHub
parent 7b7b9ff4a7
commit 6c89bf53f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/tempo/datasource.test.ts
View File

@ -578,6 +578,14 @@ const backendSrvWithPrometheus = {
}
throw new Error('unexpected uid');
},
getDataSourceSettingsByUid(uid: string) {
if (uid === 'prom') {
return { name: 'Prometheus' };
} else if (uid === 'gdev-tempo') {
return { name: 'Tempo' };
}
return '';
},
};
function setupBackendSrv(frame: DataFrame) {
@ -598,7 +606,7 @@ function setupBackendSrv(frame: DataFrame) {
const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
id: 0,
uid: '0',
uid: 'gdev-tempo',
type: 'tracing',
name: 'tempo',
access: 'proxy',
@ -777,7 +785,7 @@ const serviceGraphLinks = [
queryType: 'nativeSearch',
serviceName: '${__data.fields[0]}',
} as TempoQuery,
datasourceUid: 'tempo',
datasourceUid: 'gdev-tempo',
datasourceName: 'Tempo',
},
},

13
public/app/plugins/datasource/tempo/datasource.ts
View File

@ -237,18 +237,19 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
});
const dsId = this.serviceMap.datasourceUid;
const tempoDsUid = this.uid;
if (config.featureToggles.tempoApmTable) {
subQueries.push(
serviceMapQuery(options, dsId, this.name).pipe(
serviceMapQuery(options, dsId, tempoDsUid).pipe(
concatMap((result) =>
rateQuery(options, result, dsId).pipe(
concatMap((result) => errorAndDurationQuery(options, result, dsId, this.name))
concatMap((result) => errorAndDurationQuery(options, result, dsId, tempoDsUid))
)
)
)
);
} else {
subQueries.push(serviceMapQuery(options, dsId, this.name));
subQueries.push(serviceMapQuery(options, dsId, tempoDsUid));
}
}
@ -585,7 +586,7 @@ function makePromLink(title: string, expr: string, datasourceUid: string, instan
instant: instant,
} as PromQuery,
datasourceUid,
datasourceName: 'Prometheus',
datasourceName: getDatasourceSrv().getDataSourceSettingsByUid(datasourceUid)?.name ?? '',
},
};
}
@ -604,8 +605,8 @@ export function makeTempoLink(title: string, serviceName: string, spanName: stri
title,
internal: {
query,
datasourceUid: datasourceUid,
datasourceName: 'Tempo',
datasourceUid,
datasourceName: getDatasourceSrv().getDataSourceSettingsByUid(datasourceUid)?.name ?? '',
},
};
}