AMBARI-19543. Re-order rows in HDFS-TopN Grafana Dashboard. (Vivek Subramanian via yusaku)

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json

@@ -44,7 +44,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 0,
+          "fill": 1,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -57,72 +57,54 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 3,
+          "id": 5,
           "isNew": true,
           "legend": {
-            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": false
           },
-          "lines": false,
+          "lines": true,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 1,
-          "points": true,
+          "pointradius": 5,
+          "points": false,
           "renderer": "flot",
-          "seriesOverrides": [
-            {
-              "alias": "Total Count",
-              "lines": true
-            }
-          ],
+          "seriesOverrides": [],
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "avg",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=60000.op=*.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
-            },
-            {
-              "aggregator": "none",
-              "alias": "operation by user",
-              "app": "namenode",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=60000.op=__%.user=%",
-              "precision": "default",
-              "refId": "B",
-              "seriesAggregator": "none",
-              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Operations by User - 1min Sliding Window",
+          "title": "TopN - Total Operations Count - 1min Sliding Window",
           "tooltip": {
-            "shared": false,
-            "value_type": "individual"
+            "shared": true,
+            "value_type": "cumulative"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "none",
+            "short",
             "short"
           ]
         },
@@ -132,7 +114,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 0,
+          "fill": 1,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -145,72 +127,54 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 7,
+          "id": 9,
           "isNew": true,
           "legend": {
-            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": false
           },
-          "lines": false,
+          "lines": true,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 1,
-          "points": true,
+          "pointradius": 5,
+          "points": false,
           "renderer": "flot",
-          "seriesOverrides": [
-            {
-              "alias": "Total Count",
-              "lines": true
-            }
-          ],
+          "seriesOverrides": [],
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "avg",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=300000.op=*.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
-            },
-            {
-              "aggregator": "none",
-              "alias": "operation by user",
-              "app": "namenode",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=300000.op=__%.user=%",
-              "precision": "default",
-              "refId": "B",
-              "seriesAggregator": "none",
-              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Operations by User - 5min Sliding Window",
+          "title": "TopN - Total Operations Count - 5min Sliding Window",
           "tooltip": {
-            "shared": false,
-            "value_type": "individual"
+            "shared": true,
+            "value_type": "cumulative"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "none",
+            "short",
             "short"
           ]
         },
@@ -220,7 +184,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 0,
+          "fill": 1,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -233,78 +197,60 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 8,
+          "id": 10,
           "isNew": true,
           "legend": {
-            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": false
           },
-          "lines": false,
+          "lines": true,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 1,
-          "points": true,
+          "pointradius": 5,
+          "points": false,
           "renderer": "flot",
-          "seriesOverrides": [
-            {
-              "alias": "Total Count",
-              "lines": true
-            }
-          ],
+          "seriesOverrides": [],
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "avg",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
-            },
-            {
-              "aggregator": "none",
-              "alias": "operation by user",
-              "app": "namenode",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=__%.user=%",
-              "precision": "default",
-              "refId": "B",
-              "seriesAggregator": "none",
-              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Operations by User - 25min Sliding Window",
+          "title": "TopN - Total Operations Count - 25min Sliding Window",
           "tooltip": {
-            "shared": false,
-            "value_type": "individual"
+            "shared": true,
+            "value_type": "cumulative"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "none",
+            "short",
             "short"
           ]
         }
       ],
       "showTitle": true,
