[pve-devel] [PATCH manager v2 1/6] ui: fix special 'import' icon for non-esxi storages

2024-04-19 Thread Dominik Csapak
we only want to show that icon in the tree when the storage is solely used for importing, not when it's just one of several content types. Signed-off-by: Dominik Csapak Reviewed-by: Fiona Ebner --- www/manager6/Utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[pve-devel] [PATCH storage v2 02/10] plugin: dir: implement import content type

2024-04-19 Thread Dominik Csapak
in DirPlugin and not Plugin (because of cyclic dependency of Plugin -> OVF -> Storage -> Plugin otherwise) only ovf is currently supported (though ova will be shown in import listing), expects the files to not be in a subdir, and adjacent to the ovf file. Signed-off-by: Dominik Csapak ---

[pve-devel] [PATCH storage/qemu-server/manager v2] implement ova/ovf import for file based storages

2024-04-19 Thread Dominik Csapak
This series enables importing ova/ovf from directory based storages, inclusive upload/download via the webui (ova only). It also improves the ovf importer by parsing the ostype, nics, bootorder (and firmware from vmware exported files). I opted to move the OVF.pm to pve-storage, since there is

Re: [pve-devel] [PATCH manager 17/19] gitignore: ignore any test artifacts

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > Signed-off-by: Lukas Wagner > --- > .gitignore | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/.gitignore b/.gitignore > index e8d1eb27..48975d55 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -9,3 +9,5 @@ dest/ >

[pve-devel] [PATCH pve-docs v4 5/5] firewall: add documentation for proxmox-firewall

2024-04-19 Thread Stefan Hanreich
Add a section that explains how to use the new nftables-based proxmox-firewall. Signed-off-by: Stefan Hanreich --- pve-firewall.adoc | 181 ++ 1 file changed, 181 insertions(+) diff --git a/pve-firewall.adoc b/pve-firewall.adoc index a5e40f9..9fb4e46

[pve-devel] [PATCH pve-manager v4 4/5] firewall: expose configuration option for new nftables firewall

2024-04-19 Thread Stefan Hanreich
Signed-off-by: Stefan Hanreich --- www/manager6/grid/FirewallOptions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js index 0ac9979c4..6aacb47be 100644 --- a/www/manager6/grid/FirewallOptions.js +++

[pve-devel] [PATCH pve-firewall v4 3/5] add configuration option for new nftables firewall

2024-04-19 Thread Stefan Hanreich
Introduces new nftables configuration option that en/disables the new nftables firewall. pve-firewall reads this option and only generates iptables rules when nftables is set to `0` or if the proxmox-firewall package is not installed at all. Conversely, proxmox-firewall only generates rules when

[pve-devel] [PATCH container/docs/firewall/manager/qemu-server v4 0/5] proxmox firewall nftables

2024-04-19 Thread Stefan Hanreich
This patch series contains the remaining patches that are necessary for proxmox-firewall to work. It adds documentation as well as changes how firewall-bridges are created when proxmox-firewall is activated. It also patches pve-firewall to not generate rules when proxmox-firewall is active.

[pve-devel] [PATCH qemu-server v4 1/5] firewall: add handling for new nft firewall

2024-04-19 Thread Stefan Hanreich
When the nftables firewall is enabled, we do not need to create firewall bridges. Signed-off-by: Stefan Hanreich --- vm-network-scripts/pve-bridge | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vm-network-scripts/pve-bridge b/vm-network-scripts/pve-bridge index

[pve-devel] [PATCH pve-container v4 2/5] firewall: add handling for new nft firewall

2024-04-19 Thread Stefan Hanreich
When the nftables firewall is enabled, we do not need to create firewall bridges. Signed-off-by: Stefan Hanreich --- src/PVE/LXC.pm | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 400cf4f..44f5ccf 100644 --- a/src/PVE/LXC.pm +++

Re: [pve-devel] [PATCH proxmox 01/19] notify: switch to file-based templating system

2024-04-19 Thread Lukas Wagner
On 2024-04-19 10:57, Fiona Ebner wrote: > Am 19.04.24 um 10:45 schrieb Lukas Wagner: >>> Who adds the template files? I don't see a patch for proxmox-ve in this >>> series. Does this series require some versioned breaks to some package? >> >> The pve-manager and pve-ha-manager (for fencing

