dashboard: add node info panel

Essentially the same as in PBS, but needed to use 'rootfs' instead of
'root' for the disk usage, avoid 'cpu' as an itemId (already used by
the cluster resources), and get rid of the fingerprint button. Also
added the link to the repositories panel like in Dominik's pending
patch for PBS.

Rename the existing resources panel to clarify what it actually is.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/js/Dashboard.js b/js/Dashboard.js
index c92b2f0d8f190f8e031b2c12a401c0432bd58866..79817b383b8ff5ec9e4ebca7c1a53995896d8c0d 100644 (file)
--- a/js/Dashboard.js
+++ b/js/Dashboard.js
@@ -140,6 +140,8 @@ Ext.define('PMG.Dashboard', {
            var subscriptionPanel = me.lookup('subscription');
            subscriptionPanel.setSubStatus(subStatus);
 
+           me.lookup('nodeInfo').setSubscriptionStatus(subStatus);
+
            cpu = cpu/count;
            mem = mem/count;
            hd = hd/count;
@@ -163,6 +165,15 @@ Ext.define('PMG.Dashboard', {
            }
        },
 
+       updateRepositoryStatus: function(store, records, success) {
+           if (!success) {
+               return;
+           }
+
+           let me = this;
+           me.lookup('nodeInfo').setRepositoryInfo(records[0].data['standard-repos']);
+       },
+
        init: function(view) {
            var me = this;
            var sp = Ext.state.Manager.getProvider();
@@ -272,6 +283,21 @@ Ext.define('PMG.Dashboard', {
                    { type: 'string', name: 'receiver' },
                ],
            },
+           repositories: {
+               storeid: 'dash-repositories',
+               type: 'update',
+               interval: 15000,
+               autoStart: true,
+               autoLoad: true,
+               autoDestroy: true,
+               proxy: {
+                   type: 'proxmox',
+                   url: '/api2/json/nodes/localhost/apt/repositories',
+               },
+               listeners: {
+                   load: 'updateRepositoryStatus',
+               },
+           },
        },
     },
 
@@ -385,7 +411,7 @@ Ext.define('PMG.Dashboard', {
        {
            height: 250,
            iconCls: 'fa fa-tasks',
-           title: gettext('Node Resources'),
+           title: gettext('Cluster Resources (average)'),
            bodyPadding: '0 20 0 20',
            layout: {
                type: 'hbox',
@@ -411,6 +437,13 @@ Ext.define('PMG.Dashboard', {
                },
            ],
        },
+       {
+           xtype: 'pmgNodeInfoPanel',
+           reference: 'nodeInfo',
+           height: 250,
+           bodyPadding: '10 5 10 5',
+           iconCls: 'fa fa-tasks',
+       },
        {
            height: 250,
            iconCls: 'fa fa-list',

diff --git a/js/Makefile b/js/Makefile
index 165436ba635f188fe4f376f138a70c5b666abc09..672f61e109ff3df5dad88040364d24c752c852b4 100644 (file)
--- a/js/Makefile
+++ b/js/Makefile
@@ -27,6 +27,7 @@ JSSRC=                                                        \
        QuarantineView.js                               \
        Dashboard.js                                    \
        dashboard/MailProcessing.js                     \
+       dashboard/NodeInfo.js                           \
        dashboard/SubscriptionInfo.js                   \
        dashboard/MiniGraph.js                          \
        VersionInfo.js                                  \

diff --git a/js/dashboard/NodeInfo.js b/js/dashboard/NodeInfo.js
new file mode 100644 (file)
index 0000000..c286558
--- /dev/null
+++ b/js/dashboard/NodeInfo.js
@@ -0,0 +1,187 @@
+Ext.define('PMG.NodeInfoPanel', {
+    extend: 'Proxmox.panel.StatusView',
+    alias: 'widget.pmgNodeInfoPanel',
+
+    layout: {
+       type: 'table',
+       columns: 2,
+       tableAttrs: {
+           style: {
+               width: '100%',
+           },
+       },
+    },
+
+    defaults: {
+       xtype: 'pmxInfoWidget',
+       padding: '0 10 5 10',
+    },
+
+    viewModel: {
+       data: {
+           subscriptionActive: '',
+           noSubscriptionRepo: '',
+           enterpriseRepo: '',
+           testRepo: '',
+       },
+       formulas: {
+           repoStatus: function(get) {
+               if (get('subscriptionActive') === '' || get('enterpriseRepo') === '') {
+                   return '';
+               }
+
+               if (get('noSubscriptionRepo') || get('testRepo')) {
+                   return 'non-production';
+               } else if (get('subscriptionActive') && get('enterpriseRepo')) {
+                   return 'ok';
+               } else if (!get('subscriptionActive') && get('enterpriseRepo')) {
+                   return 'no-sub';
+               } else if (!get('enterpriseRepo') || !get('noSubscriptionRepo') || !get('testRepo')) {
+                   return 'no-repo';
+               }
+               return 'unknown';
+           },
+           repoStatusMessage: function(get) {
+               const status = get('repoStatus');
+               let repoLink = ` <a data-qtip="${gettext("Open Repositories Panel")}"
+                   href="#pmgServerAdministration:aptrepositories">
+                   <i class="fa black fa-chevron-right"></i>
+                   </a>`;
+               return Proxmox.Utils.formatNodeRepoStatus(status, 'Proxmox Mail Gateway') + repoLink;
+           },
+       },
+    },
+
+    items: [
+       {
+           itemId: 'nodecpu',
+           iconCls: 'fa fa-fw pmx-itype-icon-processor pmx-icon',
+           title: gettext('CPU usage'),
+           valueField: 'cpu',
+           maxField: 'cpuinfo',
+           renderer: Proxmox.Utils.render_node_cpu_usage,
+       },
+       {
+           itemId: 'wait',
+           iconCls: 'pmx-icon-size fa fa-fw fa-clock-o',
+           title: gettext('IO delay'),
+           valueField: 'wait',
+       },
+       {
+           xtype: 'box',
+           colspan: 2,
+           padding: '0 0 20 0',
+       },
+       {
+           iconCls: 'fa fa-fw pmx-itype-icon-memory pmx-icon',
+           itemId: 'memory',
+           title: gettext('RAM usage'),
+           valueField: 'memory',
+           maxField: 'memory',
+           renderer: Proxmox.Utils.render_node_size_usage,
+       },
+       {
+           itemId: 'load',
+           iconCls: 'pmx-icon-size fa fa-fw fa-tasks',
+           title: gettext('Load average'),
+           printBar: false,
+           textField: 'loadavg',
+       },
+       {
+           iconCls: 'pmx-icon-size fa fa-fw fa-hdd-o',
+           itemId: 'rootfs',
+           title: gettext('HD space') + ' (root)',
+           valueField: 'rootfs',
+           maxField: 'rootfs',
+           renderer: Proxmox.Utils.render_node_size_usage,
+       },
+       {
+           iconCls: 'pmx-icon-size fa fa-fw fa-refresh',
+           itemId: 'swap',
+           printSize: true,
+           title: gettext('SWAP usage'),
+           valueField: 'swap',
+           maxField: 'swap',
+           renderer: Proxmox.Utils.render_node_size_usage,
+       },
+       {
+           xtype: 'box',
+           colspan: 2,
+           padding: '0 0 20 0',
+       },
+       {
+           itemId: 'cpus',
+           colspan: 2,
+           printBar: false,
+           title: gettext('CPU(s)'),
+           textField: 'cpuinfo',
+           renderer: Proxmox.Utils.render_cpu_model,
+           value: '',
+       },
+       {
+           itemId: 'kversion',
+           colspan: 2,
+           title: gettext('Kernel Version'),
+           printBar: false,
+           textField: 'kversion',
+           value: '',
+       },
+       {
+           itemId: 'repositoryStatus',
+           colspan: 2,
+           printBar: false,
+           title: gettext('Repository Status'),
+           setValue: function(value) { // for binding below
+               this.updateValue(value);
+           },
+           bind: {
+               value: '{repoStatusMessage}',
+           },
+       },
+    ],
+
+    updateTitle: function() {
+       var me = this;
+       var uptime = Proxmox.Utils.render_uptime(me.getRecordValue('uptime'));
+       me.setTitle(Proxmox.NodeName + ' (' + gettext('Uptime') + ': ' + uptime + ')');
+    },
+
+    setRepositoryInfo: function(standardRepos) {
+       let me = this;
+       let vm = me.getViewModel();
+
+       for (const standardRepo of standardRepos) {
+           const handle = standardRepo.handle;
+           const status = standardRepo.status;
+
+           if (handle === "enterprise") {
+               vm.set('enterpriseRepo', status);
+           } else if (handle === "no-subscription") {
+               vm.set('noSubscriptionRepo', status);
+           } else if (handle === "test") {
+               vm.set('testRepo', status);
+           }
+       }
+    },
+
+    setSubscriptionStatus: function(status) {
+       let me = this;
+       let vm = me.getViewModel();
+
+       vm.set('subscriptionActive', status);
+    },
+
+    initComponent: function() {
+       let me = this;
+
+       me.rstore = Ext.create('Proxmox.data.ObjectStore', {
+           interval: 3000,
+           url: '/api2/json/nodes/localhost/status',
+           autoStart: true,
+       });
+
+       me.callParent();
+
+       me.on('destroy', function() { me.rstore.stopUpdate(); });
+    },
+});