[Backport 2.x] Fix metrics single data-point visability

[Backport 2.x] Fix metrics single data-point visability #1778