Merge pull request ceph#62233 from kamoltat/wip-ksirivad-ceph-s-leader-mon

mon: Add leader indicator && stretch mode to ceph -s output

Author: SrinivasaBharath

PendingReleaseNotes

@@ -1,5 +1,7 @@
 >=20.0.0
 
+* RADOS: leader monitor and stretch mode status are now included in the `ceph status` output.
+  Related Tracker: https://tracker.ceph.com/issues/70406
 * RGW: The User Account feature introduced in Squid provides first-class support for
   IAM APIs and policy. Our preliminary STS support was instead based on tenants, and
   exposed some IAM APIs to admins only. This tenant-level IAM functionality is now

src/mon/Monitor.cc

@@ -3106,7 +3106,9 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f,
   } else {
     ss << "  cluster:\n";
     ss << "    id:     " << monmap->get_fsid() << "\n";
-
+    if (is_stretch_mode()){
+      ss << "    stretch_mode: ENABLED\n";
+    }
     string health;
     healthmon()->get_health_status(false, nullptr, &health,
 				   "\n            ", "\n            ");
@@ -3139,7 +3141,8 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f,
       const auto mon_count = monmap->mon_info.size();
       auto mnow = ceph::mono_clock::now();
       ss << "    mon: " << spacing << mon_count << " daemons, quorum "
-	 << quorum_names << " (age " << timespan_str(mnow - quorum_since) << ")";
+	 << quorum_names << " (age " << timespan_str(mnow - quorum_since) << ")"
+   << " [leader: " << get_leader_name() << "]";
       if (quorum_names.size() != mon_count) {
 	std::list<std::string> out_of_q;
 	for (size_t i = 0; i < monmap->ranks.size(); ++i) {