Merge branch '29302-improve-the-prometheus-queries-for-multiple-container-environments' into 'master'

Resolve "Fix the Prometheus queries for multiple container environments"

Closes #29302

See merge request !9949