AMBARI-15695. Updated Grafana Dashboards. (Prajwal Rao via yusaku)

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json

@@ -190,7 +190,7 @@
           },
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "sum",
               "app": "hbase",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -2510,7 +2510,7 @@
     }
   ],
   "time": {
-    "from": "now-1h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json

@@ -1580,7 +1580,7 @@
     }
   ],
   "time": {
-    "from": "now-1h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json

@@ -8964,7 +8964,7 @@
     }
   ],
   "time": {
-    "from": "now-30m",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {

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

@@ -1715,7 +1715,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1784,7 +1784,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-home.json

@@ -1549,7 +1549,7 @@
         }
       ],
       "showTitle": true,
-      "title": "Network Packages"
+      "title": "Network Packets"
     },
     {
       "collapse": true,
@@ -1716,7 +1716,7 @@
     }
   ],
   "time": {
-    "from": "now-1h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json

@@ -1967,7 +1967,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -2038,7 +2038,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -2084,7 +2084,7 @@
         }
       ],
       "showTitle": true,
-      "title": "Network Packages"
+      "title": "Network Packets"
     },
     {
       "collapse": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-applications.json

@@ -12,25 +12,25 @@
   "sharedCrosshair": false,
   "rows": [
     {
-      "title": "New row",
-      "height": "25px",
-      "editable": true,
       "collapse": false,
+      "editable": true,
+      "height": "25px",
       "panels": [
         {
-          "title": "",
-          "error": false,
-          "span": 12,
+          "content": "<h4 align=\"center\">Metrics to see the status of Applications on the YARN cluster. </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
           "editable": true,
-          "type": "text",
-          "isNew": true,
+          "error": false,
           "id": 7,
+          "isNew": true,
+          "links": [],
           "mode": "html",
-          "content": "<h4 align=\"center\">Metrics to see the status of Applications on the YARN cluster. </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
+          "span": 12,
           "style": {},
-          "links": []
+          "title": "",
+          "type": "text"
         }
-      ]
+      ],
+      "title": "New row"
     },
     {
       "collapse": false,
@@ -204,18 +204,18 @@
             },
             {
               "aggregator": "max",
-              "alias": "Completed Apps",
+              "alias": "Pending Apps",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.QueueMetrics.Queue=root.AppsCompleted",
+              "metric": "yarn.QueueMetrics.Queue=root.AppsPending",
               "precision": "",
               "refId": "B"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Apps Running vs Completed",
+          "title": "Apps Running vs Pending",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -273,30 +273,33 @@
           "targets": [
             {
               "aggregator": "max",
-              "alias": "Pending Apps",
+              "alias": "Submitted Apps",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
               "hide": false,
               "hosts": "",
-              "metric": "yarn.QueueMetrics.Queue=root.AppsPending",
+              "metric": "yarn.QueueMetrics.Queue=root.AppsSubmitted",
               "precision": "",
-              "refId": "A"
+              "refId": "A",
+              "shouldAddPrecision": false,
+              "shouldComputeRate": false
             },
             {
               "aggregator": "max",
-              "alias": "Submitted Apps",
+              "alias": "Completed Apps",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.QueueMetrics.Queue=root.AppsSubmitted",
+              "metric": "yarn.QueueMetrics.Queue=root.AppsCompleted",
               "precision": "",
-              "refId": "B"
+              "refId": "B",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Apps Submitted vs Pending",
+          "title": "Apps Submitted vs Completed",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -361,7 +364,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Avg AM Launch Delay",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
@@ -432,7 +435,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Avg AM Register Delay",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
@@ -464,7 +467,7 @@
     }
   ],
   "time": {
-    "from": "now-7d",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {
@@ -501,7 +504,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 16,
+  "version": 5,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json

@@ -586,7 +586,7 @@
     }
   ],
   "time": {
-    "from": "now-1h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {
@@ -623,7 +623,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 96,
+  "version": 5,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-jobhistoryserver.json

@@ -237,7 +237,7 @@
               "refId": "B"
             },
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Heap Committed",
               "app": "jobhistoryserver",
               "downsampleAggregator": "avg",
@@ -351,6 +351,7 @@
     "to": "now"
   },
   "timepicker": {
+    "now": true,
     "refresh_intervals": [
       "5s",
       "10s",
@@ -382,7 +383,7 @@
     "list": []
   },
   "schemaVersion": 8,
-  "version": 9,
+  "version": 2,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-nodemanagers.json

@@ -650,7 +650,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -950,7 +950,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1169,7 +1169,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1676,7 +1676,7 @@
     "list": []
   },
   "schemaVersion": 8,
-  "version": 57,
+  "version": 3,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-queues.json

@@ -12,25 +12,25 @@
   "sharedCrosshair": false,
   "rows": [
     {
-      "title": "New row",
-      "height": "25px",
-      "editable": true,
       "collapse": false,
+      "editable": true,
+      "height": "25px",
       "panels": [
         {
-          "title": "",
-          "error": false,
-          "span": 12,
+          "content": "<h4 align=\"center\">Metrics to see the status of Queues on the YARN cluster. You can select, one, multiple or all queues using the dropdown on the left(above this message). </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
           "editable": true,
-          "type": "text",
-          "isNew": true,
+          "error": false,
           "id": 25,
+          "isNew": true,
+          "links": [],
           "mode": "html",
-          "content": "<h4 align=\"center\">Metrics to see the status of Queues on the YARN cluster. You can select, one, multiple or all queues using the dropdown on the left(above this message). </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
+          "span": 12,
           "style": {},
-          "links": []
+          "title": "",
+          "type": "text"
         }
-      ]
+      ],
+      "title": "New row"
     },
     {
       "collapse": true,
@@ -90,7 +90,9 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AppsRunning",
-              "refId": "A"
+              "refId": "A",
+              "shouldAddPrecision": false,
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -152,7 +154,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Apps Pending",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
@@ -232,7 +234,9 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AppsCompleted",
-              "refId": "A"
+              "refId": "A",
+              "shouldAddPrecision": false,
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -303,7 +307,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AppsFailed",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -365,7 +370,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Apps Killed",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
@@ -374,7 +379,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AppsKilled",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -445,7 +451,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AppsSubmitted",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -521,10 +528,10 @@
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.QueueMetrics.Queue=root.AggregateContainersAllocated",
+              "metric": "yarn.QueueMetrics.Queue=root.AllocatedContainers",
               "precision": "",
               "qmetric": "root.default",
-              "queue": "yarn.QueueMetrics.Queue=root.default.AggregateContainersAllocated",
+              "queue": "yarn.QueueMetrics.Queue=root.default.AllocatedContainers",
               "refId": "A"
             }
           ],
