From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 2/5] backup: fix #3154 add 'include-statistics' to pbs
Date: Wed, 24 Feb 2021 19:30:59 +0100 [thread overview]
Message-ID: <20210224183109.29014-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210224183109.29014-1-s.ivanov@proxmox.com>
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 <s.ivanov@proxmox.com>
---
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
next prev parent reply other threads:[~2021-02-24 18:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 18:30 [pmg-devel] [PATCH pmg-api/gui/docs] small improvments for PBS integration Stoiko Ivanov
2021-02-24 18:30 ` [pmg-devel] [PATCH pmg-api 1/5] backup: fix die invocation Stoiko Ivanov
2021-02-25 9:40 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:30 ` Stoiko Ivanov [this message]
2021-02-25 9:40 ` [pmg-devel] applied: [PATCH pmg-api 2/5] backup: fix #3154 add 'include-statistics' to pbs Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-api 3/5] backup: fix #3146 add email notifications Stoiko Ivanov
2021-02-25 10:04 ` Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-api 4/5] backup: add notify parameter to 'classic' backup Stoiko Ivanov
2021-02-25 10:06 ` Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-api 5/5] backup: pbs: prevent race in concurrent backups Stoiko Ivanov
2021-02-25 10:14 ` Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 1/4] backup: pbs: add onlineHelp anchors Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 2/4] backup: fix #3154: make statistic backup optional Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 3/4] backup: pbs: fix #3154: add statistic setting to remote Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 4/4] backup: pbs: fix #3146 add notify " Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 1/3] backup: fix typos Stoiko Ivanov
2021-02-25 10:15 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 2/3] backup: add anchors to pbs sections Stoiko Ivanov
2021-02-25 10:15 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 3/3] backup: shortly document #3146 and #3154 Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210224183109.29014-3-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox