Merge branch 'patch-6' into 'master'

Fix grafana_configuration.md move link

See merge request !6871

doc/monitoring/performance/grafana_configuration.md

-This document was moved to [administration/monitoring/performance/grafana_configuration](../administration/monitoring/performance/grafana_configuration.md).
+This document was moved to [administration/monitoring/performance/grafana_configuration](../../administration/monitoring/performance/grafana_configuration.md).