IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Exemplars: Disable exemplars only on query it failed (#37296)

Browse Source
This commit is contained in:
Zoltán Bedi 2021-07-28 16:34:46 +02:00 committed by GitHub
parent 99891e1a88
commit 9a62db6943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx
View File

@ -3,25 +3,27 @@ import { IconButton, InlineLabel, Tooltip, useStyles2 } from '@grafana/ui';
import { css, cx } from '@emotion/css';
import React, { useEffect, useState } from 'react';
import { PrometheusDatasource } from '../datasource';
import { filter } from 'rxjs/operators';
interface Props {
isEnabled: boolean;
onChange: (isEnabled: boolean) => void;
datasource: PrometheusDatasource;
refId: string;
}
export function PromExemplarField({ datasource, onChange, isEnabled }: Props) {
const [error, setError] = useState<string>();
export function PromExemplarField({ datasource, onChange, isEnabled, refId }: Props) {
const [error, setError] = useState<string | null>(null);
const styles = useStyles2(getStyles);
useEffect(() => {
const subscription = datasource.exemplarErrors.subscribe((err) => {
setError(err);
const subscription = datasource.exemplarErrors.pipe(filter((value) => refId === value.refId)).subscribe((err) => {
setError(err.error);
});
return () => {
subscription.unsubscribe();
};
}, [datasource]);
}, [datasource, refId]);
const iconButtonStyles = cx(
{

1
public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx
View File

@ -78,6 +78,7 @@ export const PromExploreExtraField: React.FC<PromExploreExtraFieldProps> = memo(
</div>
<PromExemplarField
refId={query.refId}
isEnabled={Boolean(query.exemplar)}
onChange={(isEnabled) => onChange({ ...query, exemplar: isEnabled })}
datasource={datasource}

7
public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
View File

@ -223,7 +223,12 @@ export class PromQueryEditor extends PureComponent<PromQueryEditorProps, State>
/>
</InlineFormLabel>
</div>
<PromExemplarField isEnabled={exemplar} onChange={this.onExemplarChange} datasource={datasource} />
<PromExemplarField
refId={query.refId}
isEnabled={exemplar}
onChange={this.onExemplarChange}
datasource={datasource}
/>
</div>
}
/>

1
public/app/plugins/datasource/prometheus/components/__snapshots__/PromQueryEditor.test.tsx.snap
View File

@ -203,6 +203,7 @@ exports[`Render PromQueryEditor with basic options should render 1`] = `
}
isEnabled={true}
onChange={[Function]}
refId="A"
/>
</div>
}

12
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -45,7 +45,7 @@ import PrometheusMetricFindQuery from './metric_find_query';
import { DEFAULT_STEP_MODE } from './components/PromQueryEditor';
export const ANNOTATION_QUERY_STEP_DEFAULT = '60s';
const EXEMPLARS_NOT_AVAILABLE = 'Exemplars for this data source are not available.';
const EXEMPLARS_NOT_AVAILABLE = 'Exemplars for this query are not available.';
const GET_AND_POST_METADATA_ENDPOINTS = ['api/v1/query', 'api/v1/query_range', 'api/v1/series', 'api/v1/labels'];
export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> {
@ -64,7 +64,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
exemplarTraceIdDestinations: ExemplarTraceIdDestination[] | undefined;
lookupsDisabled: boolean;
customQueryParameters: any;
exemplarErrors: Subject<string> = new Subject();
exemplarErrors: Subject<{ refId: string; error: string | null }> = new Subject();
constructor(
instanceSettings: DataSourceInstanceSettings<PromOptions>,
@ -267,12 +267,12 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
exemplarTarget.requestId += '_exemplar';
queries.push(this.createQuery(exemplarTarget, options, start, end));
activeTargets.push(exemplarTarget);
this.exemplarErrors.next();
this.exemplarErrors.next({ refId: exemplarTarget.refId, error: null });
}
target.exemplar = false;
}
if (target.exemplar && target.instant) {
this.exemplarErrors.next('Exemplars are not available for instant queries.');
this.exemplarErrors.next({ refId: target.refId, error: 'Exemplars are not available for instant queries.' });
}
queries.push(this.createQuery(target, options, start, end));
activeTargets.push(target);
@ -385,8 +385,8 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
if (query.exemplar) {
return this.getExemplars(query).pipe(
catchError((err: FetchError) => {
this.exemplarErrors.next(EXEMPLARS_NOT_AVAILABLE);
catchError(() => {
this.exemplarErrors.next({ refId: query.refId, error: EXEMPLARS_NOT_AVAILABLE });
return of({
data: [],
state: LoadingState.Done,