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 7D8DC61694 for ; Wed, 26 Jul 2023 11:50:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5E89C34FF for ; Wed, 26 Jul 2023 11:50:10 +0200 (CEST) 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, 26 Jul 2023 11:50:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 774674595F for ; Wed, 26 Jul 2023 11:50:09 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 26 Jul 2023 11:49:38 +0200 Message-Id: <20230726095002.325276-7-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230726095002.325276-1-l.wagner@proxmox.com> References: <20230726095002.325276-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.114 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 PROLO_LEO2 0.1 Meta Catches all Leo drug variations so far 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replication.pm] Subject: [pve-devel] [PATCH v5 pve-manager 06/30] api: replication: send notifications via new notification module 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, 26 Jul 2023 09:50:40 -0000 If the new 'target-replication' option in datacenter.cfg is set to a notification target, we send notifications that way. If it is not set, we continue send a notification to the default target (mail to root@pam). There is also a new 'replication' option. It controls whether to send a notification at all. Signed-off-by: Lukas Wagner --- PVE/API2/Replication.pm | 63 ++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm index 89c5a802..d61518ba 100644 --- a/PVE/API2/Replication.pm +++ b/PVE/API2/Replication.pm @@ -15,6 +15,7 @@ use PVE::QemuConfig; use PVE::QemuServer; use PVE::LXC::Config; use PVE::LXC; +use PVE::Notify; use PVE::RESTHandler; @@ -91,6 +92,24 @@ my sub _should_mail_at_failcount { return $i * 48 == $fail_count; }; +my $replication_error_subject_template = "Replication Job: '{{job-id}}' failed"; +my $replication_error_body_template = <{schedule} // '*/15'; - - my $msg = "Replication job $job->{id} with target '$job->{target}' and schedule"; - $msg .= " '$schedule' failed!\n"; - - $msg .= " Last successful sync: "; - if (my $last_sync = $jobstate->{last_sync}) { - $msg .= render_timestamp($last_sync) ."\n"; - } else { - $msg .= "None/Unknown\n"; - } # not yet updated, so $job->next_sync here is actually the current one. # NOTE: Copied from PVE::ReplicationState::job_status() my $next_sync = $job->{next_sync} + 60 * ($fail_count <= 3 ? 5 * $fail_count : 30); - $msg .= " Next sync try: " . render_timestamp($next_sync) ."\n"; - $msg .= " Failure count: $fail_count\n"; - - if ($fail_count == 3) { - $msg .= "\nNote: The system will now reduce the frequency of error reports,"; - $msg .= " as the job appears to be stuck.\n"; - } + # The replication job is run every 15 mins if no schedule is set. + my $schedule = $job->{schedule} // '*/15'; - $msg .= "\nError:\n$err"; + my $properties = { + "failure-count" => $fail_count, + "last-sync" => $jobstate->{last_sync}, + "next-sync" => $next_sync, + "job-id" => $job->{id}, + "job-target" => $job->{target}, + "job-schedule" => $schedule, + "error" => $err, + }; eval { - PVE::Tools::sendmail('root', "Replication Job: $job->{id} failed", $msg) + my $dcconf = PVE::Cluster::cfs_read_file('datacenter.cfg'); + my $target = $dcconf->{notify}->{'target-replication'} // PVE::Notify::default_target(); + my $notify = $dcconf->{notify}->{'replication'} // 'always'; + + if ($notify eq 'always') { + PVE::Notify::error( + $target, + $replication_error_subject_template, + $replication_error_body_template, + $properties + ); + } + }; warn ": $@" if $@; } -- 2.39.2