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

Merge in default threshold base if exists

Browse Source
This commit is contained in:
Kristina Durivage 2024-11-20 10:32:33 -06:00
parent 33bf94f4d2
commit 8503c86275
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/grafana-data/src/field/fieldOverrides.ts
View File

@ -2,7 +2,7 @@ import { isNumber, set, unset, get, cloneDeep } from 'lodash';
import { useMemo, useRef } from 'react'; import { useMemo, useRef } from 'react';
import usePrevious from 'react-use/lib/usePrevious'; import usePrevious from 'react-use/lib/usePrevious';
import { VariableFormatID } from '@grafana/schema'; import { ThresholdsMode, VariableFormatID } from '@grafana/schema';
import { compareArrayValues, compareDataFrameStructures } from '../dataframe/frameComparisons'; import { compareArrayValues, compareDataFrameStructures } from '../dataframe/frameComparisons';
import { guessFieldTypeForField } from '../dataframe/processDataFrame'; import { guessFieldTypeForField } from '../dataframe/processDataFrame';
@ -347,6 +347,18 @@ export function setFieldConfigDefaults(config: FieldConfig, defaults: FieldConfi
// Combine the data source links and the panel default config links // Combine the data source links and the panel default config links
config.links = [...config.links, ...defaults.links]; config.links = [...config.links, ...defaults.links];
} }
// if we have a base threshold set by default but not on the config, we need to merge it in
const defaultBaseStep =
defaults.thresholds?.mode === ThresholdsMode.Absolute &&
defaults.thresholds?.steps.find((step) => step.value === -Infinity);
if (
config.thresholds?.mode === ThresholdsMode.Absolute &&
!config.thresholds.steps.some((step) => step.value === -Infinity) &&
defaultBaseStep
) {
config.thresholds.steps = [defaultBaseStep, ...config.thresholds.steps];
}
for (const fieldConfigProperty of context.fieldConfigRegistry.list()) { for (const fieldConfigProperty of context.fieldConfigRegistry.list()) {
if (fieldConfigProperty.isCustom && !config.custom) { if (fieldConfigProperty.isCustom && !config.custom) {
config.custom = {}; config.custom = {};

2
public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
View File

@ -169,7 +169,7 @@ export const configMapHandlers: FieldToConfigMapHandler[] = [
if (!config.thresholds) { if (!config.thresholds) {
config.thresholds = { config.thresholds = {
mode: ThresholdsMode.Absolute, mode: ThresholdsMode.Absolute,
steps: [{ value: -Infinity, color: 'green' }], steps: [],
}; };
} }