env: switch to matcher-based notification system

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>

diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm
index ea9e6e426f2cb4cb1a3e6ee083c0bf7216ed4e37..fcb60a91a7be7d3404602484fc9a18f5fa5af8fb 100644 (file)
--- 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 b264a367429b22c80757473ab02d02b9466b010c..e053c55070917c830a947349daed76c56c075457 100644 (file)
--- 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,
     );
+
 };