@@ -739,7 +746,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AggregateContainersAllocated",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -796,13 +804,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "aggregator": "max",
-              "alias": "Total Node Local Containers Allocated",
+              "alias": "Node Local Containers Allocated",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -810,7 +818,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AggregateNodeLocalContainersAllocated",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -867,13 +876,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "aggregator": "max",
-              "alias": "Total Rack Local Containers Allocated",
+              "alias": "Rack Local Containers Allocated",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -881,7 +890,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AggregateRackLocalContainersAllocated",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -938,13 +948,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
-              "alias": "Total OffSwitch Containers Allocated",
+              "aggregator": "max",
+              "alias": "OffSwitch Containers Allocated",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -952,7 +962,8 @@
               "precision": "",
               "qmetric": "root.default",
               "queue": "yarn.QueueMetrics.Queue=root.default.AggregateOffSwitchContainersAllocated",
-              "refId": "A"
+              "refId": "A",
+              "shouldComputeRate": false
             }
           ],
           "timeFrom": null,
@@ -1095,7 +1106,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "max",
               "alias": "Pending Memory",
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
@@ -1326,10 +1337,10 @@
               "app": "resourcemanager",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.QueueMetrics.Queue=root.default.UsedAMResourceMB",
+              "metric": "yarn.QueueMetrics.Queue=root.UsedAMResourceMB",
               "precision": "",
               "qmetric": "root.default",
