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 461156985B for ; Wed, 24 Feb 2021 19:31:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E5E2D2CED8 for ; Wed, 24 Feb 2021 19:31:26 +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 B976D2CEA9 for ; Wed, 24 Feb 2021 19:31:25 +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 80E4246321 for ; Wed, 24 Feb 2021 19:31:25 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 24 Feb 2021 19:30:59 +0100 Message-Id: <20210224183109.29014-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224183109.29014-1-s.ivanov@proxmox.com> References: <20210224183109.29014-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.061 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. [pbsconfig.pm, job.pm] Subject: [pmg-devel] [PATCH pmg-api 2/5] backup: fix #3154 add 'include-statistics' to pbs X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 18:31:57 -0000 This patch addresses part of #3154 - by adding the 'include-statistics' parameter for each remote in /etc/pmg/pbs/pbs.conf. The other part (actively asking the user whether to include it) is GUI only, since the API already has the paramter for backup calls. Signed-off-by: Stoiko Ivanov --- src/PMG/API2/PBS/Job.pm | 2 +- src/PMG/PBSConfig.pm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/PMG/API2/PBS/Job.pm b/src/PMG/API2/PBS/Job.pm index b218779..2387422 100644 --- a/src/PMG/API2/PBS/Job.pm +++ b/src/PMG/API2/PBS/Job.pm @@ -291,7 +291,7 @@ __PACKAGE__->register_method ({ die "PBS remote '$remote' does not exist\n" if !$remote_config; die "PBS remote '$remote' is disabled\n" if $remote_config->{disable}; - $param->{statistic} //= 1; + $param->{statistic} //= $remote_config->{'include-statistics'} // 1; my $pbs = PVE::PBSClient->new($remote_config, $remote, $conf->{secret_dir}); my $backup_dir = "/var/lib/pmg/backup/current"; diff --git a/src/PMG/PBSConfig.pm b/src/PMG/PBSConfig.pm index 2d80e78..29cff22 100644 --- a/src/PMG/PBSConfig.pm +++ b/src/PMG/PBSConfig.pm @@ -90,6 +90,11 @@ sub properties { description => "Username or API token ID on the Proxmox Backup Server" }), fingerprint => get_standard_option('fingerprint-sha256'), + 'include-statistics' => { + description => "Include statistics in scheduled backups", + type => 'boolean', + optional => 1, + }, %prune_properties, }; } @@ -102,6 +107,7 @@ sub options { username => { optional => 1 }, password => { optional => 1 }, fingerprint => { optional => 1 }, + 'include-statistics' => { optional => 1 }, 'keep-last' => { optional => 1 }, 'keep-hourly' => { optional => 1 }, 'keep-daily' => { optional => 1 }, -- 2.20.1