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

Fix Grafanads Annotations

See merge request !6418

(cherry picked from commit ea74fd55)

7a875a47 Fix Grafanads Annotations
6 jobs for !6419 with cherry-pick-ea74fd55 in 26 minutes and 15 seconds (queued for 7 seconds)
latest merge request