-      "title": "TopN - Operations By User"
+      "title": "TopN - Operations Count"
     },
     {
       "collapse": false,
@@ -330,7 +276,7 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 5,
+          "id": 6,
           "isNew": true,
           "legend": {
             "avg": false,
@@ -355,11 +301,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "none",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -368,7 +314,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count - 1min Sliding Window",
+          "title": "TopN - Total Operations Count by User - 1min Sliding Window",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -400,7 +346,7 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 9,
+          "id": 11,
           "isNew": true,
           "legend": {
             "avg": false,
@@ -425,11 +371,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "none",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -438,7 +384,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count - 5min Sliding Window",
+          "title": "TopN - Total Operations Count by User - 5min Sliding Window",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -470,7 +416,7 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 10,
+          "id": 12,
           "isNew": true,
           "legend": {
             "avg": false,
@@ -495,11 +441,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "none",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -508,7 +454,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count - 25min Sliding Window",
+          "title": "TopN - Total Operations Count by User - 25min Sliding Window",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -523,7 +469,7 @@
         }
       ],
       "showTitle": true,
-      "title": "TopN - Operations Count"
+      "title": "TOPN - Total Operations Count by User"
     },
     {
       "collapse": false,
@@ -536,7 +482,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 1,
+          "fill": 0,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -549,54 +495,72 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 6,
+          "id": 3,
           "isNew": true,
           "legend": {
+            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
-          "lines": true,
+          "lines": false,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 5,
-          "points": false,
+          "pointradius": 1,
+          "points": true,
           "renderer": "flot",
-          "seriesOverrides": [],
+          "seriesOverrides": [
+            {
+              "alias": "Total Count",
+              "lines": true
+            }
+          ],
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "none",
+              "aggregator": "max",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=60000.op=*.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
+            },
+            {
+              "aggregator": "none",
+              "alias": "operation by user",
+              "app": "namenode",
+              "downsampleAggregator": "avg",
+              "errors": {},
+              "metric": "dfs.NNTopUserOpCounts.windowMs=60000.op=__%.user=%",
+              "precision": "default",
+              "refId": "B",
+              "seriesAggregator": "none",
+              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count by User - 1min Sliding Window",
+          "title": "TopN - Operations by User - 1min Sliding Window",
           "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
+            "shared": false,
+            "value_type": "individual"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "none",
             "short"
           ]
         },
@@ -606,7 +570,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 1,
+          "fill": 0,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -619,54 +583,72 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 11,
+          "id": 7,
           "isNew": true,
           "legend": {
+            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
-          "lines": true,
+          "lines": false,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 5,
-          "points": false,
+          "pointradius": 1,
+          "points": true,
           "renderer": "flot",
-          "seriesOverrides": [],
+          "seriesOverrides": [
+            {
+              "alias": "Total Count",
+              "lines": true
+            }
+          ],
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "none",
+              "aggregator": "max",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=300000.op=*.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
+            },
+            {
+              "aggregator": "none",
+              "alias": "operation by user",
+              "app": "namenode",
+              "downsampleAggregator": "avg",
+              "errors": {},
+              "metric": "dfs.NNTopUserOpCounts.windowMs=300000.op=__%.user=%",
+              "precision": "default",
+              "refId": "B",
+              "seriesAggregator": "none",
+              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count by User - 5min Sliding Window",
+          "title": "TopN - Operations by User - 5min Sliding Window",
           "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
+            "shared": false,
+            "value_type": "individual"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "none",
             "short"
           ]
         },
@@ -676,7 +658,7 @@
           "datasource": null,
           "editable": true,
           "error": false,
-          "fill": 1,
+          "fill": 0,
           "grid": {
             "leftLogBase": 1,
             "leftMax": null,
@@ -689,60 +671,78 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 12,
+          "id": 8,
           "isNew": true,
           "legend": {
+            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
-          "lines": true,
+          "lines": false,
           "linewidth": 2,
           "links": [],
           "nullPointMode": "connected",
           "percentage": false,
-          "pointradius": 5,
-          "points": false,
+          "pointradius": 1,
+          "points": true,
           "renderer": "flot",
-          "seriesOverrides": [],
+          "seriesOverrides": [
+            {
+              "alias": "Total Count",
+              "lines": true
+            }
+          ],
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "none",
+              "aggregator": "max",
               "app": "namenode",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count",
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=*.TotalCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
               "transform": "none"
+            },
+            {
+              "aggregator": "none",
+              "alias": "operation by user",
+              "app": "namenode",
+              "downsampleAggregator": "avg",
+              "errors": {},
+              "metric": "dfs.NNTopUserOpCounts.windowMs=1500000.op=__%.user=%",
+              "precision": "default",
+              "refId": "B",
+              "seriesAggregator": "none",
+              "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TopN - Total Operations Count by User - 25min Sliding Window",
+          "title": "TopN - Operations by User - 25min Sliding Window",
           "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
+            "shared": false,
+            "value_type": "individual"
           },
           "type": "graph",
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "none",
             "short"
           ]
         }
       ],
       "showTitle": true,
-      "title": "TOPN - Total Operations Count by User"
+      "title": "TopN - Operations By User"
     }
   ],
   "time": {