F #1742: Configuration option in sunstone views to hide monitoring and attribute information (#1836)

src/sunstone/etc/sunstone-views/kvm/admin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/kvm/cloud.yaml

@@ -26,6 +26,12 @@ features:
 
     # True to allow to create machines to cloud users
     cloud_vm_create: true
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     provision-tab:
         panel_tabs:

src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/kvm/user.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/mixed/admin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: true
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/mixed/cloud.yaml

@@ -26,6 +26,12 @@ features:
 
     # True to allow to create machines to cloud users
     cloud_vm_create: true
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     provision-tab:
         panel_tabs:

src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/mixed/user.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/vcenter/admin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: true
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/vcenter/cloud.yaml

@@ -26,6 +26,12 @@ features:
 
     # True to allow to create machines to cloud users
     cloud_vm_create: true
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     provision-tab:
         panel_tabs:

src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/etc/sunstone-views/vcenter/user.yaml

@@ -71,6 +71,12 @@ features:
     # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
     # deployed to
     vcenter_vm_folder: false
+
+    # True to show the monitoring info (VM & VRouters)
+    show_monitoring_info: true
+
+    # True to show the attributes info (VM & VRouters)
+    show_attributes_info: true
 tabs:
     dashboard-tab:
         # The following widgets can be used inside any of the '_per_row' settings

src/sunstone/public/app/tabs/vms-tab/panels/info.js

@@ -19,31 +19,31 @@ define(function(require) {
     DEPENDENCIES
    */
 
-  var Locale = require('utils/locale');
-  var Humanize = require('utils/humanize');
-  var RenameTr = require('utils/panel/rename-tr');
-  var PermissionsTable = require('utils/panel/permissions-table');
-  var TemplateTable = require('utils/panel/template-table');
-  var TemplateTableVcenter = require('utils/panel/template-table');
-  var OpenNebula = require('opennebula');
-  var Sunstone = require('sunstone');
-  var Config = require('sunstone-config');
-  var Navigation = require('utils/navigation');
+  var Locale = require("utils/locale");
+  var Humanize = require("utils/humanize");
+  var RenameTr = require("utils/panel/rename-tr");
+  var PermissionsTable = require("utils/panel/permissions-table");
+  var TemplateTable = require("utils/panel/template-table");
+  var TemplateTableVcenter = require("utils/panel/template-table");
+  var OpenNebula = require("opennebula");
+  var Sunstone = require("sunstone");
+  var Config = require("sunstone-config");
+  var Navigation = require("utils/navigation");
 
   /*
     TEMPLATES
    */
 
-  var TemplateInfo = require('hbs!./info/html');
+  var TemplateInfo = require("hbs!./info/html");
 
   /*
     CONSTANTS
    */
 
-  var TAB_ID = require('../tabId');
-  var PANEL_ID = require('./info/panelId');
-  var RESOURCE = "VM"
-  var XML_ROOT = "VM"
+  var TAB_ID = require("../tabId");
+  var PANEL_ID = require("./info/panelId");
+  var RESOURCE = "VM";
+  var XML_ROOT = "VM";
 
   /*
     CONSTRUCTOR
@@ -76,7 +76,7 @@ define(function(require) {
     var stateStr = OpenNebula.VM.stateStr(this.element.STATE);
     var lcmStateStr = OpenNebula.VM.lcmStateStr(this.element.LCM_STATE);
     var hostnameHTML = OpenNebula.VM.hostnameStrLink(this.element);
-    var vrouterHTML = '--';
+    var vrouterHTML = "--";
 
     var IP = OpenNebula.VM.ipsStr(this.element);
 
@@ -87,7 +87,7 @@ define(function(require) {
     }
 
     var deployId = (typeof(this.element.DEPLOY_ID) == "object" ? "--" : this.element.DEPLOY_ID);
-    var resched = (parseInt(this.element.RESCHED) ? Locale.tr("yes") : Locale.tr("no"))
+    var resched = (parseInt(this.element.RESCHED) ? Locale.tr("yes") : Locale.tr("no"));
 
     // Get rid of the unwanted (for show) SCHED_* keys
     var that = this;
@@ -125,20 +125,20 @@ define(function(require) {
     }
 
     return TemplateInfo({
-      'element': this.element,
-      'renameTrHTML': renameTrHTML,
-      'stateStr': stateStr,
-      'lcmStateStr': lcmStateStr,
-      'hostnameHTML': hostnameHTML,
-      'prettyStartTime': prettyStartTime,
-      'deployId': deployId,
-      'IP': IP,
-      'resched': resched,
-      'permissionsTableHTML': permissionsTableHTML,
-      'templateTableVcenterHTML': templateTableVcenterHTML,
-      'templateTableHTML': templateTableHTML,
-      'monitoringTableContentHTML': monitoringTableContentHTML,
-      'vrouterHTML': vrouterHTML
+      "element": this.element,
+      "renameTrHTML": renameTrHTML,
+      "stateStr": stateStr,
+      "lcmStateStr": lcmStateStr,
+      "hostnameHTML": hostnameHTML,
+      "prettyStartTime": prettyStartTime,
+      "deployId": deployId,
+      "IP": IP,
+      "resched": resched,
+      "permissionsTableHTML": permissionsTableHTML,
+      "templateTableVcenterHTML": templateTableVcenterHTML,
+      "templateTableHTML": templateTableHTML,
+      "monitoringTableContentHTML": monitoringTableContentHTML,
+      "vrouterHTML": vrouterHTML
     });
   }
 
@@ -162,7 +162,7 @@ define(function(require) {
       }
     });
     if($.isEmptyObject(strippedTemplateVcenter)){
-      $('.vcenter', context).hide();
+      $(".vcenter", context).hide();
     }
 
     TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, unshownValues, strippedTemplateVcenter);

src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs

@@ -81,25 +81,29 @@
 </div>
 <div class="large-6 columns">{{{permissionsTableHTML}}}</div>
 </div>
-<div class="row vcenter">
-<div class="large-9 columns">{{{templateTableVcenterHTML}}}</div>
-</div>
-<div class="row">
-<div class="large-9 columns">{{{templateTableHTML}}}</div>
-</div>
-{{#if monitoringTableContentHTML}}
-<div class="row">
-<div class="large-9 columns">
-  <table class="dataTable">
-    <thead>
-      <tr>
-        <th colspan="2">{{tr "Monitoring"}}</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{{monitoringTableContentHTML}}}
-    </tbody>
-  </table>
-</div>
-</div>
-{{/if}}
+{{#isFeatureEnabled "show_attributes_info"}}
+  <div class="row vcenter">
+  <div class="large-9 columns">{{{templateTableVcenterHTML}}}</div>
+  </div>
+  <div class="row">
+  <div class="large-9 columns">{{{templateTableHTML}}}</div>
+  </div>
+{{/isFeatureEnabled}}
+{{#isFeatureEnabled "show_monitoring_info"}}
+  {{#if monitoringTableContentHTML}}
+    <div class="row">
+    <div class="large-9 columns">
+      <table class="dataTable">
+        <thead>
+          <tr>
+            <th colspan="2">{{tr "Monitoring"}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{{monitoringTableContentHTML}}}
+        </tbody>
+      </table>
+    </div>
+    </div>
+  {{/if}}
+{{/isFeatureEnabled}}

src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs

@@ -78,8 +78,10 @@
     </table>
   </div>
 </div>
+{{#isFeatureEnabled "show_attributes_info"}}
 <div class="row">
   <div class="large-9 columns">
     {{{templateTableHTML}}}
   </div>
 </div>
+{{/isFeatureEnabled}}