From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <p.hufnagl@proxmox.com> 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 6E1C1B00FB for <pbs-devel@lists.proxmox.com>; Tue, 28 Nov 2023 15:34:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F06718E3A for <pbs-devel@lists.proxmox.com>; Tue, 28 Nov 2023 15:34:21 +0100 (CET) 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 <pbs-devel@lists.proxmox.com>; Tue, 28 Nov 2023 15:34:17 +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 3DD844104A for <pbs-devel@lists.proxmox.com>; Tue, 28 Nov 2023 15:34:17 +0100 (CET) From: Philipp Hufnagl <p.hufnagl@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Tue, 28 Nov 2023 15:34:00 +0100 Message-Id: <20231128143403.443330-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.047 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup.rs, pull.rs, datastore.rs, jobs.rs] Subject: [pbs-devel] [PATCH proxmox-backup v4 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 <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 28 Nov 2023 14:34:51 -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". First, all include filter will be applied, then all exclude filter. If only include filter are set, every group starts included. Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com> --- Changes since v3: * including all when only exclude filter are present Changes since v2: * rebase to new master * change docu as suggested * make list for filter smaller Changes since v1: * rename behaviour in behavior * modify behavior, so that first all include filter will be executed, then all exlude one 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 | 13 ++ pbs-api-types/src/datastore.rs | 11 +- pbs-api-types/src/jobs.rs | 64 +++++++-- src/api2/pull.rs | 11 +- src/api2/tape/backup.rs | 17 ++- src/server/pull.rs | 23 +++- www/form/GroupFilter.js | 233 ++++++++++++++++++++++++--------- 7 files changed, 281 insertions(+), 91 deletions(-) -- 2.39.2