From 7341131af5c33b1d11378ebb5baa05071caf2eb5 Mon Sep 17 00:00:00 2001 From: Jamie Klassen Date: Wed, 14 Dec 2022 17:49:56 -0500 Subject: [PATCH] warning is a full sentence mentioning cluster name This seems like a more helpful log message for operators, especially those with many clusters. Signed-off-by: Jamie Klassen --- .../src/service/KubernetesFetcher.test.ts | 2 +- .../src/service/KubernetesFetcher.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts index 2311dacdc3..065416f8c1 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts @@ -388,7 +388,7 @@ describe('KubernetesFetcher', () => { ], }); expect(warn).toHaveBeenCalledWith( - 'statusCode=401 for resource /api/v1/services body=[{"kind":"Status","apiVersion":"v1","code":401}]', + 'Received 401 status when fetching "/api/v1/services" from cluster "cluster1"; body=[{"kind":"Status","apiVersion":"v1","code":401}]', ); }); // they're in testErrorResponse diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts index b700c74e4c..6ef4397e9c 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts @@ -109,7 +109,7 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher { resources: items, }), ) - : this.handleUnsuccessfulResponse(r), + : this.handleUnsuccessfulResponse(params.clusterDetails.name, r), ), ); @@ -147,22 +147,23 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher { }), ); } else if (podMetrics.ok) { - return this.handleUnsuccessfulResponse(podList); + return this.handleUnsuccessfulResponse(clusterDetails.name, podList); } - return this.handleUnsuccessfulResponse(podMetrics); + return this.handleUnsuccessfulResponse(clusterDetails.name, podMetrics); }); return Promise.all(fetchResults).then(fetchResultsToResponseWrapper); } private async handleUnsuccessfulResponse( + clusterName: string, res: Response, ): Promise { const resourcePath = new URL(res.url).pathname; this.logger.warn( - `statusCode=${ + `Received ${ res.status - } for resource ${resourcePath} body=[${await res.text()}]`, + } status when fetching "${resourcePath}" from cluster "${clusterName}"; body=[${await res.text()}]`, ); return { errorType: statusCodeToErrorType(res.status),