From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A66A8BA325 for ; Wed, 13 Dec 2023 17:38:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE6D4D938 for ; Wed, 13 Dec 2023 17:38:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 13 Dec 2023 17:38:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 33C07472E2 for ; Wed, 13 Dec 2023 17:38:20 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 13 Dec 2023 17:37:50 +0100 Message-Id: <20231213163801.392492-12-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231213163801.392492-1-l.wagner@proxmox.com> References: <20231213163801.392492-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 pve-manager 11/22] 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: , X-List-Received-Date: Wed, 13 Dec 2023 16:38:55 -0000 - 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 f50a5347..149128ec 100644 --- a/PVE/API2/APT.pm +++ b/PVE/API2/APT.pm @@ -354,7 +354,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 0c1ee1c8..1e8be106 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -484,10 +484,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, @@ -497,7 +496,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->{'backup-job'} = $job_id if $job_id; -- 2.39.2