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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DBA87941BF for ; Fri, 9 Feb 2024 11:17:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA14137416 for ; Fri, 9 Feb 2024 11:16:37 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Feb 2024 11:16:36 +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 F0B62465A0 for ; Fri, 9 Feb 2024 11:16:35 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Fri, 9 Feb 2024 11:16:28 +0100 Message-Id: <20240209101628.76377-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.154 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_2 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_4 0.1 random spam to be learned in bayes 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. [proxmox.com] Subject: [pve-devel] [PATCH manager] Revert "ui: dc: remove notify key from datacenter option view" 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: Fri, 09 Feb 2024 10:17:07 -0000 This reverts commit c81bca2d28744616098448b81fa58e133d3ac5ed. In the first iteration of the notification system, notification routing and enabling/disabling notifications was configured via the (extended) `notify` parameter in `datacenter.cfg`. Because of that, the configuration UI for this parameter was moved to a new panel as a part of the notification UI. When changing to the newer approach for notification routing (matcher based), the "new" panel this setting was moved to was dropped from the UI. Notification sending for package updates is still influenced by this parameter (see bin/pveupdate, line 55), so there should be a way to configure this from the GUI. At some point, the `notify` parameter should be dropped, but that'd be a thing for a major release. Signed-off-by: Lukas Wagner --- https://forum.proxmox.com/threads/package-update-notifs-not-working.141182/ Notes: Alternatively, we could just *always* send package update notifications and just ignore that parameter from now on but this might leave users wondering who have previously set `package-updates=never`... www/manager6/dc/OptionView.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index b200fd12..19884bbe 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -91,6 +91,26 @@ Ext.define('PVE.dc.OptionView', { vtype: 'proxmoxMail', defaultValue: 'root@$hostname', }); + me.add_inputpanel_row('notify', gettext('Notify'), { + renderer: v => !v ? 'package-updates=auto' : PVE.Parser.printPropertyString(v), + labelWidth: 120, + url: "/api2/extjs/cluster/options", + //onlineHelp: 'ha_manager_shutdown_policy', + items: [{ + xtype: 'proxmoxKVComboBox', + name: 'package-updates', + fieldLabel: gettext('Package Updates'), + deleteEmpty: false, + value: '__default__', + comboItems: [ + ['__default__', Proxmox.Utils.defaultText + ' (auto)'], + ['auto', gettext('Automatically')], + ['always', gettext('Always')], + ['never', gettext('Never')], + ], + defaultValue: '__default__', + }], + }); me.add_text_row('mac_prefix', gettext('MAC address prefix'), { deleteEmpty: true, vtype: 'MacPrefix', -- 2.39.2