[pve-devel] [PATCH proxmox-widget-toolkit 1/1] RRDChart: fix title lookup for object series

[pve-devel] [PATCH proxmox-widget-toolkit 1/1] RRDChart: fix title lookup for object series

[Dominik Csapak]

when we give a field(series) as an object instead of a string, we have
to lookup the title from the object. The code was designed to do this,
but accidentally always used the first entry in the 'fields' array
to lookup the title if the field was not a plain string one.

to fix this, simply check if the field is the one we're looking for

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
this is necessary for the next patch to have correct tooltips

 src/panel/RRDChart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panel/RRDChart.js b/src/panel/RRDChart.js
index c81e2e7..148015c 100644
--- a/src/panel/RRDChart.js
+++ b/src/panel/RRDChart.js
@@ -136,7 +136,7 @@ Ext.define('Proxmox.widget.RRDChart', {
                                 prefix = field.title[field.yField.indexOf(item.field)];
                                 break;
                             }
-                        } else if (field.title) {
+                        } else if (field.yField === item.field && field.title) {
                             prefix = field.title;
                             break;
                         }
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH pve-manager 1/1] ui: node memory RRD: make 'Available' a line graph

[Dominik Csapak]

instead of an area graph. Give it the same color as the 'hostmem' one
from the qemu guests (a neutral color that draws not too much
attraction).

While at it, order it last, since it was just ordered second so the
overlapping colors would not clash.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
requires the previous patch to have correct tooltips.

 www/manager6/node/Summary.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/manager6/node/Summary.js b/www/manager6/node/Summary.js
index 343d4189..64ed3b07 100644
--- a/www/manager6/node/Summary.js
+++ b/www/manager6/node/Summary.js
@@ -206,7 +206,6 @@ Ext.define('PVE.node.Summary', {
                                         },
                                     },
                                 },
-                                'memavailable',
                                 {
                                     yField: 'memused',
                                     title: gettext('Used'),
@@ -236,14 +235,24 @@ Ext.define('PVE.node.Summary', {
                                     },
                                 },
                                 'arcsize',
+                                {
+                                    type: 'line',
+                                    fill: false,
+                                    yField: 'memavailable',
+                                    title: gettext('Available'),
+                                    style: {
+                                        lineWidth: 2.5,
+                                        opacity: 1,
+                                    },
+                                },
                             ],
                             fieldTitles: [
                                 gettext('Total'),
-                                gettext('Available'),
                                 gettext('Used'),
                                 gettext('ZFS ARC'),
+                                gettext('Available'),
                             ],
-                            colors: ['#94ae0a', '#94ae0a', '#115fa6', '#7c7474'],
+                            colors: ['#94ae0a', '#115fa6', '#7c7474', '#c4c0c0'],
                             unit: 'bytes',
                             powerOfTwo: true,
                             store: rrdstore,
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH proxmox-widget-toolkit 1/1] RRDChart: fix title lookup for object series

[Thomas Lamprecht]

Am 04.08.25 um 15:29 schrieb Dominik Csapak:
> when we give a field(series) as an object instead of a string, we have
> to lookup the title from the object. The code was designed to do this,
> but accidentally always used the first entry in the 'fields' array
> to lookup the title if the field was not a plain string one.
> 
> to fix this, simply check if the field is the one we're looking for
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> this is necessary for the next patch to have correct tooltips
> 
>  src/panel/RRDChart.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH pve-manager 1/1] ui: node memory RRD: make 'Available' a line graph

[Thomas Lamprecht]

Am 04.08.25 um 15:29 schrieb Dominik Csapak:
> instead of an area graph. Give it the same color as the 'hostmem' one
> from the qemu guests (a neutral color that draws not too much
> attraction).
> 
> While at it, order it last, since it was just ordered second so the
> overlapping colors would not clash.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> requires the previous patch to have correct tooltips.
> 
>  www/manager6/node/Summary.js | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
> 
>

applied, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel