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 CA58A9F975 for ; Tue, 7 Nov 2023 11:19:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFA6930283 for ; Tue, 7 Nov 2023 11:19:04 +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 ; Tue, 7 Nov 2023 11:19:04 +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 E188646904 for ; Tue, 7 Nov 2023 11:19:03 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 7 Nov 2023 11:18:10 +0100 Message-Id: <20231107101827.340100-11-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107101827.340100-1-l.wagner@proxmox.com> References: <20231107101827.340100-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 pve-ha-manager 10/27] env: switch to matcher-based notification system 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: Tue, 07 Nov 2023 10:19:04 -0000 Signed-off-by: Lukas Wagner --- src/PVE/HA/Env/PVE2.pm | 10 ++-------- src/PVE/HA/NodeStatus.pm | 11 +++++++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index ea9e6e4..fcb60a9 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -221,16 +221,10 @@ sub log { } sub send_notification { - my ($self, $subject, $text, $properties) = @_; + my ($self, $subject, $text, $template_data, $metadata_fields) = @_; eval { - my $dc_config = PVE::Cluster::cfs_read_file('datacenter.cfg'); - my $target = $dc_config->{notify}->{'target-fencing'} // PVE::Notify::default_target(); - my $notify = $dc_config->{notify}->{fencing} // 'always'; - - if ($notify eq 'always') { - PVE::Notify::error($target, $subject, $text, $properties); - } + PVE::Notify::error($subject, $text, $template_data, $metadata_fields); }; $self->log("warning", "could not notify: $@") if $@; diff --git a/src/PVE/HA/NodeStatus.pm b/src/PVE/HA/NodeStatus.pm index b264a36..e053c55 100644 --- a/src/PVE/HA/NodeStatus.pm +++ b/src/PVE/HA/NodeStatus.pm @@ -212,7 +212,7 @@ my $send_fence_state_email = sub { my $haenv = $self->{haenv}; my $status = $haenv->read_manager_status(); - my $notification_properties = { + my $template_data = { "status-data" => { manager_status => $status, node_status => $self->{status} @@ -222,11 +222,18 @@ my $send_fence_state_email = sub { "subject" => $subject, }; + my $metadata_fields = { + type => 'fencing', + hostname => $node, + }; + $haenv->send_notification( $subject_template, $body_template, - $notification_properties + $template_data, + $metadata_fields, ); + }; -- 2.39.2