AMBARI-15892 : Incorrect (Negative) values are shown for memory metrics (avijayan)

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java

@@ -434,7 +434,7 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog {
     Map<String, String> sectionLayoutMap = new HashMap<>();
 
     List<String> hdfsSummaryWidgets = new ArrayList<>(Arrays.asList("NameNode RPC", "NN Connection Load",
-      "NameNode GC count", "NameNode GC time"));
+      "NameNode GC count", "NameNode GC time", "NameNode Host Load"));
     widgetMap.put("HDFS_SUMMARY", hdfsSummaryWidgets);
     sectionLayoutMap.put("HDFS_SUMMARY", "default_hdfs_dashboard");
 

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json

@@ -196,13 +196,6 @@
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
-            },
-            {
-              "name": "mem_cached",
-              "metric_path": "metrics/memory/mem_cached",
-              "service_name": "HDFS",
-              "component_name": "NAMENODE",
-              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
             }
           ],
           "values": [
@@ -212,7 +205,7 @@
             },
             {
               "name": "Memory utilization",
-              "value": "${((mem_total - mem_free - mem_cached)/mem_total) * 100}"
+              "value": "${((mem_total - mem_free)/mem_total) * 100}"
             }
           ],
           "properties": {

ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json

@@ -196,13 +196,6 @@
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
-            },
-            {
-              "name": "mem_cached",
-              "metric_path": "metrics/memory/mem_cached",
-              "service_name": "HDFS",
-              "component_name": "NAMENODE",
-              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
             }
           ],
           "values": [
@@ -212,7 +205,7 @@
             },
             {
               "name": "Memory utilization",
-              "value": "${((mem_total - mem_free - mem_cached)/mem_total) * 100}"
+              "value": "${((mem_total - mem_free)/mem_total) * 100}"
             }
           ],
           "properties": {