Merge branch 'noc-fix-grafanads-annotations' into 'master'

Fix Grafanads Annotations

See merge request !6418

(cherry picked from commit ea74fd55)

7a875a47 Fix Grafanads Annotations