Re: [pve-devel] [PATCH cluster 15/19] notify: use named template instead of passing template strings

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > The notification system will now load template files from a defined > location. The template to use is now passed to proxmox_notify, instead > of separate template strings for subject/body. > > Signed-off-by: Lukas Wagner > Tested-by: Folke Gleumes >

[pve-devel] [RFC PATCH docs 12/13] installation: use new 'installation-flow' partial from common docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- pve-installation.adoc | 172 +- 1 file changed, 1 insertion(+), 171 deletions(-) diff --git a/pve-installation.adoc b/pve-installation.adoc index f492ad0..2f4642e 100644 --- a/pve-installation.adoc +++

[pve-devel] [RFC PATCH docs 13/13] installation: use new 'advanced-installation' partial from common docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- pve-installation.adoc | 126 +- 1 file changed, 1 insertion(+), 125 deletions(-) diff --git a/pve-installation.adoc b/pve-installation.adoc index 2f4642e..0a0dc76 100644 --- a/pve-installation.adoc +++

[pve-devel] [RFC PATCH docs 07/13] gitmodules: add proxmox-docs-common

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- .gitmodules | 3 +++ proxmox-docs-common | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 16 proxmox-docs-common diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000..eff8adf --- /dev/null

[pve-devel] [RFC PATCH docs-common 06/13] partials: advanced-installation: adapt from pve-docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- partials/advanced-installation.adoc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/partials/advanced-installation.adoc b/partials/advanced-installation.adoc index ed2709f..271533b 100644 ---

[pve-devel] [RFC PATCH docs 10/13] asciidoc: conf: add iso-url variable

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- asciidoc/asciidoc-pve.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/asciidoc/asciidoc-pve.conf b/asciidoc/asciidoc-pve.conf index 47139b8..faa190a 100644 --- a/asciidoc/asciidoc-pve.conf +++ b/asciidoc/asciidoc-pve.conf @@ -6,6 +6,7 @@ pve=Proxmox VE

[pve-devel] [RFC PATCH docs-common 04/13] partials: installation-flow: adapt from pve-docs

2024-04-19 Thread Christoph Heiss
A trivial s/{pve}/{product}/g again and a additional s/screenshot\/pve-/screenshot\//g to fix the screenshot paths. Signed-off-by: Christoph Heiss --- partials/installation-flow.adoc | 47 + 1 file changed, 24 insertions(+), 23 deletions(-) diff --git

[pve-devel] [RFC PATCH docs 11/13] installation-media: move to common docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- pve-installation-media.adoc | 132 pve-installation.adoc | 2 +- 2 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 pve-installation-media.adoc diff --git a/pve-installation-media.adoc

