[pve-devel] applied: [PATCH manager v7 06/19] vzdump: apt: notification: do not include domain in 'hostname' field

[Fabian Grünbichler]

independent as well..

Quoting Lukas Wagner (2024-06-10 10:40:25)
>  - The man page warns about the usage of `hostname -f`, since a host
>    may have multiple domains (or none at all)
>  - The fallback PVE::INotify::nodename() already only returned the
>    hostname without the domain part
>  - Fencing notifications didn't include the domain part anyway
> 
> This may result in soft-breakage for any users who have already relied
> on the domain being present. If there is need for it, it could include
> a fqdn metadata field.
> 
> The hostname property used for rendering the notification template
> is unaffected for now.
> 
> Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
> ---
>  PVE/API2/APT.pm | 3 ++-
>  PVE/VZDump.pm   | 8 ++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
> index ec7c21b2..47c50961 100644
> --- a/PVE/API2/APT.pm
> +++ b/PVE/API2/APT.pm
> @@ -348,7 +348,8 @@ __PACKAGE__->register_method({
>                 # matchers.
>                 my $metadata_fields = {
>                     type => 'package-updates',
> -                   hostname => $hostname,
> +                   # Hostname (without domain part)
> +                   hostname => PVE::INotify::nodename(),
>                 };
>  
>                 PVE::Notify::info(
> diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
> index 2167b289..db3a02a9 100644
> --- a/PVE/VZDump.pm
> +++ b/PVE/VZDump.pm
> @@ -517,10 +517,9 @@ sub send_notification {
>             "See Task History for details!\n";
>      };
>  
> -    my $hostname = get_hostname();
> -
>      my $notification_props = {
> -       "hostname" => $hostname,
> +       # Hostname, might include domain part
> +       "hostname" => get_hostname(),
>         "error-message" => $err,
>         "guest-table" => build_guest_table($tasklist),
>         "logs" => $text_log_part,
> @@ -531,7 +530,8 @@ sub send_notification {
>  
>      my $fields = {
>         type => "vzdump",
> -       hostname => $hostname,
> +       # Hostname (without domain part)
> +       hostname => PVE::INotify::nodename(),
>      };
>      # Add backup-job metadata field in case this is a backup job.
>      $fields->{'job-id'} = $job_id if $job_id;
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
>