public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loki: query splitting: better stats (#64105)

Browse Source
This commit is contained in:
Gábor Farkas
2023-03-03 04:58:28 -05:00
committed by GitHub
parent ab512fcf88
commit 192308aac7
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/loki/mocks.ts
+5 -5
View File
@@ -152,7 +152,7 @@ export function getMockFrames() {
],
meta: {
stats: [
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
{ displayName: 'Ingester: total reached', value: 1 },
],
},
@@ -199,7 +199,7 @@ export function getMockFrames() {
],
meta: {
stats: [
{ displayName: 'Summary: total bytes processed', value: 22 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
{ displayName: 'Ingester: total reached', value: 2 },
],
},
@@ -225,7 +225,7 @@ export function getMockFrames() {
meta: {
stats: [
{ displayName: 'Ingester: total reached', value: 1 },
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
],
},
length: 2,
@@ -250,7 +250,7 @@ export function getMockFrames() {
meta: {
stats: [
{ displayName: 'Ingester: total reached', value: 2 },
{ displayName: 'Summary: total bytes processed', value: 22 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
],
},
length: 2,
@@ -276,7 +276,7 @@ export function getMockFrames() {
meta: {
stats: [
{ displayName: 'Ingester: total reached', value: 2 },
{ displayName: 'Summary: total bytes processed', value: 33 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
],
},
length: 2,
public/app/plugins/datasource/loki/queryUtils.test.ts
+9 -6
View File
@@ -369,6 +369,7 @@ describe('combineResponses', () => {
stats: [
{
displayName: 'Summary: total bytes processed',
unit: 'decbytes',
value: 33,
},
],
@@ -409,6 +410,7 @@ describe('combineResponses', () => {
stats: [
{
displayName: 'Summary: total bytes processed',
unit: 'decbytes',
value: 33,
},
],
@@ -449,6 +451,7 @@ describe('combineResponses', () => {
stats: [
{
displayName: 'Summary: total bytes processed',
unit: 'decbytes',
value: 33,
},
],
@@ -488,31 +491,31 @@ describe('combineResponses', () => {
it('two values', () => {
const responseA = makeResponse([
{ displayName: 'Ingester: total reached', value: 1 },
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
]);
const responseB = makeResponse([
{ displayName: 'Ingester: total reached', value: 2 },
{ displayName: 'Summary: total bytes processed', value: 22 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
]);
expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
{ displayName: 'Summary: total bytes processed', value: 33 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
]);
});
it('one value', () => {
const responseA = makeResponse([
{ displayName: 'Ingester: total reached', value: 1 },
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
]);
const responseB = makeResponse();
expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
]);
expect(combineResponses(responseB, responseA).data[0].meta.stats).toStrictEqual([
{ displayName: 'Summary: total bytes processed', value: 11 },
{ displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
]);
});
public/app/plugins/datasource/loki/queryUtils.ts
+1 -1
View File
@@ -365,7 +365,7 @@ function getCombinedMetadataStats(
const sourceStat = sourceStats.find((s) => s.displayName === TOTAL_BYTES_STAT);
if (sourceStat != null && destStat != null) {
return [{ value: sourceStat.value + destStat.value, displayName: TOTAL_BYTES_STAT }];
return [{ value: sourceStat.value + destStat.value, displayName: TOTAL_BYTES_STAT, unit: destStat.unit }];
}
// maybe one of them exist