Fixed stuff

- Units showing
- Easypiechart max val
- Display options in the HTML

api/config/default.php

@@ -316,30 +316,40 @@ return array(
 	'netdata1Chart' => '',
 	'netdata1Data' => '',
 	'netdata1Units' => '',
+	'netdata1CommonUnits' => '',
 	'netdata1Dimensions' => '',
 	'netdata1Max' => '',
+	'netdata1AppendOptions' => '',
 	'netdata2Title' => '',
 	'netdata2Chart' => '',
 	'netdata2Data' => '',
 	'netdata2Units' => '',
+	'netdata2CommonUnits' => '',
 	'netdata2Dimensions' => '',
 	'netdata2Max' => '',
+	'netdata2AppendOptions' => '',
 	'netdata3Title' => '',
 	'netdata3Chart' => '',
 	'netdata3Data' => '',
 	'netdata3Units' => '',
+	'netdata3CommonUnits' => '',
 	'netdata3Dimensions' => '',
 	'netdata3Max' => '',
+	'netdata3AppendOptions' => '',
 	'netdata4Title' => '',
 	'netdata4Chart' => '',
 	'netdata4Data' => '',
 	'netdata4Units' => '',
+	'netdata4CommonUnits' => '',
 	'netdata4Dimensions' => '',
 	'netdata4Max' => '',
+	'netdata4AppendOptions' => '',
 	'netdata5Title' => '',
 	'netdata5Chart' => '',
 	'netdata5Data' => '',
 	'netdata5Units' => '',
+	'netdata5CommonUnits' => '',
 	'netdata5Dimensions' => '',
 	'netdata5Max' => '',
+	'netdata5AppendOptions' => '',
 );

api/functions/homepage-connect-functions.php

@@ -2683,8 +2683,10 @@ function getNetdata()
 							'chart' => $GLOBALS['netdata'.($i + 1).'Chart'],
 							'data' => $GLOBALS['netdata'.($i + 1).'Data'],
 							'units' => $GLOBALS['netdata'.($i + 1).'Units'],
+							'commonUnits' => $GLOBALS['netdata'.($i + 1).'CommonUnits'],
 							'dimensions' => $GLOBALS['netdata'.($i + 1).'Dimensions'],
 							'max' => $GLOBALS['netdata'.($i + 1).'Max'],
+							'appendOptions' => $GLOBALS['netdata'.($i + 1).'AppendOptions'],
 						]);
 					}
 				}

api/functions/homepage-functions.php

@@ -2979,6 +2979,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata1Units'],
 						'help' => 'Units for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata1CommonUnits',