[pve-devel] [RFC PATCH docs 09/13] images: strip `pve-` prefix from screenshots used in common docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- .../{pve-grub-menu.png => grub-menu.png} | Bin .../{pve-grub-menu.ppm => grub-menu.ppm} | Bin ...ve-install-summary.png => install-summary.png} | Bin ...ve-install-summary.ppm => install-summary.ppm} | Bin .../{pve-installation.png =>

[pve-devel] [RFC PATCH docs-common 05/13] partials: add advanced installation hints from pve-docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- partials/advanced-installation.adoc | 125 1 file changed, 125 insertions(+) create mode 100644 partials/advanced-installation.adoc diff --git a/partials/advanced-installation.adoc b/partials/advanced-installation.adoc new file

[pve-devel] [RFC PATCH docs 08/13] scan-adoc-refs: enable building pages from proxmox-docs-common/ subdir

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- Makefile | 6 -- asciidoc/asciidoc-pve.conf | 2 ++ pve-doc-generator.mk.in| 6 ++ scan-adoc-refs | 25 - 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile

[pve-devel] [RFC PATCH docs-common 03/13] partials: add installation flow from pve-docs

2024-04-19 Thread Christoph Heiss
Signed-off-by: Christoph Heiss --- partials/installation-flow.adoc | 170 1 file changed, 170 insertions(+) create mode 100644 partials/installation-flow.adoc diff --git a/partials/installation-flow.adoc b/partials/installation-flow.adoc new file mode 100644

[pve-devel] [RFC PATCH docs{, -common} 0/13] introduce common documentation base

2024-04-19 Thread Christoph Heiss
tl;dr: Introduce a separate repository for shared documentation between all three products. This proposes the introduction of a - aptly named - proxmox-docs-common repo, which can be used for all documentation not specific to a single product. Marked RFC to gather feedback from other people.

[pve-devel] [RFC PATCH docs-common 01/13] installation-media: move page from pve-docs here

2024-04-19 Thread Christoph Heiss
Small adaptions were necessary; mostly a s/{pve}/{product}/g and replacing the ISO URL with the {iso-url} variable. Signed-off-by: Christoph Heiss --- installation-media.adoc | 132 1 file changed, 132 insertions(+) create mode 100644

[pve-devel] [RFC PATCH docs-common 02/13] installation-media: adapt for common usage

2024-04-19 Thread Christoph Heiss
Small adaptions were necessary; mostly a trivial s/{pve}/{product}/g and replacing the ISO URL with the {iso-url} variable. Signed-off-by: Christoph Heiss --- installation-media.adoc | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git

Re: [pve-devel] [PATCH proxmox 01/19] notify: switch to file-based templating system

2024-04-19 Thread Fiona Ebner
Am 19.04.24 um 10:45 schrieb Lukas Wagner: >> Who adds the template files? I don't see a patch for proxmox-ve in this >> series. Does this series require some versioned breaks to some package? > > The pve-manager and pve-ha-manager (for fencing notifications) patches add > the templates. > I

Re: [pve-devel] [PATCH manager 7/7] report: add recent boot timestamps which may show fencing/crash events

2024-04-19 Thread Mira Limbeck
On 4/18/24 17:45, Alexander Zeidler wrote: > On Thu, 2024-04-18 at 12:43 +0200, Mira Limbeck wrote: >> On 4/18/24 11:16, Alexander Zeidler wrote: >>> Successful boots which crashed somehow and sometime afterwards, will >>> show the same "until" value ("still running" or timestamp) as the next >>>

Re: [pve-devel] [PATCH proxmox 01/19] notify: switch to file-based templating system

2024-04-19 Thread Lukas Wagner
On 2024-04-19 10:14, Fiona Ebner wrote: > Am 09.04.24 um 15:25 schrieb Lukas Wagner: >> Instead of passing the template strings for subject and body when >> constructing a notification, we pass only the name of a template. >> When rendering the template, the name of the template is used to

Re: [pve-devel] [PATCH proxmox 09/19] notify: derive Deserialize/Serialize for Notification struct

2024-04-19 Thread Fiona Ebner
Nit: I always like a quick sentence for who needs it for such changes. Am 09.04.24 um 15:25 schrieb Lukas Wagner: > Signed-off-by: Lukas Wagner > --- > proxmox-notify/src/lib.rs | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/proxmox-notify/src/lib.rs

Re: [pve-devel] [PATCH proxmox 07/19] notify: api: add get_targets

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > +#[api] > +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd)] > +#[serde(rename_all = "kebab-case")] > +/// Target information > +pub struct Target { > +/// Name of the endpoint > +name: String, > +/// Origin of the

Re: [pve-devel] [PATCH proxmox 07/19] notify: api: add get_targets

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > +/// Get a list of all notification targets. > +pub fn get_targets(config: ) -> Result, HttpError> { > +let mut targets = Vec::new(); > + > +#[cfg(feature = "gotify")] > +for endpoint in gotify::get_endpoints(config)? { > +

Re: [pve-devel] [PATCH proxmox 05/19] notify: make the `mail-forwarder` feature depend on proxmox-sys

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > It uses proxmox_sys::nodename - the dep is needed, otherwise the code > does not compile in some feature flag permutations. > > Signed-off-by: Lukas Wagner > Tested-by: Folke Gleumes > --- > proxmox-notify/Cargo.toml | 6 +++--- > 1 file changed, 3

Re: [pve-devel] [PATCH proxmox 01/19] notify: switch to file-based templating system

2024-04-19 Thread Fiona Ebner
Am 09.04.24 um 15:25 schrieb Lukas Wagner: > Instead of passing the template strings for subject and body when > constructing a notification, we pass only the name of a template. > When rendering the template, the name of the template is used to find > corresponding template files. For PVE, they

[pve-devel] [PATCH proxmox-firewall v3 34/39] firewall: add integration test

2024-04-19 Thread Stefan Hanreich
Signed-off-by: Stefan Hanreich --- .gitignore|1 + debian/control|1 + proxmox-firewall/Cargo.toml |4 + proxmox-firewall/tests/input/100.conf | 10 + proxmox-firewall/tests/input/100.fw

[pve-devel] [PATCH pve-firewall v3 37/39] add configuration option for new nftables firewall

2024-04-19 Thread Stefan Hanreich
Introduces new nftables configuration option that en/disables the new nftables firewall. pve-firewall reads this option and only generates iptables rules when nftables is set to `0`. Conversely proxmox-firewall only generates nftables rules when the option is set to `1`. Signed-off-by: Stefan

[pve-devel] [PATCH proxmox-firewall v3 19/39] nftables: expression: add types

2024-04-19 Thread Stefan Hanreich
Adds an enum containing most of the expressions defined in the nftables-json schema [1]. [1] https://manpages.debian.org/bookworm/libnftables1/libnftables-json.5.en.html#EXPRESSIONS Reviewed-by: Lukas Wagner Reviewed-by: Max Carrara Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan

[pve-devel] [PATCH proxmox-firewall v3 31/39] firewall: add ruleset generation logic

2024-04-19 Thread Stefan Hanreich
We create the rules from the firewall config by utilizing the ToNftRules and ToNftObjects traits to convert the firewall config structs to nftables objects/chains/rules. Reviewed-by: Lukas Wagner Reviewed-by: Max Carrara Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich ---

[pve-devel] [PATCH proxmox-firewall v3 22/39] nftables: statement: add conversion traits for config types

2024-04-19 Thread Stefan Hanreich
Some types from the firewall configuration map directly onto nftables statements. For those we implement conversion traits so we can conveniently convert between the configuration types and the respective nftables types. As with the expressions, those are guarded behind a feature so the nftables

[pve-devel] [PATCH proxmox-firewall v3 25/39] nftables: add nft client

2024-04-19 Thread Stefan Hanreich
Add a thin wrapper around nft, which can be used to run commands defined by the rust types. Reviewed-by: Lukas Wagner Reviewed-by: Max Carrara Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich --- proxmox-nftables/src/client.rs | 85 ++

[pve-devel] [PATCH proxmox-firewall v3 28/39] firewall: add config loader

2024-04-19 Thread Stefan Hanreich
We load the firewall configuration from the default paths, as well as only the guest configurations that are local to the node itself. In the future we could change this to use pmxcfs directly instead. We also load information from nftables directly about dynamically created chains (mostly chains

[pve-devel] [PATCH proxmox-firewall v3 16/39] config: firewall: add conntrack helper types

2024-04-19 Thread Stefan Hanreich
Reviewed-by: Lukas Wagner Reviewed-by: Max Carrara Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich --- proxmox-ve-config/resources/ct_helper.json | 52 + proxmox-ve-config/src/firewall/ct_helper.rs | 115 proxmox-ve-config/src/firewall/mod.rs

[pve-devel] applied-series: [PATCH cluster/manager/storage/docs 0/9] fix #4886: improve SSH handling

2024-04-19 Thread Thomas Lamprecht
Am 11/01/2024 um 11:51 schrieb Fabian Grünbichler: > this series replaces the old mechanism that used a cluster-wide merged known > hosts file with distributing of each node's host key via pmxcfs, and pinning > the distributed key explicitly for internal SSH connections. > > the main changes in

[pve-devel] applied: [PATCH qemu-server] clone disk: prevent 'uninitialized value' warning for unused check

2024-04-19 Thread Fabian Grünbichler
On April 19, 2024 8:51 am, Dominik Csapak wrote: > since commit > 1f743141 (fix #1905: Allow moving unused disks) > > we want to check the source drive name for 'unused', but in case of > importing a volume from the 'import' content type (e.g. from esxi), > there is no source drive name. So we

[pve-devel] [PATCH qemu-server] clone disk: prevent 'uninitialized value' warning for unused check

2024-04-19 Thread Dominik Csapak
since commit 1f743141 (fix #1905: Allow moving unused disks) we want to check the source drive name for 'unused', but in case of importing a volume from the 'import' content type (e.g. from esxi), there is no source drive name. So we have to first check if it's defined. Signed-off-by: Dominik

<    1   2