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

Explore: Configure explore series colours via field config (#20239)

Browse Source
This commit is contained in:
Dominik Prokop
2019-11-07 14:58:50 +01:00
committed by GitHub
parent e4afc8d518
commit 225ecd680a
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/plugins/panel/graph2/getGraphSeriesModel.ts
View File

@@ -74,10 +74,16 @@ export const getGraphSeriesModel = (
});
}
const seriesColor =
seriesOptions[field.name] && seriesOptions[field.name].color
? getColorFromHexRgbOrName(seriesOptions[field.name].color)
: colors[graphs.length % colors.length];
let seriesColor;
if (seriesOptions[field.name] && seriesOptions[field.name].color) {
// Case when panel has settings provided via SeriesOptions, i.e. graph panel
seriesColor = getColorFromHexRgbOrName(seriesOptions[field.name].color);
} else if (field.config && field.config.color) {
// Case when color settings are set on field, i.e. Explore logs histogram (see makeSeriesForLogs)
seriesColor = field.config.color;
} else {
seriesColor = colors[graphs.length % colors.length];
}
field.config = fieldOptions
? {
@@ -86,7 +92,7 @@ export const getGraphSeriesModel = (
decimals: fieldOptions.defaults.decimals,
color: seriesColor,
}
: { ...field.config };
: { ...field.config, color: seriesColor };
field.display = getDisplayProcessor({ config: { ...field.config }, type: field.type });