IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

DataFrame: Deprecate MutableDataFrame (#67569)

Browse Source
This commit is contained in:
Ryan McKinley
2023-05-01 19:41:40 -07:00
committed by GitHub
parent d31d1576fb
commit 86302bc1ec
35 changed files with 266 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/loki/LogContextProvider.test.ts
+2 -8
View File
@@ -1,12 +1,6 @@
import { of } from 'rxjs';
import {
DataQueryResponse,
FieldType,
LogRowContextQueryDirection,
LogRowModel,
MutableDataFrame,
} from '@grafana/data';
import { DataQueryResponse, FieldType, LogRowContextQueryDirection, LogRowModel, createDataFrame } from '@grafana/data';
import LokiLanguageProvider from './LanguageProvider';
import { LogContextProvider } from './LogContextProvider';
@@ -25,7 +19,7 @@ defaultDatasourceMock.languageProvider = defaultLanguageProviderMock;
const defaultLogRow = {
rowIndex: 0,
dataFrame: new MutableDataFrame({
dataFrame: createDataFrame({
fields: [
{
name: 'ts',
public/app/plugins/datasource/loki/getDerivedFields.test.ts
+2 -2
View File
@@ -1,4 +1,4 @@
import { MutableDataFrame } from '@grafana/data';
import { createDataFrame } from '@grafana/data';
import { getDerivedFields } from './getDerivedFields';
@@ -16,7 +16,7 @@ jest.mock('@grafana/runtime', () => ({
describe('getDerivedFields', () => {
it('adds links to fields', () => {
const df = new MutableDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
const newFields = getDerivedFields(df, [
{
matcherRegex: 'trace1=(\\w+)',
public/app/plugins/datasource/mssql/datasource.test.ts
+9 -9
View File
@@ -7,7 +7,7 @@ import {
dateTime,
FieldType,
MetricFindValue,
MutableDataFrame,
createDataFrame,
TimeRange,
} from '@grafana/data';
import { backendSrv } from 'app/core/services/backend_srv';
@@ -54,7 +54,7 @@ describe('MSSQLDatasource', () => {
tempvar: {
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -130,7 +130,7 @@ describe('MSSQLDatasource', () => {
refId: 'datasets',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
})
),
@@ -152,7 +152,7 @@ describe('MSSQLDatasource', () => {
refId: 'tables',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'schemaAndName', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
})
),
@@ -175,7 +175,7 @@ describe('MSSQLDatasource', () => {
refId: 'columns',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
{ name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -216,7 +216,7 @@ describe('MSSQLDatasource', () => {
tempvar: {
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__value', values: ['value1', 'value2', 'value3'] },
{ name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -254,7 +254,7 @@ describe('MSSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'id', values: [1, 2, 3] },
{ name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -297,7 +297,7 @@ describe('MSSQLDatasource', () => {
tempvar: {
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
{ name: '__value', values: ['same', 'same', 'diff'] },
@@ -330,7 +330,7 @@ describe('MSSQLDatasource', () => {
tempvar: {
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'test', values: ['aTitle'] }],
})
),
public/app/plugins/datasource/mysql/specs/datasource.test.ts
+10 -10
View File
@@ -6,7 +6,7 @@ import {
DataSourceInstanceSettings,
dateTime,
FieldType,
MutableDataFrame,
createDataFrame,
} from '@grafana/data';
import { FetchResponse, setBackendSrv } from '@grafana/runtime';
import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
@@ -115,7 +115,7 @@ describe('MySQLDatasource', () => {
refId: 'datasets',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
})
),
@@ -137,7 +137,7 @@ describe('MySQLDatasource', () => {
refId: 'tables',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'table_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
})
),
@@ -159,7 +159,7 @@ describe('MySQLDatasource', () => {
refId: 'fields',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'column_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
{ name: 'data_type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -199,7 +199,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -232,7 +232,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -267,7 +267,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -300,7 +300,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__value', values: ['value1', 'value2', 'value3'] },
{ name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -335,7 +335,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'id', values: [1, 2, 3] },
{ name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -373,7 +373,7 @@ describe('MySQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
{ name: '__value', values: ['same', 'same', 'diff'] },
public/app/plugins/datasource/postgres/datasource.test.ts
+13 -13
View File
@@ -9,7 +9,7 @@ import {
dateTime,
FieldType,
LoadingState,
MutableDataFrame,
createDataFrame,
} from '@grafana/data';
import { FetchResponse } from '@grafana/runtime';
import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
@@ -113,7 +113,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'A',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'time', values: [1599643351085] },
{ name: 'metric', values: [30.226249741223704], labels: { metric: 'America' } },
@@ -204,7 +204,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'A',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'time', values: [1599643351085] },
{ name: 'metric', values: ['America'] },
@@ -349,7 +349,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tables',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'table', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
})
),
@@ -372,7 +372,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'meta',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'version', type: FieldType.string, values: ['test1'] }],
})
),
@@ -394,7 +394,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'meta',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [{ name: 'extversion', type: FieldType.string, values: ['test1'] }],
})
),
@@ -416,7 +416,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'columns',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
{ name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -458,7 +458,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -491,7 +491,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -533,7 +533,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
{ name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -573,7 +573,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__value', values: ['value1', 'value2', 'value3'] },
{ name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -607,7 +607,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'id', values: [1, 2, 3] },
{ name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -644,7 +644,7 @@ describe('PostgreSQLDatasource', () => {
refId: 'tempvar',
frames: [
dataFrameToJSON(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
{ name: '__value', values: ['same', 'same', 'diff'] },
public/app/plugins/datasource/prometheus/result_transformer.test.ts
+32 -32
View File
@@ -3,7 +3,7 @@ import {
DataQueryRequest,
DataQueryResponse,
FieldType,
MutableDataFrame,
createDataFrame,
PreferredVisualisationType,
} from '@grafana/data';
@@ -191,7 +191,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -226,7 +226,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -238,7 +238,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [2, 3, 7] },
@@ -280,7 +280,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -292,7 +292,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'B',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -325,7 +325,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -337,7 +337,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -349,7 +349,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -390,7 +390,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -402,7 +402,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -414,7 +414,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -426,7 +426,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'B',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -438,7 +438,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'B',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -450,7 +450,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'B',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -485,7 +485,7 @@ describe('Prometheus Result Transformer', () => {
state: 'Done',
data: [
// 10
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -497,7 +497,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -509,7 +509,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -522,7 +522,7 @@ describe('Prometheus Result Transformer', () => {
],
}),
// 20
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -534,7 +534,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -546,7 +546,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -559,7 +559,7 @@ describe('Prometheus Result Transformer', () => {
],
}),
// 30
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -571,7 +571,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -583,7 +583,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -625,7 +625,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -637,7 +637,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
name: 'exemplar',
meta: {
@@ -675,7 +675,7 @@ describe('Prometheus Result Transformer', () => {
const response = {
state: 'Done',
data: [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -687,7 +687,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'A',
name: 'exemplar',
meta: {
@@ -741,7 +741,7 @@ describe('Prometheus Result Transformer', () => {
describe('transformDFToTable', () => {
it('transforms dataFrame with response length 1 to table dataFrame', () => {
const df = new MutableDataFrame({
const df = createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -765,7 +765,7 @@ describe('Prometheus Result Transformer', () => {
});
it('transforms dataFrame with response length 2 to table dataFrame', () => {
const df = new MutableDataFrame({
const df = createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -794,7 +794,7 @@ describe('Prometheus Result Transformer', () => {
const value2 = 'value2';
const dataframes = [
new MutableDataFrame({
createDataFrame({
refId: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -806,7 +806,7 @@ describe('Prometheus Result Transformer', () => {
},
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'B',
fields: [],
}),
public/app/plugins/datasource/tempo/datasource.test.ts
+8 -8
View File
@@ -9,7 +9,7 @@ import {
FieldType,
getDefaultTimeRange,
LoadingState,
MutableDataFrame,
createDataFrame,
PluginType,
} from '@grafana/data';
import {
@@ -121,7 +121,7 @@ describe('Tempo data source', () => {
it('parses json fields from backend', async () => {
setupBackendSrv(
new MutableDataFrame({
createDataFrame({
fields: [
{ name: 'traceID', values: ['04450900759028499335'] },
{ name: 'spanID', values: ['4322526419282105830'] },
@@ -796,7 +796,7 @@ const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
readOnly: false,
};
const rateMetric = new MutableDataFrame({
const rateMetric = createDataFrame({
refId: 'topk(5, sum(rate(traces_spanmetrics_calls_total{span_kind="SPAN_KIND_SERVER"}[$__range])) by (span_name))',
fields: [
{ name: 'Time', values: [1653725618609, 1653725618609] },
@@ -808,7 +808,7 @@ const rateMetric = new MutableDataFrame({
],
});
const errorRateMetric = new MutableDataFrame({
const errorRateMetric = createDataFrame({
refId:
'topk(5, sum(rate(traces_spanmetrics_calls_total{status_code="STATUS_CODE_ERROR",span_name=~"HTTP Client|HTTP GET - root"}[$__range])) by (span_name))',
fields: [
@@ -821,7 +821,7 @@ const errorRateMetric = new MutableDataFrame({
],
});
const durationMetric = new MutableDataFrame({
const durationMetric = createDataFrame({
refId:
'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{span_name=~"HTTP GET - root"}[$__range])) by (le))',
fields: [
@@ -833,7 +833,7 @@ const durationMetric = new MutableDataFrame({
],
});
const totalsPromMetric = new MutableDataFrame({
const totalsPromMetric = createDataFrame({
refId: 'traces_service_graph_request_total',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
@@ -846,7 +846,7 @@ const totalsPromMetric = new MutableDataFrame({
],
});
const secondsPromMetric = new MutableDataFrame({
const secondsPromMetric = createDataFrame({
refId: 'traces_service_graph_request_server_seconds_sum',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
@@ -859,7 +859,7 @@ const secondsPromMetric = new MutableDataFrame({
],
});
const failedPromMetric = new MutableDataFrame({
const failedPromMetric = createDataFrame({
refId: 'traces_service_graph_request_failed_total',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
public/app/plugins/datasource/tempo/graphTransform.test.ts
+7 -7
View File
@@ -1,4 +1,4 @@
import { DataFrameView, dateTime, MutableDataFrame } from '@grafana/data';
import { DataFrameView, dateTime, createDataFrame } from '@grafana/data';
import { createGraphFrames, mapPromMetricsToServiceMap } from './graphTransform';
import { bigResponse } from './testResponse';
@@ -116,7 +116,7 @@ describe('mapPromMetricsToServiceMap', () => {
});
});
const singleSpanResponse = new MutableDataFrame({
const singleSpanResponse = createDataFrame({
fields: [
{ name: 'traceID', values: ['04450900759028499335'] },
{ name: 'spanID', values: ['4322526419282105830'] },
@@ -128,7 +128,7 @@ const singleSpanResponse = new MutableDataFrame({
],
});
const missingSpanResponse = new MutableDataFrame({
const missingSpanResponse = createDataFrame({
fields: [
{ name: 'traceID', values: ['04450900759028499335', '04450900759028499335'] },
{ name: 'spanID', values: ['1', '2'] },
@@ -140,7 +140,7 @@ const missingSpanResponse = new MutableDataFrame({
],
});
const totalsPromMetric = new MutableDataFrame({
const totalsPromMetric = createDataFrame({
refId: 'traces_service_graph_request_total',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
@@ -153,7 +153,7 @@ const totalsPromMetric = new MutableDataFrame({
],
});
const secondsPromMetric = new MutableDataFrame({
const secondsPromMetric = createDataFrame({
refId: 'traces_service_graph_request_server_seconds_sum',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
@@ -166,7 +166,7 @@ const secondsPromMetric = new MutableDataFrame({
],
});
const failedPromMetric = new MutableDataFrame({
const failedPromMetric = createDataFrame({
refId: 'traces_service_graph_request_failed_total',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
@@ -179,7 +179,7 @@ const failedPromMetric = new MutableDataFrame({
],
});
const invalidFailedPromMetric = new MutableDataFrame({
const invalidFailedPromMetric = createDataFrame({
refId: 'traces_service_graph_request_failed_total',
fields: [
{ name: 'Time', values: [1628169788000, 1628169788000] },
public/app/plugins/datasource/tempo/resultTransformer.test.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { collectorTypes } from '@opentelemetry/exporter-collector';
import {
FieldType,
MutableDataFrame,
createDataFrame,
PluginType,
DataSourceInstanceSettings,
dateTime,
@@ -45,7 +45,7 @@ const defaultSettings: DataSourceInstanceSettings = {
};
describe('transformTraceList()', () => {
const lokiDataFrame = new MutableDataFrame({
const lokiDataFrame = createDataFrame({
fields: [
{
name: 'ts',
public/app/plugins/datasource/testdata/nodeGraphUtils.ts
Vendored
+16 -7
View File
@@ -1,4 +1,11 @@
import { FieldColorModeId, FieldDTO, FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames } from '@grafana/data';
import {
FieldColorModeId,
FieldDTO,
FieldType,
MutableDataFrame,
NodeGraphDataFrameFieldNames,
DataFrame,
} from '@grafana/data';
import { nodes, edges } from './testData/serviceMapResponse';
@@ -105,16 +112,17 @@ export function generateRandomNodes(count = 10) {
meta: { preferredVisualisationType: 'nodeGraph' },
});
const edgesFrame = new MutableDataFrame({
const edgesFrame: DataFrame = {
name: 'edges',
fields: [
{ name: NodeGraphDataFrameFieldNames.id, values: [], type: FieldType.string },
{ name: NodeGraphDataFrameFieldNames.source, values: [], type: FieldType.string },
{ name: NodeGraphDataFrameFieldNames.target, values: [], type: FieldType.string },
{ name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number },
{ name: NodeGraphDataFrameFieldNames.id, values: [], type: FieldType.string, config: {} },
{ name: NodeGraphDataFrameFieldNames.source, values: [], type: FieldType.string, config: {} },
{ name: NodeGraphDataFrameFieldNames.target, values: [], type: FieldType.string, config: {} },
{ name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number, config: {} },
],
meta: { preferredVisualisationType: 'nodeGraph' },
});
length: 0,
};
const edgesSet = new Set();
for (const node of nodes) {
@@ -140,6 +148,7 @@ export function generateRandomNodes(count = 10) {
edgesFrame.fields[3].values.push(Math.random() * 100);
}
}
edgesFrame.length = edgesFrame.fields[0].values.length;
return [nodeFrame, edgesFrame];
}
public/app/plugins/datasource/zipkin/datasource.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import {
DataSourceInstanceSettings,
DataSourceJsonData,
FieldType,
MutableDataFrame,
createDataFrame,
ScopedVars,
} from '@grafana/data';
import { BackendSrvRequest, FetchResponse, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
@@ -127,7 +127,7 @@ function responseToDataQueryResponse(response: { data: ZipkinSpan[] }, nodeGraph
const emptyDataQueryResponse = {
data: [
new MutableDataFrame({
createDataFrame({
fields: [
{
name: 'trace',
public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import { fireEvent, render, screen } from '@testing-library/react';
import React, { useState } from 'react';
import { CoreApp, MutableDataFrame } from '@grafana/data';
import { CoreApp, createDataFrame } from '@grafana/data';
import { SelectedView } from '../types';
@@ -27,7 +27,7 @@ describe('FlameGraph', () => {
const [search] = useState('');
const [selectedView, _] = useState(SelectedView.Both);
const flameGraphData = new MutableDataFrame(data);
const flameGraphData = createDataFrame(data);
const container = new FlameGraphDataContainer(flameGraphData);
const levels = nestedSetToLevels(container);
public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphMetadata.test.ts
+2 -2
View File
@@ -1,10 +1,10 @@
import { MutableDataFrame } from '@grafana/data';
import { createDataFrame } from '@grafana/data';
import { getMetadata } from './FlameGraphMetadata';
import { FlameGraphDataContainer } from './dataTransform';
function makeDataFrame(fields: Record<string, Array<number | string>>, unit?: string) {
return new MutableDataFrame({
return createDataFrame({
fields: Object.keys(fields).map((key) => ({
name: key,
values: fields[key],
public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
+2 -2
View File
@@ -1,10 +1,10 @@
import { Field, FieldType, MutableDataFrame } from '@grafana/data';
import { Field, FieldType, createDataFrame } from '@grafana/data';
import { getTooltipData } from './FlameGraphTooltip';
import { FlameGraphDataContainer } from './dataTransform';
function setupData(unit?: string) {
const flameGraphData = new MutableDataFrame({
const flameGraphData = createDataFrame({
fields: [
{ name: 'level', values: [0] },
unit ? makeField('value', unit, [8_624_078_250]) : { name: 'value', values: [8_624_078_250] },
public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.test.ts
+3 -3
View File
@@ -1,10 +1,10 @@
import { MutableDataFrame } from '@grafana/data';
import { createDataFrame } from '@grafana/data';
import { FlameGraphDataContainer, nestedSetToLevels } from './dataTransform';
describe('nestedSetToLevels', () => {
it('converts nested set data frame to levels', () => {
const frame = new MutableDataFrame({
const frame = createDataFrame({
fields: [
{ name: 'level', values: [0, 1, 2, 3, 2, 1, 2, 3, 4] },
{ name: 'value', values: [10, 5, 3, 1, 1, 4, 3, 2, 1] },
@@ -33,7 +33,7 @@ describe('nestedSetToLevels', () => {
});
it('converts nested set data if multiple same level items', () => {
const frame = new MutableDataFrame({
const frame = createDataFrame({
fields: [
{ name: 'level', values: [0, 1, 1, 1] },
{ name: 'value', values: [10, 5, 3, 1] },
public/app/plugins/panel/flamegraph/components/FlameGraph/rendering.test.ts
+2 -2
View File
@@ -1,10 +1,10 @@
import { MutableDataFrame } from '@grafana/data';
import { createDataFrame } from '@grafana/data';
import { FlameGraphDataContainer, LevelItem } from './dataTransform';
import { getRectDimensionsForLevel } from './rendering';
function makeDataFrame(fields: Record<string, Array<number | string>>) {
return new MutableDataFrame({
return createDataFrame({
fields: Object.keys(fields).map((key) => ({
name: key,
values: fields[key],
public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
+2 -2
View File
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React from 'react';
import { CoreApp, MutableDataFrame } from '@grafana/data';
import { CoreApp, createDataFrame } from '@grafana/data';
import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from '../constants';
@@ -23,7 +23,7 @@ describe('FlameGraphContainer', () => {
Object.defineProperty(HTMLElement.prototype, 'clientWidth', { value: 500 });
const FlameGraphContainerWithProps = () => {
const flameGraphData = new MutableDataFrame(data);
const flameGraphData = createDataFrame(data);
flameGraphData.meta = {
custom: {
ProfileTypeID: 'cpu:foo:bar',
public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import { render, screen } from '@testing-library/react';
import React, { useState } from 'react';
import { CoreApp, MutableDataFrame } from '@grafana/data';
import { CoreApp, createDataFrame } from '@grafana/data';
import { FlameGraphDataContainer, nestedSetToLevels } from '../FlameGraph/dataTransform';
import { data } from '../FlameGraph/testData/dataNestedSet';
@@ -14,7 +14,7 @@ describe('FlameGraphTopTableContainer', () => {
const [search, setSearch] = useState('');
const [selectedView, _] = useState(SelectedView.Both);
const flameGraphData = new MutableDataFrame(data);
const flameGraphData = createDataFrame(data);
const container = new FlameGraphDataContainer(flameGraphData);
const levels = nestedSetToLevels(container);
public/app/plugins/panel/logs/LogsPanel.test.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import { render, screen } from '@testing-library/react';
import React, { ComponentProps } from 'react';
import { LoadingState, MutableDataFrame, FieldType, LogsSortOrder } from '@grafana/data';
import { LoadingState, createDataFrame, FieldType, LogsSortOrder } from '@grafana/data';
import { LogsPanel } from './LogsPanel';
@@ -10,7 +10,7 @@ type LogsPanelProps = ComponentProps<typeof LogsPanel>;
describe('LogsPanel', () => {
describe('when returned series include common labels', () => {
const seriesWithCommonLabels = [
new MutableDataFrame({
createDataFrame({
fields: [
{
name: 'time',
@@ -66,7 +66,7 @@ describe('LogsPanel', () => {
});
describe('when returned series does not include common labels', () => {
const seriesWithoutCommonLabels = [
new MutableDataFrame({
createDataFrame({
fields: [
{
name: 'time',
public/app/plugins/panel/nodeGraph/utils.test.ts
+11 -11
View File
@@ -1,4 +1,4 @@
import { DataFrame, FieldType, MutableDataFrame } from '@grafana/data';
import { DataFrame, FieldType, createDataFrame } from '@grafana/data';
import { NodeDatum, NodeGraphOptions } from './types';
import {
@@ -81,27 +81,27 @@ describe('processNodes', () => {
it('detects dataframes correctly', () => {
const validFrames = [
new MutableDataFrame({
createDataFrame({
refId: 'hasPreferredVisualisationType',
fields: [],
meta: {
preferredVisualisationType: 'nodeGraph',
},
}),
new MutableDataFrame({
createDataFrame({
refId: 'hasName',
fields: [],
name: 'nodes',
}),
new MutableDataFrame({
createDataFrame({
refId: 'nodes', // hasRefId
fields: [],
}),
new MutableDataFrame({
createDataFrame({
refId: 'hasValidNodesShape',
fields: [{ name: 'id', type: FieldType.string }],
}),
new MutableDataFrame({
createDataFrame({
refId: 'hasValidEdgesShape',
fields: [
{ name: 'id', type: FieldType.string },
@@ -111,7 +111,7 @@ describe('processNodes', () => {
}),
];
const invalidFrames = [
new MutableDataFrame({
createDataFrame({
refId: 'invalidData',
fields: [],
}),
@@ -124,7 +124,7 @@ describe('processNodes', () => {
});
it('getting fields is case insensitive', () => {
const nodeFrame = new MutableDataFrame({
const nodeFrame = createDataFrame({
refId: 'nodes',
fields: [
{ name: 'id', type: FieldType.string, values: ['id'] },
@@ -142,7 +142,7 @@ describe('processNodes', () => {
expect(nodeFields.mainStat).toBeDefined();
expect(nodeFields.secondaryStat).toBeDefined();
const edgeFrame = new MutableDataFrame({
const edgeFrame = createDataFrame({
refId: 'nodes',
fields: [
{ name: 'id', type: FieldType.string, values: ['id'] },
@@ -162,7 +162,7 @@ describe('processNodes', () => {
it('interpolates panel options correctly', () => {
const frames = [
new MutableDataFrame({
createDataFrame({
refId: 'nodes',
fields: [
{ name: 'id', type: FieldType.string },
@@ -173,7 +173,7 @@ describe('processNodes', () => {
{ name: 'arc__tertiary', type: FieldType.string },
],
}),
new MutableDataFrame({
createDataFrame({
refId: 'edges',
fields: [
{ name: 'id', type: FieldType.string },
public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.test.tsx
+8 -14
View File
@@ -1,16 +1,15 @@
import { MutableDataFrame, Field } from '@grafana/data/src';
import { UPlotConfigBuilder } from '@grafana/ui/src';
import { createDataFrame } from '@grafana/data';
import { UPlotConfigBuilder } from '@grafana/ui';
import { getVisibleLabels, VisibleExemplarLabels } from './ExemplarsPlugin';
describe('getVisibleLabels()', () => {
const dataFrameSeries1 = new MutableDataFrame({
const dataFrameSeries1 = createDataFrame({
name: 'tns/app',
fields: [
{
name: 'Time',
values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
entities: {},
},
{
name: 'Value',
@@ -19,16 +18,14 @@ describe('getVisibleLabels()', () => {
},
values: [0.018963114754098367, 0.019140624999999974, 0.019718309859154928, 0.020064189189189167],
},
] as unknown as Field[],
length: 4,
],
});
const dataFrameSeries2 = new MutableDataFrame({
const dataFrameSeries2 = createDataFrame({
name: 'tns/db',
fields: [
{
name: 'Time',
values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
entities: {},
},
{
name: 'Value',
@@ -37,16 +34,14 @@ describe('getVisibleLabels()', () => {
},
values: [0.028963114754098367, 0.029140624999999974, 0.029718309859154928, 0.030064189189189167],
},
] as unknown as Field[],
length: 4,
],
});
const dataFrameSeries3 = new MutableDataFrame({
const dataFrameSeries3 = createDataFrame({
name: 'tns/loadgen',
fields: [
{
name: 'Time',
values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
entities: {},
},
{
name: 'Value',
@@ -55,8 +50,7 @@ describe('getVisibleLabels()', () => {
},
values: [0.028963114754098367, 0.029140624999999974, 0.029718309859154928, 0.030064189189189167],
},
] as unknown as Field[],
length: 4,
],
});
const frames = [dataFrameSeries1, dataFrameSeries2, dataFrameSeries3];
const config: UPlotConfigBuilder = {
public/app/plugins/panel/timeseries/utils.test.ts
+4 -4
View File
@@ -1,4 +1,4 @@
import { createTheme, FieldType, MutableDataFrame, toDataFrame } from '@grafana/data';
import { createTheme, FieldType, createDataFrame, toDataFrame } from '@grafana/data';
import { prepareGraphableFields } from './utils';
@@ -76,7 +76,7 @@ describe('prepare timeseries graph', () => {
});
it('will convert NaN and Infinty to nulls', () => {
const df = new MutableDataFrame({
const df = createDataFrame({
fields: [
{ name: 'time', type: FieldType.time, values: [995, 9996, 9997, 9998, 9999] },
{ name: 'a', values: [-10, NaN, 10, -Infinity, +Infinity] },
@@ -97,7 +97,7 @@ describe('prepare timeseries graph', () => {
});
it('will insert nulls given an interval value', () => {
const df = new MutableDataFrame({
const df = createDataFrame({
fields: [
{ name: 'time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 6] },
{ name: 'a', values: [1, 2, 3] },
@@ -121,7 +121,7 @@ describe('prepare timeseries graph', () => {
});
it('will insert and convert nulls to a configure "no value" value', () => {
const df = new MutableDataFrame({
const df = createDataFrame({
fields: [
{ name: 'time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 6] },
{ name: 'a', config: { noValue: '20' }, values: [1, 2, 3] },