Merge PR #40746 into pacific

* refs/pull/40746/head:
	doc/cephadm: fix a typo
	mgr/cephadm: rewrite/simplify describe_service
	mgr/orchestrator: report osds as osd.unmanaged as appropriate
	mgr/orchestrator: remove IMAGE ID from 'orch ls'
	cephadm: normalize unqualified repo digests to docker.io
	mgr/cephadm/upgrade: normalize unqualified target image
	cephadm:persist the grafana.db file
	qa/tasks/cephadm: add apply() method/task
	cephadm: pass '-i' to docker|podman run for shell|enter

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>

diff --cc src/cephadm/cephadm
Simple merge