Re: [pmg-devel] [PATCH pmg-api v3 3/3] fix #4023: templates: add plain-text variant of admin report

[Stoiko Ivanov <s.ivanov@proxmox.com>]

Thanks for the iteration and the improvments!

tested this - small nit:

between the 'sections' I get an uneven amount of newlines (depending on
whether there's a FOREACH-loop only or n IF in addition).

It would be nice to remove the superfluous amount - see:
https://template-toolkit.org/docs/manual/Syntax.html#section_Chomping_Whitespace

On Fri, 19 Sep 2025 10:36:22 +0200
Hannes Laimer <h.laimer@proxmox.com> wrote:

> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> v3:
> - add `subkect:` lien back in
> 
>  src/Makefile                     |  1 +
>  src/templates/pmgreport.plain.tt | 51 ++++++++++++++++++++++++++++++++
>  2 files changed, 52 insertions(+)
>  create mode 100644 src/templates/pmgreport.plain.tt
> 
> diff --git a/src/Makefile b/src/Makefile
> index 54825e2..a554a63 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -26,6 +26,7 @@ CONF_MANS= pmg.conf.5 cluster.conf.5
>  TEMPLATES =				\
>  	fetchmailrc.tt			\
>  	pmgreport.tt			\
> +	pmgreport.plain.tt		\
>  	spamreport-verbose.tt		\
>  	spamreport-verbose.plain.tt	\
>  	spamreport-short.tt		\
> diff --git a/src/templates/pmgreport.plain.tt b/src/templates/pmgreport.plain.tt
> new file mode 100644
> index 0000000..a46d20e
> --- /dev/null
> +++ b/src/templates/pmgreport.plain.tt
> @@ -0,0 +1,51 @@
> +subject: Proxmox Status Report - [% date %] ([% fqdn %])
> +[% IF cluster -%]
> +Cluster Status
> +[% FOREACH item IN cluster -%]
> +- Hostname: [% item.hostname %]
> +  IP Address: [% item.ip %]
> +  Role: [% item.type %]
> +  State: [% item.state %]
> +  Load: [% item.loadavg1 %]
> +  Memory: [% item.memory %]
> +  Disk: [% item.disk %]
> +[% IF !loop.last %]----
> +[% END %]
> +[% END %]
> +[% END %]
> +[% IF system -%]
> +System Status
> +[% FOREACH item IN system -%]
> +- [% item.text %]: [% item.value %]
> +[% END %]
> +[% END %]
> +[% IF incoming -%]
> +Incoming Mails (24 hours)
> +[% FOREACH item IN incoming -%]
> +- [% item.text %][% IF item.percentage.defined %] ([% item.percentage %]%)[% END %]: [% item.value %]
> +[% END %]
> +[% END %]
> +[% IF outgoing -%]
> +Outgoing Mails (24 hours)
> +[% FOREACH item IN outgoing -%]
> +- [% item.text %][% IF item.percentage.defined %] ([% item.percentage %]%)[% END %]: [% item.value %]
> +[% END %]
> +[% END %]
> +[% IF virusstat -%]
> +Virus Charts (Top 10)
> +[% FOREACH item IN virusstat -%]
> +- [% item.name %]: [% item.count %]
> +[% END %]
> +[% END %]
> +[% IF virusquar -%]
> +Virus Quarantine
> +[% FOREACH item IN virusquar -%]
> +- [% item.text %]: [% item.value %]
> +[% END %]
> +[% END %]
> +[% IF spamquar -%]
> +Spam Quarantine
> +[% FOREACH item IN spamquar -%]
> +- [% item.text %]: [% item.value %]
> +[% END %]
> +[% END %]



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel