From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 165A6627DF for ; Mon, 21 Dec 2020 11:07:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 05F661DDCE for ; Mon, 21 Dec 2020 11:07:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D619A1DDC2 for ; Mon, 21 Dec 2020 11:07:55 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9BE60441C2 for ; Mon, 21 Dec 2020 11:07:55 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 21 Dec 2020 11:07:54 +0100 Message-Id: <20201221100754.2912-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 manager] pveceph: change status from long JSON to ceph -s X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2020 10:07:57 -0000 Printing a lot of very detailed JSON output on the CLI is not very useful. Printing the `ceph -s` overview is much more suited to give an overview of the ceph cluster status. Signed-off-by: Aaron Lauterer --- v1 -> v2: * added check if Ceph is iniated to avoid ugly error msg * removed eval (if the command fails, we want to see the error msg) * code style: avoiding long lines @thomas thx for the hint in the dev guidelines regarding long lines. somehow I missed that until now and took the surrounding (older) code as guideline :) PVE/CLI/pveceph.pm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm index 3d7bf2b1..de046dd0 100755 --- a/PVE/CLI/pveceph.pm +++ b/PVE/CLI/pveceph.pm @@ -175,6 +175,26 @@ __PACKAGE__->register_method ({ return undef; }}); +__PACKAGE__->register_method ({ + name => 'status', + path => 'status', + method => 'GET', + description => "Get Ceph Status.", + parameters => { + additionalProperties => 0, + }, + returns => { type => 'null' }, + code => sub { + PVE::Ceph::Tools::check_ceph_inited(); + + run_command( + ['ceph', '-s'], + outfunc => sub { print "$_[0]\n" }, + errfunc => sub { print STDERR "$_[0]\n" } + ); + return undef; + }}); + our $cmddef = { init => [ 'PVE::API2::Ceph', 'init', [], { node => $nodename } ], pool => { @@ -229,11 +249,7 @@ our $cmddef = { stop => [ 'PVE::API2::Ceph', 'stop', [], { node => $nodename }, $upid_exit], install => [ __PACKAGE__, 'install', [] ], purge => [ __PACKAGE__, 'purge', [] ], - status => [ 'PVE::API2::Ceph', 'status', [], { node => $nodename }, sub { - my $res = shift; - my $json = JSON->new->allow_nonref; - print $json->pretty->encode($res) . "\n"; - }], + status => [ __PACKAGE__, 'status', []], }; 1; -- 2.20.1