[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-27 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15526584#comment-15526584
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user jvwing commented on the issue:

https://github.com/apache/nifi/pull/1042
  
Thank you, @mcgilman.


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Fix For: 1.1.0
>
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-27 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15526585#comment-15526585
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user jvwing closed the pull request at:

https://github.com/apache/nifi/pull/1042


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Fix For: 1.1.0
>
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-27 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15526393#comment-15526393
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on the issue:

https://github.com/apache/nifi/pull/1042
  
@jvwing Just finished up testing and everything looks good. This has been 
merged to master. I did find another minor issue with sorting the table but I 
updated the sort method accordingly. Thanks!


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-27 Thread ASF subversion and git services (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15526387#comment-15526387
 ] 

ASF subversion and git services commented on NIFI-2795:
---

Commit 508b218b592b88baecdf67dec8c27447b602a2bd in nifi's branch 
refs/heads/master from [~jameswing]
[ https://git-wip-us.apache.org/repos/asf?p=nifi.git;h=508b218 ]

NIFI-2795 Sys Diagnostics in Cluster UI
- Cleaning up tab resize loop
- Pre-authorizing sys diagnostics api calls
- Addressing issues filtering the tables in the cluster table.
- Addressing issues sorting the tables in the cluster page.


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-26 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15523951#comment-15523951
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on the issue:

https://github.com/apache/nifi/pull/1042
  
@jvwing I'll just squash those changes into your commit before I push. Just 
wanted to communicate before I do that. Thanks!


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-26 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15523788#comment-15523788
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on the issue:

https://github.com/apache/nifi/pull/1042
  
@jvwing While reviewing I stumbled into an existing bug filtering the 
tables in the cluster page. I've addressed it here [1]. Hoping you could just 
review what I did so I could include it in your PR. 

Thanks!

[1] 
https://github.com/mcgilman/nifi/commit/45d9fc33054a5696b67bec7a934a4e4500a01ad5


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-26 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15523378#comment-15523378
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on the issue:

https://github.com/apache/nifi/pull/1042
  
Reviewing...


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-23 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15517457#comment-15517457
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user jvwing commented on the issue:

https://github.com/apache/nifi/pull/1042
  
I added server- and client-side modifications to pre-authorize the system 
diagnostics API call, and removed the unnecessary error handling code.


> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Assignee: James Wing
>Priority: Minor
> Attachments: cluster-01-nodes.png, cluster-02-system.png, 
> cluster-03-jvm.png, cluster-04-flowfile-store.png, 
> cluster-05-content-store.png
>
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-21 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15511235#comment-15511235
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user jvwing commented on a diff in the pull request:

https://github.com/apache/nifi/pull/1042#discussion_r79936607
  
--- Diff: 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
 ---
@@ -24,13 +24,275 @@ nf.ClusterTable = (function () {
  */
 var config = {
 primaryNode: 'Primary Node',
-clusterCoorindator: 'Cluster Coordinator',
+clusterCoordinator: 'Cluster Coordinator',
 urls: {
 cluster: '../nifi-api/controller/cluster',
-nodes: '../nifi-api/controller/cluster/nodes'
-}
+nodes: '../nifi-api/controller/cluster/nodes',
+systemDiagnostics: '../nifi-api/system-diagnostics'
+},
+data: [{
+name: 'cluster',
+update: refreshClusterData
+},{
+name: 'systemDiagnostics',
+update: refreshSystemDiagnosticsData
+}
+]
 };
 
+var commonTableOptions = {
+forceFitColumns: true,
+enableTextSelectionOnCells: true,
+enableCellNavigation: false,
+enableColumnReorder: false,
+autoEdit: false,
+rowHeight: 24
+};
+
+var nodesTab =  {
+name: 'Nodes',
+data: {
+dataSet: 'cluster',
+update: updateNodesTableData
+},
+tabContentId: 'cluster-nodes-tab-content',
+tableId: 'cluster-nodes-table',
+tableColumnModel: createNodeTableColumnModel,
+tableIdColumn: 'nodeId',
+tableOptions: commonTableOptions,
+tableOnClick: nodesTableOnClick,
+init: commonTableInit,
+onSort: sort,
+onTabSelected: onSelectTab,
+filterOptions: [{
+text: 'by address',
+value: 'address'
+}, {
+text: 'by status',
+value: 'status'
+}]
+};
+
+var jvmTab = {
+name: 'JVM',
+data: {
+dataSet: 'systemDiagnostics',
+update: updateJvmTableData
+},
+tabContentId: 'cluster-jvm-tab-content',
+tableId: 'cluster-jvm-table',
+tableColumnModel: [
+{id: 'node', field: 'node', name: 'Node Address', sortable: 
true, resizable: true},
+{id: 'heapMax', field: 'maxHeap', name: 'Heap Max', sortable: 
true, resizable: true, cssClass: 'cell-right', headerCssClass: 'header-right'},
+{id: 'heapTotal', field: 'totalHeap', name: 'Heap Total', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'heapUsed', field: 'usedHeap', name: 'Heap Used', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'heapUtilPct', field: 'heapUtilization', name: 'Heap 
Utilization', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'},
+{id: 'nonHeapTotal', field: 'totalNonHeap', name: 'Non-Heap 
Total', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'},
+{id: 'nonHeapUsed', field: 'usedNonHeap', name: 'Non-Heap 
Used', sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'gcOldGen', field: 'gcOldGen', name: 'G1 Old Generation', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'gcNewGen', field: 'gcNewGen', name: 'G1 Young 
Generation', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'}
+],
+tableIdColumn: 'id',
+tableOptions: commonTableOptions,
+tableOnClick: null,
+init: commonTableInit,
+onSort: sort,
+onTabSelected: onSelectTab,
+filterOptions: [{
+text: 'by address',
+value: 'address'
+}]
+};
+
+var systemTab = {
+name: 'System',
+data: {
+dataSet: 'systemDiagnostics',
+update: updateSystemTableData
+},
+tabContentId: 'cluster-system-tab-content',
+tableId: 'cluster-system-table',
+tableColumnModel: [
+{id: 'node', field: 'node', name: 'Node Address', sortable: 
true, resizable: true},
 

[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-21 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15511233#comment-15511233
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user jvwing commented on a diff in the pull request:

https://github.com/apache/nifi/pull/1042#discussion_r79936555
  
--- Diff: 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
 ---
@@ -377,190 +952,45 @@ nf.ClusterTable = (function () {
 nf.ClusterTable.resetTableSize();
 });
 
-// define a custom formatter for the more details column
-var moreDetailsFormatter = function (row, cell, value, 
columnDef, dataContext) {
-return '';
-};
-
-// define a custom formatter for the run status column
-var nodeFormatter = function (row, cell, value, columnDef, 
dataContext) {
-return formatNodeAddress(dataContext);
-};
-
-// function for formatting the last accessed time
-var valueFormatter = function (row, cell, value, columnDef, 
dataContext) {
-return nf.Common.formatValue(value);
-};
-
-// define a custom formatter for the status column
-var statusFormatter = function (row, cell, value, columnDef, 
dataContext) {
-var markup = value;
-if (dataContext.roles.includes(config.primaryNode)) {
-value += ', PRIMARY';
-}
-if (dataContext.roles.includes(config.clusterCoorindator)) 
{
-value += ', COORDINATOR';
-}
-return value;
-};
-
-var columnModel = [
-{id: 'moreDetails', name: '', sortable: false, 
resizable: false, formatter: moreDetailsFormatter, width: 50, maxWidth: 50},
-{id: 'node', field: 'node', name: 'Node Address', 
formatter: nodeFormatter, resizable: true, sortable: true},
-{id: 'activeThreadCount', field: 'activeThreadCount', 
name: 'Active Thread Count', resizable: true, sortable: true, defaultSortAsc: 
false},
-{id: 'queued', field: 'queued', name: 'Queue/Size', resizable: true, sortable: true, 
defaultSortAsc: false},
-{id: 'status', field: 'status', name: 'Status', formatter: 
statusFormatter, resizable: true, sortable: true},
-{id: 'uptime', field: 'nodeStartTime', name: 'Uptime', 
formatter: valueFormatter, resizable: true, sortable: true, defaultSortAsc: 
false},
-{id: 'heartbeat', field: 'heartbeat', name: 'Last 
Heartbeat', formatter: valueFormatter, resizable: true, sortable: true, 
defaultSortAsc: false}
-];
-
-// only allow the admin to modify the cluster
-if (nf.Common.canModifyController()) {
-// function for formatting the actions column
-var actionFormatter = function (row, cell, value, 
columnDef, dataContext) {
-var canDisconnect = false;
-var canConnect = false;
-
-// determine the current status
-if (dataContext.status === 'CONNECTED' || 
dataContext.status === 'CONNECTING') {
-canDisconnect = true;
-} else if (dataContext.status === 'DISCONNECTED') {
-canConnect = true;
-}
-
-// return the appropriate markup
-if (canConnect) {
-return '';
-} else if (canDisconnect) {
-return '';
-} else {
-return '';
-}
-};
-
-columnModel.push({id: 'actions', label: '', 
formatter: actionFormatter, resizable: false, sortable: false, width: 80, 
maxWidth: 80});
-}
-
-var clusterOptions = {
-forceFitColumns: true,
-enableTextSelectionOnCells: true,
-enableCellNavigation: false,
-enableColumnReorder: false,
-autoEdit: false,
-rowHeight: 24
-};
-
-// initialize the dataview
-var clusterData = new Slick.Data.DataView({
-inlineFilters: false
-});
-clusterData.setItems([], 'nodeId');
-clusterData.setFilterArgs({
-searchString: 

[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-21 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15510782#comment-15510782
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on a diff in the pull request:

https://github.com/apache/nifi/pull/1042#discussion_r79894191
  
--- Diff: 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
 ---
@@ -24,13 +24,275 @@ nf.ClusterTable = (function () {
  */
 var config = {
 primaryNode: 'Primary Node',
-clusterCoorindator: 'Cluster Coordinator',
+clusterCoordinator: 'Cluster Coordinator',
 urls: {
 cluster: '../nifi-api/controller/cluster',
-nodes: '../nifi-api/controller/cluster/nodes'
-}
+nodes: '../nifi-api/controller/cluster/nodes',
+systemDiagnostics: '../nifi-api/system-diagnostics'
+},
+data: [{
+name: 'cluster',
+update: refreshClusterData
+},{
+name: 'systemDiagnostics',
+update: refreshSystemDiagnosticsData
+}
+]
 };
 
+var commonTableOptions = {
+forceFitColumns: true,
+enableTextSelectionOnCells: true,
+enableCellNavigation: false,
+enableColumnReorder: false,
+autoEdit: false,
+rowHeight: 24
+};
+
+var nodesTab =  {
+name: 'Nodes',
+data: {
+dataSet: 'cluster',
+update: updateNodesTableData
+},
+tabContentId: 'cluster-nodes-tab-content',
+tableId: 'cluster-nodes-table',
+tableColumnModel: createNodeTableColumnModel,
+tableIdColumn: 'nodeId',
+tableOptions: commonTableOptions,
+tableOnClick: nodesTableOnClick,
+init: commonTableInit,
+onSort: sort,
+onTabSelected: onSelectTab,
+filterOptions: [{
+text: 'by address',
+value: 'address'
+}, {
+text: 'by status',
+value: 'status'
+}]
+};
+
+var jvmTab = {
+name: 'JVM',
+data: {
+dataSet: 'systemDiagnostics',
+update: updateJvmTableData
+},
+tabContentId: 'cluster-jvm-tab-content',
+tableId: 'cluster-jvm-table',
+tableColumnModel: [
+{id: 'node', field: 'node', name: 'Node Address', sortable: 
true, resizable: true},
+{id: 'heapMax', field: 'maxHeap', name: 'Heap Max', sortable: 
true, resizable: true, cssClass: 'cell-right', headerCssClass: 'header-right'},
+{id: 'heapTotal', field: 'totalHeap', name: 'Heap Total', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'heapUsed', field: 'usedHeap', name: 'Heap Used', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'heapUtilPct', field: 'heapUtilization', name: 'Heap 
Utilization', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'},
+{id: 'nonHeapTotal', field: 'totalNonHeap', name: 'Non-Heap 
Total', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'},
+{id: 'nonHeapUsed', field: 'usedNonHeap', name: 'Non-Heap 
Used', sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'gcOldGen', field: 'gcOldGen', name: 'G1 Old Generation', 
sortable: true, resizable: true, cssClass: 'cell-right', headerCssClass: 
'header-right'},
+{id: 'gcNewGen', field: 'gcNewGen', name: 'G1 Young 
Generation', sortable: true, resizable: true, cssClass: 'cell-right', 
headerCssClass: 'header-right'}
+],
+tableIdColumn: 'id',
+tableOptions: commonTableOptions,
+tableOnClick: null,
+init: commonTableInit,
+onSort: sort,
+onTabSelected: onSelectTab,
+filterOptions: [{
+text: 'by address',
+value: 'address'
+}]
+};
+
+var systemTab = {
+name: 'System',
+data: {
+dataSet: 'systemDiagnostics',
+update: updateSystemTableData
+},
+tabContentId: 'cluster-system-tab-content',
+tableId: 'cluster-system-table',
+tableColumnModel: [
+{id: 'node', field: 'node', name: 'Node Address', sortable: 
true, resizable: 

[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-21 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15510783#comment-15510783
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

Github user mcgilman commented on a diff in the pull request:

https://github.com/apache/nifi/pull/1042#discussion_r79892940
  
--- Diff: 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
 ---
@@ -377,190 +952,45 @@ nf.ClusterTable = (function () {
 nf.ClusterTable.resetTableSize();
 });
 
-// define a custom formatter for the more details column
-var moreDetailsFormatter = function (row, cell, value, 
columnDef, dataContext) {
-return '';
-};
-
-// define a custom formatter for the run status column
-var nodeFormatter = function (row, cell, value, columnDef, 
dataContext) {
-return formatNodeAddress(dataContext);
-};
-
-// function for formatting the last accessed time
-var valueFormatter = function (row, cell, value, columnDef, 
dataContext) {
-return nf.Common.formatValue(value);
-};
-
-// define a custom formatter for the status column
-var statusFormatter = function (row, cell, value, columnDef, 
dataContext) {
-var markup = value;
-if (dataContext.roles.includes(config.primaryNode)) {
-value += ', PRIMARY';
-}
-if (dataContext.roles.includes(config.clusterCoorindator)) 
{
-value += ', COORDINATOR';
-}
-return value;
-};
-
-var columnModel = [
-{id: 'moreDetails', name: '', sortable: false, 
resizable: false, formatter: moreDetailsFormatter, width: 50, maxWidth: 50},
-{id: 'node', field: 'node', name: 'Node Address', 
formatter: nodeFormatter, resizable: true, sortable: true},
-{id: 'activeThreadCount', field: 'activeThreadCount', 
name: 'Active Thread Count', resizable: true, sortable: true, defaultSortAsc: 
false},
-{id: 'queued', field: 'queued', name: 'Queue/Size', resizable: true, sortable: true, 
defaultSortAsc: false},
-{id: 'status', field: 'status', name: 'Status', formatter: 
statusFormatter, resizable: true, sortable: true},
-{id: 'uptime', field: 'nodeStartTime', name: 'Uptime', 
formatter: valueFormatter, resizable: true, sortable: true, defaultSortAsc: 
false},
-{id: 'heartbeat', field: 'heartbeat', name: 'Last 
Heartbeat', formatter: valueFormatter, resizable: true, sortable: true, 
defaultSortAsc: false}
-];
-
-// only allow the admin to modify the cluster
-if (nf.Common.canModifyController()) {
-// function for formatting the actions column
-var actionFormatter = function (row, cell, value, 
columnDef, dataContext) {
-var canDisconnect = false;
-var canConnect = false;
-
-// determine the current status
-if (dataContext.status === 'CONNECTED' || 
dataContext.status === 'CONNECTING') {
-canDisconnect = true;
-} else if (dataContext.status === 'DISCONNECTED') {
-canConnect = true;
-}
-
-// return the appropriate markup
-if (canConnect) {
-return '';
-} else if (canDisconnect) {
-return '';
-} else {
-return '';
-}
-};
-
-columnModel.push({id: 'actions', label: '', 
formatter: actionFormatter, resizable: false, sortable: false, width: 80, 
maxWidth: 80});
-}
-
-var clusterOptions = {
-forceFitColumns: true,
-enableTextSelectionOnCells: true,
-enableCellNavigation: false,
-enableColumnReorder: false,
-autoEdit: false,
-rowHeight: 24
-};
-
-// initialize the dataview
-var clusterData = new Slick.Data.DataView({
-inlineFilters: false
-});
-clusterData.setItems([], 'nodeId');
-clusterData.setFilterArgs({
-searchString: 

[jira] [Commented] (NIFI-2795) Enhance Cluster UI with System Diagnostics

2016-09-21 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/NIFI-2795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15510474#comment-15510474
 ] 

ASF GitHub Bot commented on NIFI-2795:
--

GitHub user jvwing opened a pull request:

https://github.com/apache/nifi/pull/1042

NIFI-2795 Sys Diagnostics in Cluster UI

Reworked the existing cluster UI to provide tabs containing multiple data 
tables.  Added views for System, JVM, FlowFile Storage and Content Storage 
diagnostics.  This is a UI-only change built on top of the existing System 
Diagnostics API.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/jvwing/nifi NIFI-2795-cluster-ui-sysdiag-3

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/nifi/pull/1042.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1042


commit 596d4e933a9547a6af3358840bf5a0fbf762d6da
Author: James Wing 
Date:   2016-09-19T01:06:12Z

NIFI-2795 Sys Diagnostics in Cluster UI




> Enhance Cluster UI with System Diagnostics
> --
>
> Key: NIFI-2795
> URL: https://issues.apache.org/jira/browse/NIFI-2795
> Project: Apache NiFi
>  Issue Type: New Feature
>  Components: Core UI
>Affects Versions: 1.0.0
>Reporter: James Wing
>Priority: Minor
>
> The Cluster UI currently provides some basic information on each node in the 
> cluster and options for connecting and disconnecting nodes. I propose to add 
> system diagnostics information in tables, contained in multiple tabs.  
> Roughly, the tabs should cover the same content as the System Diagnostics 
> dialog already in the System UI, but in a tabular format for comparing across 
> nodes.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)