From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:26:10 +0000 (-0500)
Subject: Merge pull request #49189 from pcuzner/improve-orch-host-ls
X-Git-Tag: v18.1.0~492
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60339fde1ab689542fd71e3c6712d38e77e59d8b;p=ceph.git

Merge pull request #49189 from pcuzner/improve-orch-host-ls

orchestrator: improvements to the orch host ls command

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
---

60339fde1ab689542fd71e3c6712d38e77e59d8b
diff --cc doc/cephadm/host-management.rst
index b6cba8a7547,bd1b9192f99..18dbfb800f9
--- a/doc/cephadm/host-management.rst
+++ b/doc/cephadm/host-management.rst
@@@ -11,20 -11,29 +11,30 @@@ Run a command of this form to list host
  
  .. prompt:: bash #
  
-    ceph orch host ls [--format yaml] [--host-pattern <name>] [--label <label>] [--host-status <status>]
+    ceph orch host ls [--format yaml] [--host-pattern <name>] [--label <label>] [--host-status <status>] [--detail]
  
- In commands of this form, the arguments "host-pattern", "label" and
+ In commands of this form, the arguments "host-pattern", "label", and
  "host-status" are optional and are used for filtering. 
  
 -- "host-pattern" is a regex that will match against hostnames and will only
 -  return matching hosts.
 +- "host-pattern" is a regex that matches against hostnames and returns only
 +  matching hosts.
  - "label" returns only hosts with the specified label.
  - "host-status" returns only hosts with the specified status (currently
    "offline" or "maintenance").
 -- Any combination of these filtering flags is valid. You may filter against
 -  name, label and/or status simultaneously.
 +- Any combination of these filtering flags is valid. It is possible to filter
 +  against name, label and status simultaneously, or to filter against any
 +  proper subset of name, label and status.
  
+ The "detail" parameter provides more host related information for cephadm based
+ clusters. For example:
+ 
+ .. prompt:: bash #
+ 
+    # ceph orch host ls --detail 
+    HOSTNAME     ADDRESS         LABELS  STATUS  VENDOR/MODEL                           CPU    HDD      SSD  NIC  
+    ceph-master  192.168.122.73  _admin          QEMU (Standard PC (Q35 + ICH9, 2009))  4C/4T  4/1.6TB  -    1    
+    1 hosts in cluster
+ 
  .. _cephadm-adding-hosts:    
      
  Adding Hosts