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 7A109B8C11 for ; Wed, 6 Dec 2023 12:31:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5A8865F0 for ; Wed, 6 Dec 2023 12:31:25 +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, 6 Dec 2023 12:31:24 +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 C21CE40EF9 for ; Wed, 6 Dec 2023 12:31:23 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 6 Dec 2023 12:31:01 +0100 Message-Id: <20231206113101.139743-1-c.ebner@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.048 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [result.data, me.store] Subject: [pbs-devel] [PATCH v3 proxmox-backup] ui: warn of missing gc-schedule, prune/verify jobs X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2023 11:31:25 -0000 Warn about a missing garbage collection schedule, prune job or verify job configurations in the datastore's summary panel. Show the number of prune/verify job configurations, if there are jobs configured. Signed-off-by: Christian Ebner --- changes since version 2: - move message string initialization to controllers `init` function changes since version 1: - add check mark icon for configured jobs/schedule - add question mark icon for unknown configuration state - fix typo in garbage collection variable name - add missing trailing commas found by pve-eslint - refactor message initialization to allow to use format helper functions www/datastore/Summary.js | 96 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js index a932b4e0..273a5bf0 100644 --- a/www/datastore/Summary.js +++ b/www/datastore/Summary.js @@ -49,12 +49,30 @@ Ext.define('PBS.DataStoreInfo', { usage: {}, stillbad: 0, mountpoint: "", + gcScheduleMsg: "", + pruneJobMsg: "", + verifyJobMsg: "", }, }, controller: { xclass: 'Ext.app.ViewController', + fmtConfigured: function(fmtString, params) { + let msg = Ext.String.format(fmtString, params); + return ` ${msg}`; + }, + + fmtMissing: function(fmtString, params) { + let msg = Ext.String.format(fmtString, params); + return ` ${msg}`; + }, + + fmtWarning: function(fmtString, params) { + let msg = Ext.String.format(fmtString, params); + return ` ${msg}`; + }, + onLoad: function(store, data, success) { let me = this; if (!success) { @@ -101,6 +119,50 @@ Ext.define('PBS.DataStoreInfo', { vm.set('ctcount', countstext(counts.ct)); vm.set('vmcount', countstext(counts.vm)); vm.set('hostcount', countstext(counts.host)); + + Proxmox.Utils.API2Request({ + url: `/config/datastore/${me.view.datastore}`, + success: function(response) { + if (response.result.data['gc-schedule']) { + vm.set('gcScheduleMsg', me.fmtConfigured(gettext('configured'))); + } else { + vm.set('gcScheduleMsg', me.fmtWarning(gettext('none configured'))); + } + }, + failure: function() { + vm.set('gcScheduleMsg', me.fmtMissing(gettext('unknown'))); + }, + }); + + Proxmox.Utils.API2Request({ + url: `/admin/prune?store=${me.view.datastore}`, + success: function(response) { + let len = response.result.data.length; + if (len > 0) { + vm.set('pruneJobMsg', me.fmtConfigured(gettext('{0} configured'), len)); + } else { + vm.set('pruneJobMsg', me.fmtWarning(gettext('none configured'))); + } + }, + failure: function() { + vm.set('pruneJobMsg', me.fmtMissing(gettext('unknown'))); + }, + }); + + Proxmox.Utils.API2Request({ + url: `/admin/verify?store=${me.view.datastore}`, + success: function(response) { + let len = response.result.data.length; + if (len > 0) { + vm.set('verifyJobMsg', me.fmtConfigured(gettext('{0} configured'), len)); + } else { + vm.set('verifyJobMsg', me.fmtWarning(gettext('none configured'))); + } + }, + failure: function() { + vm.set('verifyJobMsg', me.fmtMissing(gettext('unknown'))); + }, + }); }, startStore: function() { this.store.startUpdate(); }, @@ -108,6 +170,12 @@ Ext.define('PBS.DataStoreInfo', { init: function(view) { let me = this; + + let vm = me.getViewModel(); + vm.set('gcScheduleMsg', me.fmtMissing(gettext('unknown'))); + vm.set('pruneJobMsg', me.fmtMissing(gettext('unknown'))); + vm.set('verifyJobMsg', me.fmtMissing(gettext('unknown'))); + let datastore = encodeURIComponent(view.datastore); me.store = Ext.create('Proxmox.data.ObjectStore', { interval: 5*1000, @@ -201,6 +269,34 @@ Ext.define('PBS.DataStoreInfo', { visible: '{stillbad}', }, }, + { + title: gettext('Garbage Collection Schedule'), + printBar: false, + bind: { + data: { + text: '{gcScheduleMsg}', + }, + }, + padding: '10 0 0 0', + }, + { + title: gettext('Prune Jobs'), + printBar: false, + bind: { + data: { + text: '{pruneJobMsg}', + }, + }, + }, + { + title: gettext('Verify Jobs'), + printBar: false, + bind: { + data: { + text: '{verifyJobMsg}', + }, + }, + }, ], }); -- 2.39.2