+						'label' => 'Common Units',
+						'value' => $GLOBALS['netdata1CommonUnits'],
+						'help' => 'Common-units for the netdata graph'
+					),
 					array(
 						'type' => 'input',
 						'name' => 'netdata1Dimensions',
@@ -2993,6 +3000,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata1Max'],
 						'help' => 'Gauge max value for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata1AppendOptions',
+						'label' => 'Append options',
+						'value' => $GLOBALS['netdata1AppendOptions'],
+						'help' => 'Append options for the netdata graph'
+					),
 				),
 				'Chart 2' => array(
 					array(
@@ -3023,6 +3037,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata2Units'],
 						'help' => 'Units for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata2CommonUnits',
+						'label' => 'Common Units',
+						'value' => $GLOBALS['netdata2CommonUnits'],
+						'help' => 'Common-units for the netdata graph'
+					),
 					array(
 						'type' => 'input',
 						'name' => 'netdata2Dimensions',
@@ -3037,6 +3058,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata2Max'],
 						'help' => 'Gauge max value for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata2AppendOptions',
+						'label' => 'Append options',
+						'value' => $GLOBALS['netdata2AppendOptions'],
+						'help' => 'Append options for the netdata graph'
+					),
 				),
 				'Chart 3' => array(
 					array(
@@ -3067,6 +3095,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata3Units'],
 						'help' => 'Units for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata3CommonUnits',
+						'label' => 'Common Units',
+						'value' => $GLOBALS['netdata3CommonUnits'],
+						'help' => 'Common-units for the netdata graph'
+					),
 					array(
 						'type' => 'input',
 						'name' => 'netdata3Dimensions',
@@ -3081,6 +3116,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata3Max'],
 						'help' => 'Gauge max value for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata3AppendOptions',
+						'label' => 'Append options',
+						'value' => $GLOBALS['netdata3AppendOptions'],
+						'help' => 'Append options for the netdata graph'
+					),
 				),
 				'Chart 4' => array(
 					array(
@@ -3111,6 +3153,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata4Units'],
 						'help' => 'Units for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata4CommonUnits',
+						'label' => 'Common Units',
+						'value' => $GLOBALS['netdata4CommonUnits'],
+						'help' => 'Common-units for the netdata graph'
+					),
 					array(
 						'type' => 'input',
 						'name' => 'netdata4Dimensions',
@@ -3125,6 +3174,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata4Max'],
 						'help' => 'Gauge max value for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata4AppendOptions',
+						'label' => 'Append options',
+						'value' => $GLOBALS['netdata4AppendOptions'],
+						'help' => 'Append options for the netdata graph'
+					),
 				),
 				'Chart 5' => array(
 					array(
@@ -3155,6 +3211,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata5Units'],
 						'help' => 'Units for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata5CommonUnits',
+						'label' => 'Common Units',
+						'value' => $GLOBALS['netdata5CommonUnits'],
+						'help' => 'Common-units for the netdata graph'
+					),
 					array(
 						'type' => 'input',
 						'name' => 'netdata5Dimensions',
@@ -3169,6 +3232,13 @@ function getHomepageList()
 						'value' => $GLOBALS['netdata5Max'],
 						'help' => 'Gauge max value for the netdata graph'
 					),
+					array(
+						'type' => 'input',
+						'name' => 'netdata5AppendOptions',
+						'label' => 'Append options',
+						'value' => $GLOBALS['netdata5AppendOptions'],
+						'help' => 'Append options for the netdata graph'
+					),
 				),
 				'Options' => array(
 					array(

js/functions.js

@@ -7217,9 +7217,10 @@ function homepageMonitorr(timeout){
 function buildNetdataItem(array){
     var html = '';
     array.forEach(e => {
+        var chart = e.chart;
         if(e.data) {
             html += `
-            <div class="col-lg-2">
+            <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6 my-3">
                 <div class="netdata-item">
                     <div data-netdata="`+e.data+`"
                         data-dimensions="`+e.dimensions+`"
@@ -7228,11 +7229,33 @@ function buildNetdataItem(array){
                         data-before="0"
                         data-after="-300"
                         data-points="300"
-                        data-width="100%"
+                        data-width="90%"`;
+            if(e.chart == 'gauge' && e.max !== '') {
+                html += `
                         data-gauge-adjust="width"
-                        data-easypiechart-max-value="`+e.max+`"
                         data-gauge-max-value="`+e.max+`"
+                `;
+            }
+            if(e.chart = 'easypiechart' && e.max !== '') {
+                html += `
+                        data-easypiechart-max-value="`+e.max+`"
+                `;
+            }
+            if(e.appendOptions != '') {
+                html += `
+                        data-append-options="`+e.appendOptions+`"
+                `;
+            }
+            if(e.units != '') {
+                html += `
+                        data-units="`+e.units+`"
+                `;
+            } else if(e.commonUnits != '') {
+                html += `
                         data-common-units="`+e.units+`"
+                `;
+            }
+            html += `
                     ></div>
                 </div>
             </div>
@@ -7265,7 +7288,7 @@ function buildNetdata(array){
     html += `
     <div class="row">
         
-            <div class="d-flex align-items-center justify-content-center">
+            <div class="d-lg-flex d-md-flex d-sm-block d-xs-block align-items-center justify-content-center">
     `;
     html += buildNetdataItem(options);
     html += `