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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F0AFE64331 for ; Tue, 6 Oct 2020 12:26:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA7ED2474E for ; Tue, 6 Oct 2020 12:25:30 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4502F24730 for ; Tue, 6 Oct 2020 12:25:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0BDD045B98 for ; Tue, 6 Oct 2020 12:25:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 6 Oct 2020 12:25:24 +0200 Message-Id: <20201006102528.15383-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201006102528.15383-1-d.csapak@proxmox.com> References: <20201006102528.15383-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.513 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/6] api2/status: add type- and statusfilter to tasks api call X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Oct 2020 10:26:01 -0000 we will use this for the pbs dashboard Signed-off-by: Dominik Csapak --- src/api2/status.rs | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/api2/status.rs b/src/api2/status.rs index fd40f14d..372b4822 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -17,6 +17,7 @@ use crate::api2::types::{ RRDMode, RRDTimeFrameResolution, TaskListItem, + TaskStateType, Userid, }; @@ -186,6 +187,19 @@ fn datastore_status( description: "Only list tasks since this UNIX epoch.", optional: true, }, + typefilter: { + optional: true, + type: String, + description: "Only list tasks, whose type contains this string.", + }, + statusfilter: { + optional: true, + type: Array, + description: "Only list tasks which have any one of the listed status.", + items: { + type: TaskStateType, + }, + }, }, }, returns: { @@ -201,6 +215,8 @@ fn datastore_status( /// List tasks. pub fn list_tasks( since: Option, + typefilter: Option, + statusfilter: Option>, _param: Value, rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { @@ -223,6 +239,27 @@ pub fn list_tasks( match info { Ok(info) => { if list_all || info.upid.userid == userid { + if let Some(filter) = &typefilter { + if !info.upid.worker_type.contains(filter) { + return None; + } + } + + if let Some(filters) = &statusfilter { + if let Some(state) = &info.state { + let statetype = match state { + server::TaskState::OK { .. } => TaskStateType::OK, + server::TaskState::Unknown { .. } => TaskStateType::Unknown, + server::TaskState::Error { .. } => TaskStateType::Error, + server::TaskState::Warning { .. } => TaskStateType::Warning, + }; + + if !filters.contains(&statetype) { + return None; + } + } + } + Some(Ok(TaskListItem::from(info))) } else { None -- 2.20.1