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

Loki: Improve log volume error handling (#42534)

Browse Source 
* Reduce verbosity of the error message when log volume query fails

* Fix unit tests
This commit is contained in:
Piotr Jamróz 2022-01-03 10:21:11 +01:00 committed by GitHub
parent 7682eabd29
commit 1695468de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/logs_model.ts
View File

@ -680,6 +680,8 @@ export function queryLogsVolume<T extends DataQuery>(
rawLogsVolume = rawLogsVolume.concat(dataQueryResponse.data.map(toDataFrame));
},
error: (error) => {
const errorMessage = error.data?.message || error.statusText || error.message;
console.error('Log volume query failed with error: ', errorMessage);
observer.next({
state: LoadingState.Error,
error: error,

5
public/app/features/explore/LogsVolumePanel.test.tsx
View File

@ -40,10 +40,11 @@ describe('LogsVolumePanel', () => {
expect(screen.getByText('ExploreGraph')).toBeInTheDocument();
});
it('shows error message', () => {
it('shows warning message without details', () => {
renderPanel({ state: LoadingState.Error, error: { data: { message: 'Test error message' } }, data: [] });
expect(screen.getByText('Failed to load log volume for this query')).toBeInTheDocument();
expect(screen.getByText('Test error message')).toBeInTheDocument();
expect(screen.getByText('Please check console logs for more details.')).toBeInTheDocument();
expect(screen.queryByText('Test error message')).not.toBeInTheDocument();
});
it('does not show the panel when there is no volume data', () => {

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

@ -27,8 +27,8 @@ export function LogsVolumePanel(props: Props) {
return null;
} else if (logsVolumeData?.error) {
return (
<Alert title="Failed to load log volume for this query">
{logsVolumeData.error.data?.message || logsVolumeData.error.statusText || logsVolumeData.error.message}
<Alert title="Failed to load log volume for this query" severity="warning">
Please check console logs for more details.
</Alert>
);
} else if (logsVolumeData?.state === LoadingState.Loading) {