diff --git a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap index b61f851b6fd..776563cdf09 100644 --- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap +++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap @@ -10,7 +10,6 @@ Object { "fillOpacity": 50, "lineInterpolation": "stepAfter", "lineWidth": 5, - "pointSize": 6, "showPoints": "never", "spanNulls": true, }, @@ -93,7 +92,6 @@ Object { "gradientMode": "opacity", "lineInterpolation": "stepAfter", "lineWidth": 1, - "pointSize": 6, "showPoints": "never", "spanNulls": true, }, @@ -133,7 +131,6 @@ Object { "fillOpacity": 50, "lineInterpolation": "stepAfter", "lineWidth": 5, - "pointSize": 6, "showPoints": "never", "spanNulls": true, }, @@ -189,7 +186,6 @@ Object { "fill": "dash", }, "lineWidth": 1, - "pointSize": 6, "showPoints": "never", "spanNulls": true, }, diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts index 8959fc757c3..4870604c0a9 100644 --- a/public/app/plugins/panel/timeseries/migrations.ts +++ b/public/app/plugins/panel/timeseries/migrations.ts @@ -231,6 +231,10 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour if (angular.points) { graph.showPoints = PointVisibility.Always; + + if (isNumber(angular.pointradius)) { + graph.pointSize = 2 + angular.pointradius * 2; + } } else if (graph.drawStyle !== DrawStyle.Points) { graph.showPoints = PointVisibility.Never; } @@ -240,10 +244,6 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour graph.lineStyle = dash; } - if (isNumber(angular.pointradius)) { - graph.pointSize = 2 + angular.pointradius * 2; - } - if (hasFillBelowTo) { graph.fillOpacity = 35; // bands are hardcoded in flot } else if (isNumber(angular.fill)) {