-              "queue": "yarn.QueueMetrics.Queue=root.default.default.UsedAMResourceMB",
+              "queue": "yarn.QueueMetrics.Queue=root.default.UsedAMResourceMB",
               "refId": "B"
             }
           ],
@@ -1435,8 +1446,8 @@
     }
   ],
   "time": {
-    "from": "2016-03-16T20:58:21.293Z",
-    "to": "2016-03-16T21:06:23.137Z"
+    "from": "now-6h",
+    "to": "now"
   },
   "timepicker": {
     "now": true,
@@ -1469,15 +1480,15 @@
       {
         "allFormat": "wildcard",
         "current": {
-          "text": "root",
-          "value": "root"
+          "text": "",
+          "value": ""
         },
         "datasource": null,
         "hideLabel": true,
         "includeAll": true,
         "multi": true,
         "multiFormat": "glob",
-        "name": "q",
+        "name": "queue",
         "options": [
           {
             "text": "All",
@@ -1497,7 +1508,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 81,
+  "version": 36,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-resourcemanagers.json

@@ -12,28 +12,28 @@
   "sharedCrosshair": false,
   "rows": [
     {
-      "title": "New row",
-      "height": "25px",
-      "editable": true,
       "collapse": false,
+      "editable": true,
+      "height": "25px",
       "panels": [
         {
-          "title": "",
-          "error": false,
-          "span": 12,
+          "content": "<h4 align=\"center\">Metrics to see the status of ResourceManagers on the YARN cluster. Click on each row title to expand on demand to look at various metrics. </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
           "editable": true,
-          "type": "text",
-          "isNew": true,
+          "error": false,
           "id": 12,
+          "isNew": true,
+          "links": [],
           "mode": "html",
-          "content": "<h4 align=\"center\">Metrics to see the status of ResourceManagers on the YARN cluster. Click on each row title to expand on demand to look at various metrics. </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari.  You may lose any changes made to this dashboard.  If you want to customize, make your own copy.</h6>",
+          "span": 12,
           "style": {},
-          "links": []
+          "title": "",
+          "type": "text"
         }
-      ]
+      ],
+      "title": "New row"
     },
     {
-      "collapse": false,
+      "collapse": true,
       "editable": true,
       "height": "250px",
       "panels": [
@@ -835,7 +835,7 @@
     }
   ],
   "time": {
-    "from": "now-24h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {
@@ -919,7 +919,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 39,
+  "version": 9,
   "links": [
     {
       "asDropdown": true,

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json

@@ -125,7 +125,7 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 2,
+          "id": 3,
           "isNew": true,
           "legend": {
             "avg": false,
@@ -154,14 +154,14 @@
               "app": "applicationhistoryserver",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.TimelineDataManagerMetrics.PostEntitiesTotal",
+              "metric": "yarn.TimelineDataManagerMetrics.GetEntitiesTimeAvgTime",
               "precision": "",
               "refId": "A"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Timeline Entity Data Write",
+          "title": "Timeline Entity Data Read time",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -170,12 +170,13 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ms",
             "short"
           ]
         }
       ],
-      "title": "Row"
+      "showTitle": true,
+      "title": "Data Reads"
     },
     {
       "collapse": false,
@@ -201,7 +202,7 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 3,
+          "id": 2,
           "isNew": true,
           "legend": {
             "avg": false,
@@ -230,14 +231,14 @@
               "app": "applicationhistoryserver",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "yarn.TimelineDataManagerMetrics.GetEntitiesTimeAvgTime",
+              "metric": "yarn.TimelineDataManagerMetrics.PostEntitiesTotal",
               "precision": "",
               "refId": "A"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Timeline Entity Data Read time",
+          "title": "Timeline Entity Data Write",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -246,7 +247,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "ms",
+            "short",
             "short"
           ]
         },
@@ -319,7 +320,8 @@
           ]
         }
       ],
-      "title": "New row"
+      "showTitle": true,
+      "title": "Data Writes"
     }
   ],
   "time": {
@@ -358,7 +360,7 @@
     "list": []
   },
   "schemaVersion": 8,
-  "version": 16,
+  "version": 5,
   "links": [
     {
       "asDropdown": true,