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

Logs Panel: Table UI - add explore viz type to grafana_explore_logs_result_displayed event (#80037)

Browse Source 
* add explore visualisation type to grafana_explore_logs_result_displayed event

* add log row count

---------

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
This commit is contained in:
Galen Kistler
2024-01-04 14:01:28 -06:00
committed by GitHub
parent 6da0ce5e01
commit 098e47747f
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/explore/Logs/Logs.test.tsx
View File

@@ -18,7 +18,8 @@ import { organizeFieldsTransformer } from '@grafana/data/src/transformations/tra
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { extractFieldsTransformer } from 'app/features/transformers/extractFields/extractFields'; import { extractFieldsTransformer } from 'app/features/transformers/extractFields/extractFields';
import { Logs, visualisationTypeKey } from './Logs'; import { Logs } from './Logs';
import { visualisationTypeKey } from './utils/logs';
import { getMockElasticFrame, getMockLokiFrame } from './utils/testMocks.test'; import { getMockElasticFrame, getMockLokiFrame } from './utils/testMocks.test';
const reportInteraction = jest.fn(); const reportInteraction = jest.fn();

4
public/app/features/explore/Logs/Logs.tsx
View File

@@ -62,7 +62,7 @@ import { LogsMetaRow } from './LogsMetaRow';
import LogsNavigation from './LogsNavigation'; import LogsNavigation from './LogsNavigation';
import { getLogsTableHeight, LogsTableWrap } from './LogsTableWrap'; import { getLogsTableHeight, LogsTableWrap } from './LogsTableWrap';
import { LogsVolumePanelList } from './LogsVolumePanelList'; import { LogsVolumePanelList } from './LogsVolumePanelList';
import { SETTINGS_KEYS } from './utils/logs'; import { SETTINGS_KEYS, visualisationTypeKey } from './utils/logs';
interface Props extends Themeable2 { interface Props extends Themeable2 {
width: number; width: number;
@@ -141,8 +141,6 @@ const DEDUP_OPTIONS = [
LogsDedupStrategy.signature, LogsDedupStrategy.signature,
]; ];
export const visualisationTypeKey = 'grafana.explore.logs.visualisationType';
const getDefaultVisualisationType = (): LogsVisualisationType => { const getDefaultVisualisationType = (): LogsVisualisationType => {
const visualisationType = store.get(visualisationTypeKey); const visualisationType = store.get(visualisationTypeKey);
if (visualisationType === 'table') { if (visualisationType === 'table') {

2
public/app/features/explore/Logs/utils/logs.ts
View File

@@ -6,3 +6,5 @@ export const SETTINGS_KEYS = {
logsSortOrder: 'grafana.explore.logs.sortOrder', logsSortOrder: 'grafana.explore.logs.sortOrder',
logContextWrapLogMessage: 'grafana.explore.logs.logContext.wrapLogMessage', logContextWrapLogMessage: 'grafana.explore.logs.logContext.wrapLogMessage',
}; };
export const visualisationTypeKey = 'grafana.explore.logs.visualisationType';

10
public/app/features/explore/state/query.ts
View File

@@ -23,6 +23,7 @@ import {
} from '@grafana/data'; } from '@grafana/data';
import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime'; import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
import { DataQuery } from '@grafana/schema'; import { DataQuery } from '@grafana/schema';
import store from 'app/core/store';
import { import {
buildQueryTransaction, buildQueryTransaction,
ensureQueries, ensureQueries,
@@ -51,6 +52,7 @@ import { ExploreState, QueryOptions, SupplementaryQueries } from 'app/types/expl
import { notifyApp } from '../../../core/actions'; import { notifyApp } from '../../../core/actions';
import { createErrorNotification } from '../../../core/copy/appNotification'; import { createErrorNotification } from '../../../core/copy/appNotification';
import { runRequest } from '../../query/state/runRequest'; import { runRequest } from '../../query/state/runRequest';
import { visualisationTypeKey } from '../Logs/utils/logs';
import { decorateData } from '../utils/decorators'; import { decorateData } from '../utils/decorators';
import { import {
getSupplementaryQueryProvider, getSupplementaryQueryProvider,
@@ -633,17 +635,21 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
newQuerySubscription = newQuerySource.subscribe({ newQuerySubscription = newQuerySource.subscribe({
next(data) { next(data) {
const exploreState = getState().explore.panes[exploreId];
if (data.logsResult !== null && data.state === LoadingState.Done) { if (data.logsResult !== null && data.state === LoadingState.Done) {
reportInteraction('grafana_explore_logs_result_displayed', { reportInteraction('grafana_explore_logs_result_displayed', {
datasourceType: datasourceInstance.type, datasourceType: datasourceInstance.type,
visualisationType:
exploreState?.panelsState?.logs?.visualisationType ?? store.get(visualisationTypeKey) ?? 'N/A',
length: data.logsResult.rows.length,
}); });
} }
dispatch(queryStreamUpdatedAction({ exploreId, response: data })); dispatch(queryStreamUpdatedAction({ exploreId, response: data }));
// Keep scanning for results if this was the last scanning transaction // Keep scanning for results if this was the last scanning transaction
if (getState().explore.panes[exploreId]!.scanning) { if (exploreState!.scanning) {
if (data.state === LoadingState.Done && data.series.length === 0) { if (data.state === LoadingState.Done && data.series.length === 0) {
const range = getShiftedTimeRange(-1, getState().explore.panes[exploreId]!.range); const range = getShiftedTimeRange(-1, exploreState!.range);
dispatch(updateTime({ exploreId, absoluteRange: range })); dispatch(updateTime({ exploreId, absoluteRange: range }));
dispatch(runQueries({ exploreId })); dispatch(runQueries({ exploreId }));
} else { } else {