Merge pull request #8657 from klukonin/Prometheus_add_more_metrics