From 9fc82faea71a75b19de0376451e09fab70b74a76 Mon Sep 17 00:00:00 2001 From: Sriram <153843+yesoreyeram@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:50:48 +0000 Subject: [PATCH] [analytics] added plugin version to grafana_ds_test_datasource_clicked event (#100168) --- public/app/features/datasources/state/actions.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts index f1b2fdd4ffb..6229f0d1a02 100644 --- a/public/app/features/datasources/state/actions.ts +++ b/public/app/features/datasources/state/actions.ts @@ -5,6 +5,7 @@ import { TestDataSourceResponse, DataSourceTestSucceeded, DataSourceTestFailed, + DataSourceApi, } from '@grafana/data'; import { config, @@ -125,6 +126,11 @@ export const initDataSourceSettings = ( }; }; +const getPluginVersion = (dsApi: DataSourceApi) => { + const isCorePlugin = (dsApi?.meta?.module || '').startsWith('core'); + return isCorePlugin ? config?.buildInfo?.version : dsApi?.meta?.info?.version; +}; + export const testDataSource = ( dataSourceName: string, editRoute = DATASOURCES_ROUTES.Edit, @@ -153,6 +159,7 @@ export const testDataSource = ( trackDataSourceTested({ grafana_version: config.buildInfo.version, plugin_id: dsApi.type, + plugin_version: getPluginVersion(dsApi), datasource_uid: dsApi.uid, success: true, path: editLink, @@ -165,6 +172,7 @@ export const testDataSource = ( trackDataSourceTested({ grafana_version: config.buildInfo.version, plugin_id: dsApi.type, + plugin_version: getPluginVersion(dsApi), datasource_uid: dsApi.uid, success: false, path: editLink,