From 76f4c11430a6b41a68d8a0bb3a5fedd8ef223518 Mon Sep 17 00:00:00 2001 From: Andrej Ocenas Date: Mon, 9 Nov 2020 15:17:56 +0100 Subject: [PATCH] CloudWatch Logs: Change what we use to measure progress (#28912) --- public/app/plugins/datasource/cloudwatch/datasource.ts | 2 +- .../datasource/cloudwatch/specs/datasource.test.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index 7b859d4df15..eaa99536d68 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -336,7 +336,7 @@ export class CloudWatchDatasource extends DataSourceApi { failures++; for (const frame of frames) { - const recordsMatched = frame.meta?.stats?.find(stat => stat.displayName === 'Records matched')?.value!; + const recordsMatched = frame.meta?.stats?.find(stat => stat.displayName === 'Records scanned')?.value!; if (recordsMatched > (prevRecordsMatched[frame.refId!] ?? 0)) { failures = 0; } diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts index 94c1991daec..b73a478a0c9 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts @@ -186,23 +186,23 @@ describe('CloudWatchDatasource', () => { it('should stop querying when no more data received a number of times in a row', async () => { const fakeFrames = genMockFrames(20); - const initialRecordsMatched = fakeFrames[0].meta!.stats!.find(stat => stat.displayName === 'Records matched')! + const initialRecordsMatched = fakeFrames[0].meta!.stats!.find(stat => stat.displayName === 'Records scanned')! .value!; for (let i = 1; i < 4; i++) { fakeFrames[i].meta!.stats = [ { - displayName: 'Records matched', + displayName: 'Records scanned', value: initialRecordsMatched, }, ]; } - const finalRecordsMatched = fakeFrames[9].meta!.stats!.find(stat => stat.displayName === 'Records matched')! + const finalRecordsMatched = fakeFrames[9].meta!.stats!.find(stat => stat.displayName === 'Records scanned')! .value!; for (let i = 10; i < fakeFrames.length; i++) { fakeFrames[i].meta!.stats = [ { - displayName: 'Records matched', + displayName: 'Records scanned', value: finalRecordsMatched, }, ]; @@ -1198,7 +1198,7 @@ function genMockFrames(numResponses: number): DataFrame[] { }, stats: [ { - displayName: 'Records matched', + displayName: 'Records scanned', value: (i + 1) * recordIncrement, }, ],