diff --git a/packages/grafana-runtime/src/types/analytics.ts b/packages/grafana-runtime/src/types/analytics.ts index c3e7f585303..2a7ef01504e 100644 --- a/packages/grafana-runtime/src/types/analytics.ts +++ b/packages/grafana-runtime/src/types/analytics.ts @@ -22,6 +22,7 @@ export interface DashboardInfo { export interface DataRequestInfo extends Partial { datasourceName: string; datasourceId: number; + datasourceUid: string; datasourceType: string; panelId?: number; panelName?: string; diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts index aa3a4f41f25..6c847338bc0 100644 --- a/public/app/features/query/state/queryAnalytics.test.ts +++ b/public/app/features/query/state/queryAnalytics.test.ts @@ -105,6 +105,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => { eventName: MetaAnalyticsEventName.DataRequest, datasourceName: datasource.name, datasourceId: datasource.id, + datasourceUid: datasource.uid, panelId: 2, dashboardId: 1, dashboardName: 'Test Dashboard', @@ -128,6 +129,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => { eventName: MetaAnalyticsEventName.DataRequest, datasourceName: datasource.name, datasourceId: datasource.id, + datasourceUid: datasource.uid, panelId: 2, dashboardId: 1, dashboardName: 'Test Dashboard', @@ -151,6 +153,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => { eventName: MetaAnalyticsEventName.DataRequest, datasourceName: datasource.name, datasourceId: datasource.id, + datasourceUid: datasource.uid, panelId: 2, dashboardId: 1, dashboardName: 'Test Dashboard', diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts index 862666f2613..ae70999ff61 100644 --- a/public/app/features/query/state/queryAnalytics.ts +++ b/public/app/features/query/state/queryAnalytics.ts @@ -35,6 +35,7 @@ export function emitDataRequestEvent(datasource: DataSourceApi) { eventName: MetaAnalyticsEventName.DataRequest, datasourceName: datasource.name, datasourceId: datasource.id, + datasourceUid: datasource.uid, datasourceType: datasource.type, panelId: data.request.panelId, dashboardId: data.request.dashboardId,