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 D80259C304 for ; Mon, 23 Oct 2023 17:43:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B95E816517 for ; Mon, 23 Oct 2023 17:43:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Mon, 23 Oct 2023 17:43:08 +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 10325445C1 for ; Mon, 23 Oct 2023 17:43:08 +0200 (CEST) From: Philipp Hufnagl To: pbs-devel@lists.proxmox.com Date: Mon, 23 Oct 2023 17:42:59 +0200 Message-Id: <20231023154302.2558918-1-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.074 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 0/3] fix #4315: datastore: Exclude entries from sync 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: Mon, 23 Oct 2023 15:43:38 -0000 This allows to use Group Filter for sync jobs so matches can not just be included but also excluded. For this the "group-filter" configuration syntax has been extended with an optional "behaviour" parameter. this can be "include" or "exclude". Filter will be applied in the order of the config file. For example config entries could look like this: Will continue include the match for compatiblity. group-filter regex:.* Will exclude the match from the sync job. group-filter exclude:regex:.*10[1-3].* Will include the match to the sync job. group-filter include:regex:.*10[2-3].* So after this 3 lines, 100, 202 and 103 would be included but 101 would be excluded. Since obmitting the behaviour parameter will continue to include the match, this parameter is not intendet to be set to "include" by the GUI or other tooling. Its just there to make manual configuration edits more forgiving. Signed-off-by: Philipp Hufnagl --- Philipp Hufnagl (3): fix #4315: jobs: modify GroupFilter so include/exclude is tracked ui: Show if Filter includes or excludes docs: document new include/exclude paramenter docs/managing-remotes.rst | 7 +++++ pbs-api-types/src/datastore.rs | 11 +++---- pbs-api-types/src/jobs.rs | 49 +++++++++++++++++++++-------- src/api2/tape/backup.rs | 8 ++++- src/server/pull.rs | 8 ++++- www/form/GroupFilter.js | 57 +++++++++++++++++++++++++++++++--- 6 files changed, 115 insertions(+), 25 deletions(-) -- 2.39.2