From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 1861D1FF2AD for ; Thu, 4 Jul 2024 15:08:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7580F32F65; Thu, 4 Jul 2024 15:08:45 +0200 (CEST) MIME-Version: 1.0 In-Reply-To: <20240610084038.71643-7-l.wagner@proxmox.com> References: <20240610084038.71643-1-l.wagner@proxmox.com> <20240610084038.71643-7-l.wagner@proxmox.com> From: Fabian =?utf-8?q?Gr=C3=BCnbichler?= To: Proxmox VE development discussion Date: Thu, 04 Jul 2024 15:08:38 +0200 Message-ID: <172009851828.180658.11598578458258743722@yuna.proxmox.com> User-Agent: alot/0.10 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] applied: [PATCH manager v7 06/19] vzdump: apt: notification: do not include domain in 'hostname' field X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 > --- > 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@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel