Ver código fonte

AMBARI-1059. Refactor cluster management. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418956 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 anos atrás
pai
commit
8bf2881008
96 arquivos alterados com 3352 adições e 2147 exclusões
  1. 17 0
      ambari-web/app/assets/data/apps/jobs2.json
  2. 3 1
      ambari-web/app/assets/data/apps/runs.json
  3. 82 0
      ambari-web/app/assets/data/apps/runs2.json
  4. 2018 0
      ambari-web/app/assets/data/dashboard/services_multi_hosts.json
  5. 52 121
      ambari-web/app/assets/data/wizard/stack/hdp/version01/HBASE.json
  6. 16 400
      ambari-web/app/assets/data/wizard/stack/hdp/version01/HDFS.json
  7. 77 24
      ambari-web/app/assets/data/wizard/stack/hdp/version01/HIVE.json
  8. 222 721
      ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json
  9. 0 247
      ambari-web/app/assets/data/wizard/stack/hdp/version01/OOZIE.json
  10. 22 24
      ambari-web/app/assets/data/wizard/stack/hdp/version01/ZOOKEEPER.json
  11. 10 4
      ambari-web/app/controllers/global/background_operations_controller.js
  12. 92 80
      ambari-web/app/controllers/global/cluster_controller.js
  13. 29 31
      ambari-web/app/controllers/installer.js
  14. 2 2
      ambari-web/app/controllers/main/admin/user.js
  15. 1 1
      ambari-web/app/controllers/main/apps/item_controller.js
  16. 3 1
      ambari-web/app/controllers/main/apps_controller.js
  17. 84 58
      ambari-web/app/controllers/main/host.js
  18. 2 10
      ambari-web/app/controllers/main/host/add_controller.js
  19. 2 2
      ambari-web/app/controllers/main/host/details.js
  20. 161 43
      ambari-web/app/controllers/main/service/add_controller.js
  21. 4 2
      ambari-web/app/controllers/main/service/info/configs.js
  22. 2 2
      ambari-web/app/controllers/main/service/item.js
  23. 7 3
      ambari-web/app/controllers/wizard/slave_component_groups_controller.js
  24. 3 2
      ambari-web/app/controllers/wizard/step10_controller.js
  25. 4 4
      ambari-web/app/controllers/wizard/step2_controller.js
  26. 2 2
      ambari-web/app/controllers/wizard/step3_controller.js
  27. 59 44
      ambari-web/app/controllers/wizard/step5_controller.js
  28. 31 16
      ambari-web/app/controllers/wizard/step6_controller.js
  29. 28 23
      ambari-web/app/controllers/wizard/step8_controller.js
  30. 9 7
      ambari-web/app/controllers/wizard/step9_controller.js
  31. 18 0
      ambari-web/app/data/config_mapping.js
  32. 1 3
      ambari-web/app/data/config_properties.js
  33. 4 0
      ambari-web/app/initialize.js
  34. 0 1
      ambari-web/app/mappers/jobs_mapper.js
  35. 11 6
      ambari-web/app/mappers/runs_mapper.js
  36. 111 90
      ambari-web/app/mappers/services_mapper.js
  37. 0 4
      ambari-web/app/messages.js
  38. 1 0
      ambari-web/app/models/component.js
  39. 1 1
      ambari-web/app/models/host_component.js
  40. 3 7
      ambari-web/app/models/service.js
  41. 3 0
      ambari-web/app/models/service_config.js
  42. 6 3
      ambari-web/app/router.js
  43. 10 4
      ambari-web/app/routes/add_service_routes.js
  44. 0 1
      ambari-web/app/routes/installer.js
  45. 8 3
      ambari-web/app/routes/main.js
  46. 2 1
      ambari-web/app/styles/application.less
  47. 0 1
      ambari-web/app/templates/main/apps/list_row.hbs
  48. 8 18
      ambari-web/app/templates/main/background_operations_popup.hbs
  49. 3 13
      ambari-web/app/templates/main/host.hbs
  50. 2 2
      ambari-web/app/templates/wizard/slave_component_hosts.hbs
  51. 2 2
      ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs
  52. 2 2
      ambari-web/app/templates/wizard/slave_hosts.hbs
  53. 5 5
      ambari-web/app/templates/wizard/step6.hbs
  54. 2 1
      ambari-web/app/utils/data_table.js
  55. 0 13
      ambari-web/app/utils/db.js
  56. 2 1
      ambari-web/app/utils/graph.js
  57. 6 6
      ambari-web/app/views/common/quick_view_link_view.js
  58. 23 12
      ambari-web/app/views/main/apps_view.js
  59. 11 12
      ambari-web/app/views/main/dashboard.js
  60. 1 1
      ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
  61. 1 1
      ambari-web/app/views/main/dashboard/cluster_metrics/load.js
  62. 1 1
      ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
  63. 1 1
      ambari-web/app/views/main/dashboard/cluster_metrics/network.js
  64. 10 11
      ambari-web/app/views/main/host.js
  65. 1 1
      ambari-web/app/views/main/host/metrics/cpu.js
  66. 1 1
      ambari-web/app/views/main/host/metrics/disk.js
  67. 1 1
      ambari-web/app/views/main/host/metrics/load.js
  68. 1 1
      ambari-web/app/views/main/host/metrics/memory.js
  69. 1 1
      ambari-web/app/views/main/host/metrics/network.js
  70. 1 1
      ambari-web/app/views/main/host/metrics/processes.js
  71. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
  72. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
  73. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
  74. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
  75. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
  76. 1 1
      ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
  77. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
  78. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
  79. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
  80. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/io.js
  81. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
  82. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
  83. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
  84. 1 1
      ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
  85. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
  86. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js
  87. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
  88. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
  89. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
  90. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
  91. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
  92. 1 1
      ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
  93. 12 11
      ambari-web/app/views/main/service/menu.js
  94. 2 2
      ambari-web/app/views/wizard/controls_view.js
  95. 6 3
      ambari-web/app/views/wizard/step6_view.js
  96. 1 1
      ambari-web/app/views/wizard/step9_view.js

+ 17 - 0
ambari-web/app/assets/data/apps/jobs2.json

@@ -0,0 +1,17 @@
+{"jobs": [
+  {
+    "confPath": "hdfs://ip-10-114-221-210\\.ec2\\.internal:8020/tmp/hadoop-mapred/mapred/staging/ambari_qa/\\.staging/job_201211151748_0001/job\\.xml",
+    "elapsedTime": 41103,
+    "inputBytes": 1777,
+    "jobId": "job_201211151748_0001",
+    "jobName": "word count",
+    "maps": 1,
+    "outputBytes": 1736,
+    "reduces": 1,
+    "status": "SUCCESS",
+    "submitTime": 1353019777592,
+    "userName": "ambari_qa",
+    "workflowEntityName": "X",
+    "workflowId": "mr_201211151748_0001"
+  }
+]}

+ 3 - 1
ambari-web/app/assets/data/apps/runs.json

@@ -20,7 +20,9 @@
       }
     },
     "workflowId": "mr_b6d5cc44-ac51-4ecd-92c7-2e477c2fbed6",
-    "workflowName": "script2-hadoop.pig"
+    "workflowName": "script2-hadoop.pig",
+    "inputBytes": 423423,
+    "outputBytes": 12434
   },
   {
     "elapsedTime": 892896,

+ 82 - 0
ambari-web/app/assets/data/apps/runs2.json

@@ -0,0 +1,82 @@
+{"workflows": [
+  {
+    "elapsedTime": 41293,
+    "inputBytes": 1777,
+    "numJobsCompleted": 1,
+    "numJobsTotal": 1,
+    "outputBytes": 1736,
+    "startTime": 1353019777592,
+    "userName": "ambari_qa",
+    "workflowContext": {
+      "workflowDag": {
+        "entries": [
+          {
+            "source": "X"
+          }
+        ]
+      }
+    },
+    "workflowId": "mr_201211151748_0001",
+    "workflowName": "word count"
+  },
+  {
+    "elapsedTime": 23328,
+    "inputBytes": 2021,
+    "numJobsCompleted": 1,
+    "numJobsTotal": 1,
+    "outputBytes": 232,
+    "startTime": 1353019849097,
+    "userName": "ambari_qa",
+    "workflowContext": {
+      "workflowDag": {
+        "entries": [
+          {
+            "source": "X"
+          }
+        ]
+      }
+    },
+    "workflowId": "mr_201211151748_0002",
+    "workflowName": "PigLatin:pigSmoke\\.sh"
+  },
+  {
+    "elapsedTime": 15471,
+    "inputBytes": 35660,
+    "numJobsCompleted": 1,
+    "numJobsTotal": 1,
+    "outputBytes": 35186,
+    "startTime": 1353019974736,
+    "userName": "ambari_qa",
+    "workflowContext": {
+      "workflowDag": {
+        "entries": [
+          {
+            "source": "X"
+          }
+        ]
+      }
+    },
+    "workflowId": "mr_201211151748_0003",
+    "workflowName": "oozie:launcher:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-121115175201831-oozie-oozi-W"
+  },
+  {
+    "elapsedTime": 30614,
+    "inputBytes": 1553,
+    "numJobsCompleted": 1,
+    "numJobsTotal": 1,
+    "outputBytes": 1547,
+    "startTime": 1353019985108,
+    "userName": "ambari_qa",
+    "workflowContext": {
+      "workflowDag": {
+        "entries": [
+          {
+            "source": "X"
+          }
+        ]
+      }
+    },
+    "workflowId": "mr_201211151748_0004",
+    "workflowName": "oozie:action:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-121115175201831-oozie-oozi-W"
+  }
+]}

+ 2018 - 0
ambari-web/app/assets/data/dashboard/services_multi_hosts.json

@@ -0,0 +1,2018 @@
+{
+  "href" : "http://ambari:8080/api/clusters/mycluster/services?fields=components/host_components/*",
+  "items" : [
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "MAPREDUCE"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "MAPREDUCE_CLIENT",
+            "service_name" : "MAPREDUCE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/MAPREDUCE_CLIENT",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "MAPREDUCE_CLIENT",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "MAPREDUCE_CLIENT",
+                    "service_name" : "MAPREDUCE"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "JOBTRACKER",
+            "service_name" : "MAPREDUCE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-102-239.ec2.internal/host_components/JOBTRACKER",
+              "HostRoles" : {
+                "configs" : "{\"mapred-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "JOBTRACKER",
+                "host_name" : "ip-10-204-102-239.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944348E9,
+                "process" : {
+                  "proc_total" : 233.130555556,
+                  "proc_run" : 1.67777777778
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0,
+                  "SentBytes" : 697.9075,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 2185.0375,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 6.5225,
+                  "RpcProcessingTime_num_ops" : 6.5225,
+                  "RpcProcessingTime_avg_time" : 0.0531117806688,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 0.05922430332
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "mapred" : {
+                  "Queue" : {
+                    "maps_killed" : 0.0,
+                    "reduces_killed" : 0.0,
+                    "jobs_failed" : 0.0,
+                    "reduces_completed" : 0.0,
+                    "running_0" : 0.0,
+                    "jobs_completed" : 0.0,
+                    "reserved_map_slots" : 0.0,
+                    "reduces_failed" : 0.0,
+                    "waiting_maps" : 0.0,
+                    "running_1440" : 0.0,
+                    "maps_completed" : 0.0,
+                    "jobs_preparing" : 0.0,
+                    "jobs_submitted" : 0.0,
+                    "reserved_reduce_slots" : 0.0,
+                    "jobs_running" : 0.0,
+                    "running_300" : 0.0,
+                    "maps_launched" : 0.0,
+                    "reduces_launched" : 0.0,
+                    "running_60" : 0.0,
+                    "waiting_reduces" : 0.0,
+                    "jobs_killed" : 0.0,
+                    "maps_failed" : 0.0
+                  },
+                  "jobtracker" : {
+                    "blacklisted_maps" : 0.0,
+                    "running_maps" : 0.0,
+                    "jobs_failed" : 0.0,
+                    "waiting_maps" : 0.0,
+                    "maps_completed" : 0.0,
+                    "trackers" : 2.0,
+                    "jobs_submitted" : 0.0,
+                    "map_slots" : 8.0,
+                    "reserved_reduce_slots" : 0.0,
+                    "trackers_graylisted" : 0.0,
+                    "heartbeats" : 6.5225,
+                    "jobs_running" : 0.0,
+                    "blacklisted_reduces" : 0.0,
+                    "maps_launched" : 0.0,
+                    "occupied_map_slots" : 0.0,
+                    "reduces_launched" : 0.0,
+                    "maps_failed" : 0.0,
+                    "jobs_killed" : 0.0,
+                    "maps_killed" : 0.0,
+                    "reduce_slots" : 4.0,
+                    "reduces_killed" : 0.0,
+                    "reduces_completed" : 0.0,
+                    "reduces_failed" : 0.0,
+                    "reserved_map_slots" : 0.0,
+                    "jobs_completed" : 0.0,
+                    "trackers_decommissioned" : 0.0,
+                    "trackers_blacklisted" : 0.0,
+                    "jobs_preparing" : 0.0,
+                    "running_reduces" : 0.0,
+                    "occupied_reduce_slots" : 0.0,
+                    "waiting_reduces" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.332,
+                  "part_max_used" : 48.3575
+                },
+                "cpu" : {
+                  "cpu_speed" : 2660.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.0958333333333,
+                  "cpu_idle" : 99.1786111111,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.425277777778,
+                  "cpu_user" : 0.321388888889
+                },
+                "rpcdetailed" : {
+                  "getStagingAreaDir_num_ops" : 0.0,
+                  "getJobProfile_num_ops" : 0.0,
+                  "getQueueAdmins_num_ops" : 0.0,
+                  "getNewJobId_num_ops" : 0.0,
+                  "submitJob_avg_time" : 136.0,
+                  "getJobCounters_num_ops" : 0.0,
+                  "getTaskCompletionEvents_avg_time" : 0.0,
+                  "getJobStatus_num_ops" : 0.0,
+                  "getJobCounters_avg_time" : 0.0,
+                  "getQueueAdmins_avg_time" : 0.0,
+                  "heartbeat_num_ops" : 6.5225,
+                  "getProtocolVersion_avg_time" : 0.0,
+                  "getBuildVersion_avg_time" : 0.0,
+                  "getReduceTaskReports_avg_time" : 0.0,
+                  "getBuildVersion_num_ops" : 0.0,
+                  "getNewJobId_avg_time" : 0.0,
+                  "getSystemDir_num_ops" : 0.0,
+                  "getReduceTaskReports_num_ops" : 0.0,
+                  "getTaskCompletionEvents_num_ops" : 0.0,
+                  "getJobProfile_avg_time" : 0.0,
+                  "submitJob_num_ops" : 0.0,
+                  "getStagingAreaDir_avg_time" : 1.0,
+                  "getProtocolVersion_num_ops" : 0.0,
+                  "getSystemDir_avg_time" : 0.0,
+                  "getMapTaskReports_num_ops" : 0.0,
+                  "getMapTaskReports_avg_time" : 1.0,
+                  "heartbeat_avg_time" : 0.0531117806688,
+                  "getJobStatus_avg_time" : 0.0
+                },
+                "load" : {
+                  "load_fifteen" : 0.0,
+                  "load_one" : 0.0,
+                  "load_five" : 0.0
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 185.1875,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 19.0,
+                  "gcCount" : 0.0,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 23.1875,
+                  "gcTimeMillis" : 0.0,
+                  "memNonHeapUsedM" : 22.0414801806,
+                  "logInfo" : 0.0,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 46.4608707,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 9.0,
+                  "threadsRunnable" : 6.0
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 59373.3777778,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 5225939.86667,
+                  "mem_cached" : 1506893.46667,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 24.3603333333,
+                  "bytes_in" : 4213.70038889,
+                  "bytes_out" : 4898.53533333,
+                  "pkts_in" : 20.0795555556
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "JOBTRACKER",
+                    "service_name" : "MAPREDUCE"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "TASKTRACKER",
+            "service_name" : "MAPREDUCE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/TASKTRACKER",
+              "HostRoles" : {
+                "configs" : "{\"mapred-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "TASKTRACKER",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944347E9,
+                "process" : {
+                  "proc_total" : 263.683333333,
+                  "proc_run" : 0.813888888889
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0166666666667,
+                  "SentBytes" : 14.6277777778,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 54.325,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_avg_time" : 0.544444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 2.51111111111
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "mapred" : {
+                  "shuffleOutput" : {
+                    "shuffle_handler_busy_percent" : 0.0
+                  },
+                  "tasktracker" : {
+                    "reduces_running" : 0.0,
+                    "maps_running" : 0.0,
+                    "reduceTaskSlots" : 2.0,
+                    "mapTaskSlots" : 4.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.075,
+                  "part_max_used" : 52.6
+                },
+                "cpu" : {
+                  "cpu_speed" : 2659.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.123888888889,
+                  "cpu_idle" : 99.0469444444,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.401944444444,
+                  "cpu_user" : 0.4
+                },
+                "load" : {
+                  "load_fifteen" : 0.0466666666667,
+                  "load_one" : 6.11111111111E-4,
+                  "load_five" : 6.11111111111E-4
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 760.003819444,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 38.2944444444,
+                  "gcCount" : 2.3860929425E7,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 32.7367406333,
+                  "gcTimeMillis" : 7.63549738133E7,
+                  "memNonHeapUsedM" : 21.0635269694,
+                  "logInfo" : 7.158278827E7,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 83.2495438167,
+                  "threadsTerminated" : 0.0,
+                  "maxMemoryM" : 1004.0,
+                  "threadsTimedWaiting" : 11.1388888889,
+                  "threadsRunnable" : 14.2777777778
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 62720.2888889,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4978855.83333,
+                  "mem_cached" : 1756252.53333,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 105.755833333,
+                  "bytes_in" : 1895.95808333,
+                  "bytes_out" : 21296.58625,
+                  "pkts_in" : 11.2986666667
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "TASKTRACKER",
+                    "service_name" : "MAPREDUCE"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-118-149-18.ec2.internal/host_components/TASKTRACKER",
+              "HostRoles" : {
+                "configs" : "{\"mapred-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "TASKTRACKER",
+                "host_name" : "ip-10-118-149-18.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944346E9,
+                "process" : {
+                  "proc_total" : 264.063888889,
+                  "proc_run" : 1.16944444444
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 1.19304647083E7,
+                  "SentBytes" : 1.19304639222E7,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 1.19304635583E7,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 1.19304647056E7,
+                  "RpcProcessingTime_num_ops" : 1.19304647056E7,
+                  "RpcProcessingTime_avg_time" : 0.344444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 3.78888888889
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "mapred" : {
+                  "shuffleOutput" : {
+                    "shuffle_handler_busy_percent" : 0.0
+                  },
+                  "tasktracker" : {
+                    "reduces_running" : 0.0,
+                    "maps_running" : 0.0,
+                    "reduceTaskSlots" : 2.0,
+                    "mapTaskSlots" : 4.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.599,
+                  "part_max_used" : 43.9
+                },
+                "cpu" : {
+                  "cpu_speed" : 2266.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.0,
+                  "cpu_idle" : 98.6938888889,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.531111111111,
+                  "cpu_user" : 0.775
+                },
+                "load" : {
+                  "load_fifteen" : 0.00313888888889,
+                  "load_one" : 0.0282777777778,
+                  "load_five" : 0.0163055555556
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 174.446875,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 14.4361111111,
+                  "gcCount" : 1.19304647115E8,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 24.3248698333,
+                  "gcTimeMillis" : 1.43165576518E8,
+                  "memNonHeapUsedM" : 19.4993658028,
+                  "logInfo" : 2.38609294222E7,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 18.087863945,
+                  "threadsTerminated" : 0.0,
+                  "maxMemoryM" : 1004.0,
+                  "threadsTimedWaiting" : 7.46388888889,
+                  "threadsRunnable" : 7.43611111111
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 52429.0222222,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 5610725.88889,
+                  "mem_cached" : 1247511.4,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 116.179833333,
+                  "bytes_in" : 1897.15633333,
+                  "bytes_out" : 23871.1300833,
+                  "pkts_in" : 11.2918333333
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "TASKTRACKER",
+                    "service_name" : "MAPREDUCE"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "HDFS"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/HDFS_CLIENT",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "HDFS_CLIENT",
+            "service_name" : "HDFS"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/HDFS_CLIENT",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "HDFS_CLIENT",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/HDFS_CLIENT",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "HDFS_CLIENT",
+                    "service_name" : "HDFS"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/DATANODE",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "DATANODE",
+            "service_name" : "HDFS"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-118-149-18.ec2.internal/host_components/DATANODE",
+              "HostRoles" : {
+                "configs" : "{\"global\":\"version1\",\"hdfs-site\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "DATANODE",
+                "host_name" : "ip-10-118-149-18.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944346E9,
+                "process" : {
+                  "proc_total" : 264.063888889,
+                  "proc_run" : 1.16944444444
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 1.19304647083E7,
+                  "SentBytes" : 1.19304639222E7,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 1.19304635583E7,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 1.19304647056E7,
+                  "RpcProcessingTime_num_ops" : 1.19304647056E7,
+                  "RpcProcessingTime_avg_time" : 0.344444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 3.78888888889
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "dfs" : {
+                  "datanode" : {
+                    "readBlockOp_num_ops" : 0.0,
+                    "writeBlockOp_avg_time" : 4.42857142857,
+                    "block_verification_failures" : 0.0,
+                    "blockChecksumOp_num_ops" : 0.0,
+                    "blocks_read" : 0.0,
+                    "copyBlockOp_avg_time" : 0.0,
+                    "blocks_written" : 0.0,
+                    "heartBeats_num_ops" : 0.3325,
+                    "writes_from_remote_client" : 0.0,
+                    "replaceBlockOp_num_ops" : 0.0,
+                    "blocks_replicated" : 0.0,
+                    "blockReports_avg_time" : 1.0,
+                    "writeBlockOp_num_ops" : 0.0,
+                    "heartBeats_avg_time" : 2.44421296296,
+                    "bytes_read" : 0.0,
+                    "copyBlockOp_num_ops" : 0.0,
+                    "blockReports_num_ops" : 0.0,
+                    "bytes_written" : 0.0,
+                    "replaceBlockOp_avg_time" : 0.0,
+                    "reads_from_remote_client" : 0.0,
+                    "readBlockOp_avg_time" : 3.0,
+                    "reads_from_local_client" : 0.0,
+                    "blocks_verified" : 0.00555555555556,
+                    "writes_from_local_client" : 0.0,
+                    "blocks_get_local_pathinfo" : 0.0,
+                    "blockChecksumOp_avg_time" : 0.0,
+                    "blocks_removed" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.599,
+                  "part_max_used" : 43.9
+                },
+                "cpu" : {
+                  "cpu_speed" : 2266.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.0,
+                  "cpu_idle" : 98.6938888889,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.531111111111,
+                  "cpu_user" : 0.775
+                },
+                "load" : {
+                  "load_fifteen" : 0.00313888888889,
+                  "load_one" : 0.0282777777778,
+                  "load_five" : 0.0163055555556
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 174.446875,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 14.4361111111,
+                  "gcCount" : 1.19304647115E8,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 24.3248698333,
+                  "gcTimeMillis" : 1.43165576518E8,
+                  "memNonHeapUsedM" : 19.4993658028,
+                  "logInfo" : 2.38609294222E7,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 18.087863945,
+                  "threadsTerminated" : 0.0,
+                  "maxMemoryM" : 1004.0,
+                  "threadsTimedWaiting" : 7.46388888889,
+                  "threadsRunnable" : 7.43611111111
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 52429.0222222,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 5610725.88889,
+                  "mem_cached" : 1247511.4,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 116.179833333,
+                  "bytes_in" : 1897.15633333,
+                  "bytes_out" : 23871.1300833,
+                  "pkts_in" : 11.2918333333
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/DATANODE",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "DATANODE",
+                    "service_name" : "HDFS"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/DATANODE",
+              "HostRoles" : {
+                "configs" : "{\"global\":\"version1\",\"hdfs-site\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "DATANODE",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944347E9,
+                "process" : {
+                  "proc_total" : 263.683333333,
+                  "proc_run" : 0.813888888889
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0166666666667,
+                  "SentBytes" : 14.6277777778,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 54.325,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_avg_time" : 0.544444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 2.51111111111
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "dfs" : {
+                  "datanode" : {
+                    "readBlockOp_num_ops" : 0.0,
+                    "writeBlockOp_avg_time" : 10.9298245614,
+                    "block_verification_failures" : 0.0,
+                    "blockChecksumOp_num_ops" : 0.0,
+                    "blocks_read" : 0.0,
+                    "copyBlockOp_avg_time" : 0.0,
+                    "blocks_written" : 0.0,
+                    "heartBeats_num_ops" : 0.335833333333,
+                    "writes_from_remote_client" : 0.0,
+                    "replaceBlockOp_num_ops" : 0.0,
+                    "blocks_replicated" : 0.0,
+                    "blockReports_avg_time" : 9.0,
+                    "writeBlockOp_num_ops" : 0.0,
+                    "heartBeats_avg_time" : 2.92106481481,
+                    "bytes_read" : 0.0,
+                    "copyBlockOp_num_ops" : 0.0,
+                    "blockReports_num_ops" : 0.0,
+                    "bytes_written" : 0.0,
+                    "replaceBlockOp_avg_time" : 0.0,
+                    "reads_from_remote_client" : 0.0,
+                    "readBlockOp_avg_time" : 6.5,
+                    "reads_from_local_client" : 0.0,
+                    "blocks_verified" : 0.0125,
+                    "writes_from_local_client" : 0.0,
+                    "blocks_get_local_pathinfo" : 0.0,
+                    "blockChecksumOp_avg_time" : 0.0,
+                    "blocks_removed" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.075,
+                  "part_max_used" : 52.6
+                },
+                "cpu" : {
+                  "cpu_speed" : 2659.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.123888888889,
+                  "cpu_idle" : 99.0469444444,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.401944444444,
+                  "cpu_user" : 0.4
+                },
+                "load" : {
+                  "load_fifteen" : 0.0466666666667,
+                  "load_one" : 6.11111111111E-4,
+                  "load_five" : 6.11111111111E-4
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 760.003819444,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 38.2944444444,
+                  "gcCount" : 2.3860929425E7,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 32.7367406333,
+                  "gcTimeMillis" : 7.63549738133E7,
+                  "memNonHeapUsedM" : 21.0635269694,
+                  "logInfo" : 7.158278827E7,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 83.2495438167,
+                  "threadsTerminated" : 0.0,
+                  "maxMemoryM" : 1004.0,
+                  "threadsTimedWaiting" : 11.1388888889,
+                  "threadsRunnable" : 14.2777777778
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 62720.2888889,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4978855.83333,
+                  "mem_cached" : 1756252.53333,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 105.755833333,
+                  "bytes_in" : 1895.95808333,
+                  "bytes_out" : 21296.58625,
+                  "pkts_in" : 11.2986666667
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/DATANODE",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "DATANODE",
+                    "service_name" : "HDFS"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/NAMENODE",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "NAMENODE",
+            "service_name" : "HDFS"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/NAMENODE",
+              "HostRoles" : {
+                "configs" : "{\"global\":\"version1\",\"hdfs-site\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "NAMENODE",
+                "host_name" : "ip-10-83-47-139.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944348E9,
+                "process" : {
+                  "proc_total" : 293.494444444,
+                  "proc_run" : 2.86944444444
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0861111111111,
+                  "SentBytes" : 106.391481481,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "ReceivedBytes" : 229.217407407,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcQueueTime_num_ops" : 0.748703703704,
+                  "RpcProcessingTime_num_ops" : 0.748703703704,
+                  "RpcProcessingTime_avg_time" : 0.110499338624,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 0.323186728395
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "dfs" : {
+                  "namenode" : {
+                    "AddBlockOps" : 0.0,
+                    "fsImageLoadTime" : 1300.0,
+                    "FilesRenamed" : 0.0,
+                    "JournalTransactionsBatchedInSync" : 0.0,
+                    "FileInfoOps" : 0.0,
+                    "CreateFileOps" : 0.0,
+                    "GetListingOps" : 0.0166666666667,
+                    "Transactions_num_ops" : 0.0,
+                    "GetBlockLocations" : 0.0,
+                    "Syncs_avg_time" : 2.87394957983,
+                    "blockReport_num_ops" : 0.0,
+                    "Syncs_num_ops" : 0.0,
+                    "SafemodeTime" : 1317.0,
+                    "Transactions_avg_time" : 0.0337423312883,
+                    "FilesInGetListingOps" : 0.0,
+                    "FilesDeleted" : 0.0,
+                    "FilesAppended" : 0.0,
+                    "DeleteFileOps" : 0.0,
+                    "FilesCreated" : 0.0,
+                    "blockReport_avg_time" : 4.0
+                  },
+                  "FSNamesystem" : {
+                    "BlocksTotal" : 403.0,
+                    "ScheduledReplicationBlocks" : 0.0,
+                    "CapacityTotalGB" : 11.0,
+                    "CapacityUsedGB" : 0.0,
+                    "ExcessBlocks" : 0.0,
+                    "MissingBlocks" : 0.0,
+                    "PendingReplicationBlocks" : 0.0,
+                    "FilesTotal" : 324.0,
+                    "CapacityRemainingGB" : 6.0,
+                    "UnderReplicatedBlocks" : 215.0,
+                    "TotalLoad" : 2.0,
+                    "PendingDeletionBlocks" : 0.0,
+                    "CorruptBlocks" : 0.0,
+                    "BlockCapacity" : 2097152.0
+                  }
+                },
+                "disk" : {
+                  "disk_total" : 893.765,
+                  "disk_free" : 845.308827778,
+                  "part_max_used" : 48.7186111111
+                },
+                "cpu" : {
+                  "cpu_speed" : 2266.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.493888888889,
+                  "cpu_idle" : 84.9672222222,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 3.33388888889,
+                  "cpu_user" : 11.2113888889
+                },
+                "rpcdetailed" : {
+                  "addBlock_avg_time" : 0.465909090909,
+                  "rollFsImage_num_ops" : 0.0,
+                  "register_num_ops" : 0.0,
+                  "versionRequest_num_ops" : 0.0,
+                  "create_avg_time" : 5.04545454545,
+                  "fsync_num_ops" : 0.0,
+                  "getBlockLocations_num_ops" : 0.0,
+                  "addBlock_num_ops" : 0.0,
+                  "getListing_avg_time" : 1.69444444444,
+                  "getBlockLocations_avg_time" : 0.0,
+                  "renewLease_num_ops" : 0.0666666666667,
+                  "getFileInfo_num_ops" : 0.0,
+                  "register_avg_time" : 2.5,
+                  "setPermission_num_ops" : 0.0,
+                  "versionRequest_avg_time" : 0.5,
+                  "fsync_avg_time" : 0.0,
+                  "complete_num_ops" : 0.0,
+                  "setOwner_num_ops" : 0.0,
+                  "getProtocolVersion_num_ops" : 0.0,
+                  "setOwner_avg_time" : 15.5,
+                  "setReplication_num_ops" : 0.0,
+                  "blockReport_avg_time" : 4.0,
+                  "setPermission_avg_time" : 3.66666666667,
+                  "getListing_num_ops" : 0.0166666666667,
+                  "renewLease_avg_time" : 0.0430555555556,
+                  "sendHeartbeat_num_ops" : 0.662592592593,
+                  "blocksBeingWrittenReport_avg_time" : 0.5,
+                  "rename_num_ops" : 0.0,
+                  "mkdirs_avg_time" : 3.95,
+                  "delete_num_ops" : 0.0,
+                  "blockReport_num_ops" : 0.0,
+                  "create_num_ops" : 0.0,
+                  "getEditLogSize_num_ops" : 0.00277777777778,
+                  "rollEditLog_num_ops" : 0.0,
+                  "rollFsImage_avg_time" : 48.0,
+                  "mkdirs_num_ops" : 0.0,
+                  "delete_avg_time" : 4.0,
+                  "getFileInfo_avg_time" : 0.0,
+                  "rename_avg_time" : 3.0,
+                  "getProtocolVersion_avg_time" : 0.0,
+                  "rollEditLog_avg_time" : 83.0,
+                  "blockReceived_avg_time" : 0.205714285714,
+                  "getEditLogSize_avg_time" : 0.0,
+                  "sendHeartbeat_avg_time" : 0.0732804232804,
+                  "complete_avg_time" : 1.44943820225,
+                  "blockReceived_num_ops" : 0.0,
+                  "setSafeMode_avg_time" : 0.0,
+                  "blocksBeingWrittenReport_num_ops" : 0.0,
+                  "setSafeMode_num_ops" : 0.0,
+                  "setReplication_avg_time" : 1.5
+                },
+                "load" : {
+                  "load_fifteen" : 0.356833333333,
+                  "load_one" : 0.511388888889,
+                  "load_five" : 0.374166666667
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 960.0,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 14.0,
+                  "gcCount" : 0.0,
+                  "logWarn" : 0.0,
+                  "logError" : 0.0,
+                  "memNonHeapCommittedM" : 23.1875,
+                  "gcTimeMillis" : 0.0,
+                  "memNonHeapUsedM" : 20.7895987972,
+                  "logInfo" : 0.0,
+                  "threadsNew" : 0.0,
+                  "memHeapUsedM" : 384.695487139,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 7.0,
+                  "threadsRunnable" : 6.0
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 63871.6111111,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4787186.06667,
+                  "mem_cached" : 1545617.4,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 29.3245833333,
+                  "bytes_in" : 45395.5750833,
+                  "bytes_out" : 15665.7432778,
+                  "pkts_in" : 234.953444444
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/NAMENODE",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "NAMENODE",
+                    "service_name" : "HDFS"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/SECONDARY_NAMENODE",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "SECONDARY_NAMENODE",
+            "service_name" : "HDFS"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-102-239.ec2.internal/host_components/SECONDARY_NAMENODE",
+              "HostRoles" : {
+                "configs" : "{\"global\":\"version1\",\"hdfs-site\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "SECONDARY_NAMENODE",
+                "host_name" : "ip-10-204-102-239.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HDFS/components/SECONDARY_NAMENODE",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "SECONDARY_NAMENODE",
+                    "service_name" : "HDFS"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/SQOOP",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "SQOOP"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/SQOOP/components/SQOOP",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "SQOOP",
+            "service_name" : "SQOOP"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/SQOOP",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "SQOOP",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/SQOOP/components/SQOOP",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "SQOOP",
+                    "service_name" : "SQOOP"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/OOZIE",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "OOZIE"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/OOZIE/components/OOZIE_CLIENT",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "OOZIE_CLIENT",
+            "service_name" : "OOZIE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/OOZIE_CLIENT",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "OOZIE_CLIENT",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/OOZIE/components/OOZIE_CLIENT",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "OOZIE_CLIENT",
+                    "service_name" : "OOZIE"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/OOZIE/components/OOZIE_SERVER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "OOZIE_SERVER",
+            "service_name" : "OOZIE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-102-239.ec2.internal/host_components/OOZIE_SERVER",
+              "HostRoles" : {
+                "configs" : "{\"global\":\"version1\",\"oozie-site\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "OOZIE_SERVER",
+                "host_name" : "ip-10-204-102-239.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/OOZIE/components/OOZIE_SERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "OOZIE_SERVER",
+                    "service_name" : "OOZIE"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "NAGIOS"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "NAGIOS_SERVER",
+            "service_name" : "NAGIOS"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/NAGIOS_SERVER",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "NAGIOS_SERVER",
+                "host_name" : "ip-10-83-47-139.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "NAGIOS_SERVER",
+                    "service_name" : "NAGIOS"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "HBASE"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_CLIENT",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "HBASE_CLIENT",
+            "service_name" : "HBASE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/HBASE_CLIENT",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "HBASE_CLIENT",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944347E9,
+                "process" : {
+                  "proc_total" : 263.683333333,
+                  "proc_run" : 0.813888888889
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0166666666667,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "SentBytes" : 14.6277777778,
+                  "ReceivedBytes" : 54.325,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "RpcQueueTime_num_ops" : 0.122222222222,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcProcessingTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_avg_time" : 0.544444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 2.51111111111
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "disk" : {
+                  "disk_free" : 845.075,
+                  "part_max_used" : 52.6
+                },
+                "cpu" : {
+                  "cpu_speed" : 2659.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.123888888889,
+                  "cpu_idle" : 99.0469444444,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.401944444444,
+                  "cpu_user" : 0.4
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 760.003819444,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 38.2944444444,
+                  "gcCount" : 2.3860929425E7,
+                  "logError" : 0.0,
+                  "logWarn" : 0.0,
+                  "memNonHeapCommittedM" : 32.7367406333,
+                  "gcTimeMillis" : 7.63549738133E7,
+                  "memNonHeapUsedM" : 21.0635269694,
+                  "logInfo" : 7.158278827E7,
+                  "memHeapUsedM" : 83.2495438167,
+                  "threadsNew" : 0.0,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 11.1388888889,
+                  "maxMemoryM" : 1004.0,
+                  "threadsRunnable" : 14.2777777778
+                },
+                "load" : {
+                  "load_fifteen" : 0.0466666666667,
+                  "load_one" : 6.11111111111E-4,
+                  "load_five" : 6.11111111111E-4
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 62720.2888889,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4978855.83333,
+                  "mem_cached" : 1756252.53333,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 105.755833333,
+                  "bytes_in" : 1895.95808333,
+                  "bytes_out" : 21296.58625,
+                  "pkts_in" : 11.2986666667
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_CLIENT",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "HBASE_CLIENT",
+                    "service_name" : "HBASE"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_MASTER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "HBASE_MASTER",
+            "service_name" : "HBASE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/HBASE_MASTER",
+              "HostRoles" : {
+                "configs" : "{\"hbase-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "HBASE_MASTER",
+                "host_name" : "ip-10-83-47-139.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944348E9,
+                "process" : {
+                  "proc_total" : 293.219444444,
+                  "proc_run" : 0.0972222222222
+                },
+                "hbase" : {
+                  "master" : {
+                    "splitSize_avg_time" : 0.0,
+                    "splitTime_avg_time" : 0.0,
+                    "splitTime_num_ops" : 0.0,
+                    "cluster_requests" : 0.0,
+                    "splitSize_num_ops" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_total" : 893.765,
+                  "disk_free" : 845.308872222,
+                  "part_max_used" : 48.7180555556
+                },
+                "cpu" : {
+                  "cpu_speed" : 2266.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.495833333333,
+                  "cpu_idle" : 84.5666666667,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 3.34,
+                  "cpu_user" : 11.5819444444
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 81.0625,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 42.0,
+                  "gcCount" : 18.9194444444,
+                  "logError" : 0.0,
+                  "logWarn" : 0.0,
+                  "memNonHeapCommittedM" : 36.679688,
+                  "gcTimeMillis" : 113.919444444,
+                  "memNonHeapUsedM" : 22.1864361111,
+                  "logInfo" : 0.0,
+                  "memHeapUsedM" : 10.7416655886,
+                  "threadsNew" : 0.0,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 8.24444444444,
+                  "maxMemoryM" : 1019.875,
+                  "threadsRunnable" : 16.0
+                },
+                "load" : {
+                  "load_fifteen" : 0.356222222222,
+                  "load_one" : 0.504861111111,
+                  "load_five" : 0.372333333333
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 63860.1,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4787479.36667,
+                  "mem_cached" : 1545456.5,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 29.2349444444,
+                  "bytes_in" : 45360.1838889,
+                  "bytes_out" : 15245.1213056,
+                  "pkts_in" : 234.745277778
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_MASTER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "HBASE_MASTER",
+                    "service_name" : "HBASE"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_REGIONSERVER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "HBASE_REGIONSERVER",
+            "service_name" : "HBASE"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/HBASE_REGIONSERVER",
+              "HostRoles" : {
+                "configs" : "{\"hbase-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "HBASE_REGIONSERVER",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944347E9,
+                "process" : {
+                  "proc_total" : 263.683333333,
+                  "proc_run" : 0.813888888889
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 0.0166666666667,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "SentBytes" : 14.6277777778,
+                  "ReceivedBytes" : 54.325,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "RpcQueueTime_num_ops" : 0.122222222222,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcProcessingTime_num_ops" : 0.122222222222,
+                  "RpcProcessingTime_avg_time" : 0.544444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 2.51111111111
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "hbase" : {
+                  "regionserver" : {
+                    "compactionSize_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_99th_percentile" : 0.0,
+                    "fsWriteLatencyHistogram_median" : 0.0,
+                    "requests" : 0.0,
+                    "fsReadLatencyHistogram_num_ops" : 0.0,
+                    "hdfsBlocksLocalityIndex" : 0.0,
+                    "fsWriteLatencyHistogram_std_dev" : 0.0,
+                    "writeRequestsCount" : 1.0,
+                    "flushSize_avg_time" : 0.0,
+                    "fsWriteLatencyHistogram_max" : 0.0,
+                    "fsSyncLatency_num_ops" : 1.0,
+                    "fsWriteLatencyHistogram_95th_percentile" : 0.0,
+                    "fsSyncLatency_avg_time" : 0.0,
+                    "compactionSize_num_ops" : 0.0,
+                    "compactionTime_num_ops" : 0.0,
+                    "fsReadLatencyHistogram_mean" : 0.0,
+                    "blockCacheEvictedCount" : 0.0,
+                    "storefileIndexSizeMB" : 0.0,
+                    "fsWriteLatencyHistogram_75th_percentile" : 0.0,
+                    "fsWriteLatency_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_max" : 0.0,
+                    "fsWriteLatencyHistogram_min" : 0.0,
+                    "compactionQueueSize" : 0.0,
+                    "totalStaticBloomSizeKB" : 0.0,
+                    "fsWriteLatencyHistogram_mean" : 0.0,
+                    "blockCacheFree" : 2.61032304E8,
+                    "totalStaticIndexSizeKB" : 0.0,
+                    "fsReadLatency_avg_time" : 0.0,
+                    "fsWriteLatency_num_ops" : 1.0,
+                    "memstoreSizeMB" : 0.0,
+                    "regions" : 1.0,
+                    "blockCacheCount" : 0.0,
+                    "blockCacheHitRatio" : 0.0,
+                    "flushQueueSize" : 0.0,
+                    "blockCacheHitCachingRatio" : 0.0,
+                    "fsReadLatencyHistogram_95th_percentile" : 0.0,
+                    "blockCacheHitCount" : 0.0,
+                    "flushTime_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_min" : 0.0,
+                    "flushTime_num_ops" : 0.0,
+                    "compactionTime_avg_time" : 0.0,
+                    "fsReadLatency_num_ops" : 0.0,
+                    "blockCacheSize" : 2160272.0,
+                    "rootIndexSizeKB" : 0.0,
+                    "fsReadLatencyHistogram_std_dev" : 0.0,
+                    "readRequestsCount" : 2.0,
+                    "fsReadLatencyHistogram_75th_percentile" : 0.0,
+                    "blockCacheMissCount" : 0.0,
+                    "storefiles" : 0.0,
+                    "fsWriteLatencyHistogram_num_ops" : 0.0,
+                    "flushSize_num_ops" : 0.0,
+                    "fsWriteLatencyHistogram_99th_percentile" : 0.0,
+                    "stores" : 1.0,
+                    "fsReadLatencyHistogram_median" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.075,
+                  "part_max_used" : 52.6
+                },
+                "cpu" : {
+                  "cpu_speed" : 2659.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.123888888889,
+                  "cpu_idle" : 99.0469444444,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.401944444444,
+                  "cpu_user" : 0.4
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 760.003819444,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 38.2944444444,
+                  "gcCount" : 2.3860929425E7,
+                  "logError" : 0.0,
+                  "logWarn" : 0.0,
+                  "memNonHeapCommittedM" : 32.7367406333,
+                  "gcTimeMillis" : 7.63549738133E7,
+                  "memNonHeapUsedM" : 21.0635269694,
+                  "logInfo" : 7.158278827E7,
+                  "memHeapUsedM" : 83.2495438167,
+                  "threadsNew" : 0.0,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 11.1388888889,
+                  "maxMemoryM" : 1004.0,
+                  "threadsRunnable" : 14.2777777778
+                },
+                "load" : {
+                  "load_fifteen" : 0.0466666666667,
+                  "load_one" : 6.11111111111E-4,
+                  "load_five" : 6.11111111111E-4
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 62720.2888889,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 4978855.83333,
+                  "mem_cached" : 1756252.53333,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 105.755833333,
+                  "bytes_in" : 1895.95808333,
+                  "bytes_out" : 21296.58625,
+                  "pkts_in" : 11.2986666667
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_REGIONSERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "HBASE_REGIONSERVER",
+                    "service_name" : "HBASE"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-118-149-18.ec2.internal/host_components/HBASE_REGIONSERVER",
+              "HostRoles" : {
+                "configs" : "{\"hbase-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "HBASE_REGIONSERVER",
+                "host_name" : "ip-10-118-149-18.ec2.internal"
+              },
+              "metrics" : {
+                "boottime" : 1.352944346E9,
+                "process" : {
+                  "proc_total" : 264.063888889,
+                  "proc_run" : 1.16944444444
+                },
+                "rpc" : {
+                  "rpcAuthorizationSuccesses" : 1.19304647083E7,
+                  "rpcAuthorizationFailures" : 0.0,
+                  "SentBytes" : 1.19304639222E7,
+                  "ReceivedBytes" : 1.19304635583E7,
+                  "NumOpenConnections" : 0.0,
+                  "callQueueLen" : 0.0,
+                  "RpcQueueTime_num_ops" : 1.19304647056E7,
+                  "rpcAuthenticationSuccesses" : 0.0,
+                  "RpcProcessingTime_num_ops" : 1.19304647056E7,
+                  "RpcProcessingTime_avg_time" : 0.344444444444,
+                  "rpcAuthenticationFailures" : 0.0,
+                  "RpcQueueTime_avg_time" : 3.78888888889
+                },
+                "ugi" : {
+                  "loginFailure_num_ops" : 0.0,
+                  "loginSuccess_num_ops" : 0.0,
+                  "loginSuccess_avg_time" : 0.0,
+                  "loginFailure_avg_time" : 0.0
+                },
+                "hbase" : {
+                  "regionserver" : {
+                    "compactionSize_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_99th_percentile" : 0.0,
+                    "fsWriteLatencyHistogram_median" : 0.0,
+                    "requests" : 0.0,
+                    "fsReadLatencyHistogram_num_ops" : 0.0,
+                    "hdfsBlocksLocalityIndex" : 100.0,
+                    "fsWriteLatencyHistogram_std_dev" : 0.0,
+                    "writeRequestsCount" : 3.0,
+                    "flushSize_avg_time" : 0.0,
+                    "fsWriteLatencyHistogram_max" : 0.0,
+                    "fsSyncLatency_num_ops" : 4.0,
+                    "fsWriteLatencyHistogram_95th_percentile" : 0.0,
+                    "fsSyncLatency_avg_time" : 0.0,
+                    "compactionSize_num_ops" : 0.0,
+                    "compactionTime_num_ops" : 0.0,
+                    "fsReadLatencyHistogram_mean" : 0.0,
+                    "blockCacheEvictedCount" : 0.0,
+                    "storefileIndexSizeMB" : 0.0,
+                    "fsWriteLatencyHistogram_75th_percentile" : 0.0,
+                    "fsWriteLatency_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_max" : 0.0,
+                    "fsWriteLatencyHistogram_min" : 0.0,
+                    "compactionQueueSize" : 0.0,
+                    "totalStaticBloomSizeKB" : 0.0,
+                    "fsWriteLatencyHistogram_mean" : 0.0,
+                    "blockCacheFree" : 2.61031624E8,
+                    "totalStaticIndexSizeKB" : 0.0,
+                    "fsReadLatency_avg_time" : 0.0,
+                    "fsWriteLatency_num_ops" : 3.0,
+                    "memstoreSizeMB" : 0.0,
+                    "regions" : 2.0,
+                    "blockCacheCount" : 1.0,
+                    "blockCacheHitRatio" : 96.0,
+                    "flushQueueSize" : 0.0,
+                    "blockCacheHitCachingRatio" : 96.0,
+                    "fsReadLatencyHistogram_95th_percentile" : 0.0,
+                    "blockCacheHitCount" : 26.0,
+                    "flushTime_avg_time" : 0.0,
+                    "fsReadLatencyHistogram_min" : 0.0,
+                    "flushTime_num_ops" : 0.0,
+                    "compactionTime_avg_time" : 0.0,
+                    "fsReadLatency_num_ops" : 0.0,
+                    "blockCacheSize" : 2160952.0,
+                    "rootIndexSizeKB" : 0.0,
+                    "fsReadLatencyHistogram_std_dev" : 0.0,
+                    "readRequestsCount" : 88.4222222222,
+                    "fsReadLatencyHistogram_75th_percentile" : 0.0,
+                    "blockCacheMissCount" : 1.0,
+                    "storefiles" : 1.0,
+                    "fsWriteLatencyHistogram_num_ops" : 0.0,
+                    "flushSize_num_ops" : 0.0,
+                    "fsWriteLatencyHistogram_99th_percentile" : 0.0,
+                    "stores" : 2.0,
+                    "fsReadLatencyHistogram_median" : 0.0
+                  }
+                },
+                "disk" : {
+                  "disk_free" : 845.599,
+                  "part_max_used" : 43.9
+                },
+                "cpu" : {
+                  "cpu_speed" : 2266.0,
+                  "cpu_num" : 2.0,
+                  "cpu_wio" : 0.0,
+                  "cpu_idle" : 98.6938888889,
+                  "cpu_nice" : 0.0,
+                  "cpu_aidle" : 0.0,
+                  "cpu_system" : 0.531111111111,
+                  "cpu_user" : 0.775
+                },
+                "jvm" : {
+                  "memHeapCommittedM" : 174.446875,
+                  "logFatal" : 0.0,
+                  "threadsBlocked" : 0.0,
+                  "threadsWaiting" : 14.4361111111,
+                  "gcCount" : 1.19304647115E8,
+                  "logError" : 0.0,
+                  "logWarn" : 0.0,
+                  "memNonHeapCommittedM" : 24.3248698333,
+                  "gcTimeMillis" : 1.43165576518E8,
+                  "memNonHeapUsedM" : 19.4993658028,
+                  "logInfo" : 2.38609294222E7,
+                  "memHeapUsedM" : 18.087863945,
+                  "threadsNew" : 0.0,
+                  "threadsTerminated" : 0.0,
+                  "threadsTimedWaiting" : 7.46388888889,
+                  "maxMemoryM" : 1004.0,
+                  "threadsRunnable" : 7.43611111111
+                },
+                "load" : {
+                  "load_fifteen" : 0.00313888888889,
+                  "load_one" : 0.0282777777778,
+                  "load_five" : 0.0163055555556
+                },
+                "memory" : {
+                  "mem_total" : 7646152.0,
+                  "swap_free" : 0.0,
+                  "mem_buffers" : 52429.0222222,
+                  "mem_shared" : 0.0,
+                  "mem_free" : 5610725.88889,
+                  "mem_cached" : 1247511.4,
+                  "swap_total" : 0.0
+                },
+                "network" : {
+                  "pkts_out" : 116.179833333,
+                  "bytes_in" : 1897.15633333,
+                  "bytes_out" : 23871.1300833,
+                  "pkts_in" : 11.2918333333
+                }
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE/components/HBASE_REGIONSERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "HBASE_REGIONSERVER",
+                    "service_name" : "HBASE"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/PIG",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "PIG"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/PIG/components/PIG",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "PIG",
+            "service_name" : "PIG"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/PIG",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "PIG",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/PIG/components/PIG",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "PIG",
+                    "service_name" : "PIG"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "GANGLIA"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "GANGLIA_MONITOR",
+            "service_name" : "GANGLIA"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-102-239.ec2.internal/host_components/GANGLIA_MONITOR",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_MONITOR",
+                "host_name" : "ip-10-204-102-239.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_MONITOR",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/GANGLIA_MONITOR",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_MONITOR",
+                "host_name" : "ip-10-83-47-139.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_MONITOR",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/GANGLIA_MONITOR",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_MONITOR",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_MONITOR",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-62-16.ec2.internal/host_components/GANGLIA_MONITOR",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_MONITOR",
+                "host_name" : "ip-10-204-62-16.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_MONITOR",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            },
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-118-149-18.ec2.internal/host_components/GANGLIA_MONITOR",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_MONITOR",
+                "host_name" : "ip-10-118-149-18.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_MONITOR",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_SERVER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "GANGLIA_SERVER",
+            "service_name" : "GANGLIA"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/GANGLIA_SERVER",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "GANGLIA_SERVER",
+                "host_name" : "ip-10-83-47-139.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/GANGLIA/components/GANGLIA_SERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "GANGLIA_SERVER",
+                    "service_name" : "GANGLIA"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "href" : "http://ambari:8080/api/clusters/mycluster/services/ZOOKEEPER",
+      "ServiceInfo" : {
+        "cluster_name" : "mycluster",
+        "service_name" : "ZOOKEEPER"
+      },
+      "components" : [
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/ZOOKEEPER/components/ZOOKEEPER_SERVER",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "ZOOKEEPER_SERVER",
+            "service_name" : "ZOOKEEPER"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-204-62-16.ec2.internal/host_components/ZOOKEEPER_SERVER",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "STARTED",
+                "state" : "STARTED",
+                "component_name" : "ZOOKEEPER_SERVER",
+                "host_name" : "ip-10-204-62-16.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/ZOOKEEPER/components/ZOOKEEPER_SERVER",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "ZOOKEEPER_SERVER",
+                    "service_name" : "ZOOKEEPER"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "href" : "http://ambari:8080/api/clusters/mycluster/services/ZOOKEEPER/components/ZOOKEEPER_CLIENT",
+          "ServiceComponentInfo" : {
+            "cluster_name" : "mycluster",
+            "component_name" : "ZOOKEEPER_CLIENT",
+            "service_name" : "ZOOKEEPER"
+          },
+          "host_components" : [
+            {
+              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-196-102-80.ec2.internal/host_components/ZOOKEEPER_CLIENT",
+              "HostRoles" : {
+                "configs" : "{}",
+                "cluster_name" : "mycluster",
+                "desired_configs" : "{}",
+                "desired_state" : "INSTALLED",
+                "state" : "INSTALLED",
+                "component_name" : "ZOOKEEPER_CLIENT",
+                "host_name" : "ip-10-196-102-80.ec2.internal"
+              },
+              "component" : [
+                {
+                  "href" : "http://ambari:8080/api/clusters/mycluster/services/ZOOKEEPER/components/ZOOKEEPER_CLIENT",
+                  "ServiceComponentInfo" : {
+                    "cluster_name" : "mycluster",
+                    "component_name" : "ZOOKEEPER_CLIENT",
+                    "service_name" : "ZOOKEEPER"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

+ 52 - 121
ambari-web/app/assets/data/wizard/stack/hdp/version01/HBASE.json

@@ -1,124 +1,55 @@
 {
-  "name": "HBASE",
-  "version": "1.0",
-  "user": "mapred",
-  "comment": "This is comment for HBASE service",
-  "properties": [
-    {
-      "name": "hbase.regionserver.msginterval",
-      "value": "1000",
-      "description": "Interval between messages from the RegionServer to HMaster\n    in milliseconds.  Default is 15. Set this value low if you want unit\n    tests to be responsive.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.client.pause",
-      "value": "5000",
-      "description": "General client pause value.  Used mostly as value to wait\n    before running a retry of a failed get, region lookup, etc.",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.master.meta.thread.rescanfrequency",
-      "value": "10000",
-      "description": "How long the HMaster sleeps (in milliseconds) between scans of\n    the root and meta tables.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.server.thread.wakefrequency",
-      "value": "1000",
-      "description": "Time to sleep in between searches for work (in milliseconds).\n    Used as sleep interval by service threads such as META scanner and log roller.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.regionserver.handler.count",
-      "value": "5",
-      "description": "Count of RPC Server instances spun up on RegionServers\n    Same property is used by the HMaster for count of master handlers.\n    Default is 10.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.master.lease.period",
-      "value": "6000",
-      "description": "Length of time the master will wait before timing out a region\n    server lease. Since region servers report in every second (see above), this\n    value has been reduced so that the master will notice a dead region server\n    sooner. The default is 30 seconds.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.master.info.port",
-      "value": "-1",
-      "description": "The port for the hbase master web UI\n    Set to -1 if you do not want the info server to run.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.regionserver.info.port",
-      "value": "-1",
-      "description": "The port for the hbase regionserver web UI\n    Set to -1 if you do not want the info server to run.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.regionserver.info.port.auto",
-      "value": "true",
-      "description": "Info server auto port bind. Enables automatic port\n    search if hbase.regionserver.info.port is already in use.\n    Enabled for testing to run multiple tests on one machine.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.master.lease.thread.wakefrequency",
-      "value": "3000",
-      "description": "The interval between checks for expired region server leases.\n    This value has been reduced due to the other reduced values above so that\n    the master will notice a dead region server sooner. The default is 15 seconds.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.regionserver.optionalcacheflushinterval",
-      "value": "10000",
-      "description": "\n    Amount of time to wait since the last time a region was flushed before\n    invoking an optional cache flush. Default 60,000.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.regionserver.safemode",
-      "value": "false",
-      "description": "\n    Turn on/off safe mode in region server. Always on for production, always off\n    for tests.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.hregion.max.filesize",
-      "value": "67108864",
-      "description": "\n    Maximum desired file size for an HRegion.  If filesize exceeds\n    value + (value / 2), the HRegion is split in two.  Default: 256M.\n\n    Keep the maximum filesize small so we split more often in tests.\n    ",
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hadoop.log.dir",
-      "value": "${user.dir}/../logs",
-      "description": null,
-      "filename": "hbase-site.xml"
-    },
-    {
-      "name": "hbase.zookeeper.property.clientPort",
-      "value": "21818",
-      "description": "Property from ZooKeeper's config zoo.cfg.\n    The port at which the clients will connect.\n    ",
-      "filename": "hbase-site.xml"
-    }
-  ],
-  "components": [
-    {
-      "name": "HBASE_MASTER",
-      "category": "MASTER",
-      "client": false,
-      "master": true
-    },
-    {
-      "name": "HBASE_REGIONSERVER",
-      "category": "SLAVE",
-      "client": false,
-      "master": false
-    },
-    {
-      "name": "HBASE_CLIENT",
-      "category": "CLIENT",
-      "client": true,
-      "master": false
-    }
-  ],
-  "clientComponent": {
-    "name": "HBASE_CLIENT",
-    "category": "CLIENT",
-    "client": true,
-    "master": false
+  "name" : "HBASE",
+  "version" : "0.94.2.1-1",
+  "user" : "mapred",
+  "comment" : "This is comment for HBASE service",
+  "properties" : [ {
+    "name" : "hbase.cluster.distributed",
+    "value" : "true",
+    "description" : "The mode the cluster will be in. Possible values are\n      false for standalone mode and true for distributed mode.  If\n      false, startup will run all HBase and ZooKeeper daemons together\n      in the one JVM.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.master.lease.thread.wakefrequency",
+    "value" : "3000",
+    "description" : "The interval between checks for expired region server leases.\n    This value has been reduced due to the other reduced values above so that\n    the master will notice a dead region server sooner. The default is 15 seconds.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.superuser",
+    "value" : "hbase",
+    "description" : "List of users or groups (comma-separated), who are allowed\n    full privileges, regardless of stored ACLs, across the cluster.\n    Only used when HBase security is enabled.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.zookeeper.property.clientPort",
+    "value" : "2181",
+    "description" : "Property from ZooKeeper's config zoo.cfg.\n    The port at which the clients will connect.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.regionserver.optionalcacheflushinterval",
+    "value" : "10000",
+    "description" : "\n      Amount of time to wait since the last time a region was flushed before\n      invoking an optional cache flush. Default 60,000.\n    ",
+    "filename" : "hbase-site.xml"
+  } ],
+  "components" : [ {
+    "name" : "HBASE_MASTER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "HBASE_REGIONSERVER",
+    "category" : "SLAVE",
+    "client" : false,
+    "master" : false
+  }, {
+    "name" : "HBASE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : false,
+  "clientComponent" : {
+    "name" : "HBASE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
   }
 }

+ 16 - 400
ambari-web/app/assets/data/wizard/stack/hdp/version01/HDFS.json

@@ -1,58 +1,13 @@
 {
   "name" : "HDFS",
-  "version" : "1.0",
+  "version" : "1.1.0.1-1",
   "user" : "root",
   "comment" : "This is comment for HDFS service",
   "properties" : [ {
-    "name" : "dfs.name.dir",
-    "value" : "/mnt/hmc/hadoop/hdfs/namenode",
-    "description" : "Determines where on the local filesystem the DFS name node\n      should store the name table.  If this is a comma-delimited list\n      of directories then the name table is replicated in all of the\n      directories, for redundancy. ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.support.append",
-    "value" : "true",
-    "description" : "to enable dfs append",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.webhdfs.enabled",
-    "value" : "false",
-    "description" : "to enable webhdfs",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.failed.volumes.tolerated",
-    "value" : "0",
-    "description" : "#of failed disks dn would tolerate",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.block.local-path-access.user",
-    "value" : "hbase",
-    "description" : "the user who is allowed to perform short\n    circuit reads.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.data.dir",
-    "value" : "/mnt/hmc/hadoop/hdfs/data",
-    "description" : "Determines where on the local filesystem an DFS data node\n  should store its blocks.  If this is a comma-delimited\n  list of directories, then data will be stored in all named\n  directories, typically on different devices.\n  Directories that do not exist are ignored.\n  ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.hosts.exclude",
-    "value" : "/etc/hadoop/conf/dfs.exclude",
-    "description" : "Names a file that contains a list of hosts that are\n    not permitted to connect to the namenode.  The full pathname of the\n    file must be specified.  If the value is empty, no hosts are\n    excluded.",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.hosts",
-    "value" : "/etc/hadoop/conf/dfs.include",
-    "description" : "Names a file that contains a list of hosts that are\n    permitted to connect to the namenode. The full pathname of the file\n    must be specified.  If the value is empty, all hosts are\n    permitted.",
-    "filename" : "hdfs-site.xml"
-  }, {
     "name" : "dfs.replication.max",
     "value" : "50",
     "description" : "Maximal block replication.\n  ",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.replication",
-    "value" : "3",
-    "description" : "Default block replication.\n  ",
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.heartbeat.interval",
     "value" : "3",
@@ -68,31 +23,11 @@
     "value" : "6250000",
     "description" : "\n        Specifies the maximum amount of bandwidth that each datanode\n        can utilize for the balancing purpose in term of\n        the number of bytes per second.\n  ",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.address",
-    "value" : "0.0.0.0:50010",
-    "description" : null,
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.http.address",
-    "value" : "0.0.0.0:50075",
-    "description" : null,
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.block.size",
     "value" : "134217728",
     "description" : "The default block size for new files.",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.http.address",
-    "value" : "hdp1.cybervisiontech.com.ua:50070",
-    "description" : "The name of the default file system.  Either the\nliteral string \"local\" or a host:port for NDFS.",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.du.reserved",
-    "value" : "1073741824",
-    "description" : "Reserved space in bytes per volume. Always leave this much space free for non dfs use.\n",
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.datanode.ipc.address",
     "value" : "0.0.0.0:8010",
@@ -153,81 +88,16 @@
     "value" : "true",
     "description" : "\nIf \"true\", access tokens are used as capabilities for accessing datanodes.\nIf \"false\", no access tokens are checked on accessing datanodes.\n",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.namenode.kerberos.principal",
-    "value" : "nn/_HOST@",
-    "description" : "\nKerberos principal name for the NameNode\n",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.secondary.namenode.kerberos.principal",
-    "value" : "nn/_HOST@",
-    "description" : "\n        Kerberos principal name for the secondary NameNode.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.namenode.kerberos.https.principal",
-    "value" : "host/_HOST@",
-    "description" : "The Kerberos principal for the host that the NameNode runs on.",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.secondary.namenode.kerberos.https.principal",
-    "value" : "host/_HOST@",
-    "description" : "The Kerberos principal for the hostthat the secondary NameNode runs on.",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.secondary.http.address",
-    "value" : "hdp2.cybervisiontech.com.ua:50090",
-    "description" : "Address of secondary namenode web server",
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.secondary.https.port",
     "value" : "50490",
     "description" : "The https port where secondary-namenode binds",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.web.authentication.kerberos.principal",
-    "value" : "HTTP/_HOST@",
-    "description" : "\n      The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.\n      The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos\n      HTTP SPENGO specification.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.web.authentication.kerberos.keytab",
-    "value" : "/nn.service.keytab",
-    "description" : "\n      The Kerberos keytab file with the credentials for the\n      HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.kerberos.principal",
-    "value" : "dn/_HOST@",
-    "description" : "\n        The Kerberos principal that the DataNode runs as. \"_HOST\" is replaced by the real host name.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.namenode.keytab.file",
-    "value" : "/nn.service.keytab",
-    "description" : "\n        Combined keytab file containing the namenode service and host principals.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.secondary.namenode.keytab.file",
-    "value" : "/nn.service.keytab",
-    "description" : "\n        Combined keytab file containing the namenode service and host principals.\n    ",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.keytab.file",
-    "value" : "/dn.service.keytab",
-    "description" : "\n        The filename of the keytab file for the DataNode.\n    ",
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.https.port",
     "value" : "50470",
     "description" : "The https port where namenode binds",
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.https.address",
-    "value" : "hdp1.cybervisiontech.com.ua:50470",
-    "description" : "The https address where namenode binds",
-    "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "dfs.datanode.data.dir.perm",
-    "value" : "750",
-    "description" : "The permissions that should be there on dfs.data.dir\ndirectories. The datanode will not come up if the permissions are\ndifferent on existing dfs.data.dir directories. If the directories\ndon't exist, they will be created with this permission.",
-    "filename" : "hdfs-site.xml"
   }, {
     "name" : "dfs.access.time.precision",
     "value" : "0",
@@ -243,316 +113,61 @@
     "value" : "5",
     "description" : null,
     "filename" : "hdfs-site.xml"
-  }, {
-    "name" : "hadoop.tmp.dir",
-    "value" : "/tmp/hadoop-${user.name}",
-    "description" : "A base for other temporary directories.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.native.lib",
-    "value" : "true",
-    "description" : "Should native hadoop libraries, if present, be used.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.group.mapping",
-    "value" : "org.apache.hadoop.security.ShellBasedUnixGroupsMapping",
-    "description" : "Class for user to group mapping (get groups for a given user)\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.authorization",
-    "value" : "false",
-    "description" : "Is service-level authorization enabled?",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.authentication",
-    "value" : "simple",
-    "description" : "Possible values are simple (no authentication), and kerberos\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.token.service.use_ip",
-    "value" : "true",
-    "description" : "Controls whether tokens always use IP addresses.  DNS changes\n  will not be detected if this option is enabled.  Existing client connections\n  that break will always reconnect to the IP of the original host.  New clients\n  will connect to the host's new IP but fail to locate a token.  Disabling\n  this option will allow existing and new clients to detect an IP change and\n  continue to locate the new host's token.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.use-weak-http-crypto",
-    "value" : "false",
-    "description" : "If enabled, use KSSL to authenticate HTTP connections to the\n  NameNode. Due to a bug in JDK6, using KSSL requires one to configure\n  Kerberos tickets to use encryption types that are known to be\n  cryptographically weak. If disabled, SPNEGO will be used for HTTP\n  authentication, which supports stronger encryption types.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.logfile.size",
-    "value" : "10000000",
-    "description" : "The max size of each log file",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.logfile.count",
-    "value" : "10",
-    "description" : "The max number of log files",
-    "filename" : "core-site.xml"
   }, {
     "name" : "io.file.buffer.size",
-    "value" : "4096",
+    "value" : "131072",
     "description" : "The size of buffer for use in sequence files.\n  The size of this buffer should probably be a multiple of hardware\n  page size (4096 on Intel x86), and it determines how much data is\n  buffered during read and write operations.",
     "filename" : "core-site.xml"
-  }, {
-    "name" : "io.bytes.per.checksum",
-    "value" : "512",
-    "description" : "The number of bytes per checksum.  Must not be larger than\n  io.file.buffer.size.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.skip.checksum.errors",
-    "value" : "false",
-    "description" : "If true, when a checksum error is encountered while\n  reading a sequence file, entries are skipped, instead of throwing an\n  exception.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.compression.codecs",
-    "value" : "org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.BZip2Codec,org.apache.hadoop.io.compress.SnappyCodec",
-    "description" : "A list of the compression codec classes that can be used\n               for compression/decompression.",
-    "filename" : "core-site.xml"
   }, {
     "name" : "io.serializations",
     "value" : "org.apache.hadoop.io.serializer.WritableSerialization",
-    "description" : "A list of serialization classes that can be used for\n  obtaining serializers and deserializers.",
+    "description" : null,
     "filename" : "core-site.xml"
   }, {
-    "name" : "fs.default.name",
-    "value" : "file:///",
-    "description" : "The name of the default file system.  A URI whose\n  scheme and authority determine the FileSystem implementation.  The\n  uri's scheme determines the config property (fs.SCHEME.impl) naming\n  the FileSystem implementation class.  The uri's authority is used to\n  determine the host, port, etc. for a filesystem.",
+    "name" : "io.compression.codec.lzo.class",
+    "value" : "com.hadoop.compression.lzo.LzoCodec",
+    "description" : "The implementation for lzo codec.",
     "filename" : "core-site.xml"
   }, {
     "name" : "fs.trash.interval",
-    "value" : "0",
+    "value" : "360",
     "description" : "Number of minutes between trash checkpoints.\n  If zero, the trash feature is disabled.\n  ",
     "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.file.impl",
-    "value" : "org.apache.hadoop.fs.LocalFileSystem",
-    "description" : "The FileSystem for file: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.hdfs.impl",
-    "value" : "org.apache.hadoop.hdfs.DistributedFileSystem",
-    "description" : "The FileSystem for hdfs: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3.impl",
-    "value" : "org.apache.hadoop.fs.s3.S3FileSystem",
-    "description" : "The FileSystem for s3: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3n.impl",
-    "value" : "org.apache.hadoop.fs.s3native.NativeS3FileSystem",
-    "description" : "The FileSystem for s3n: (Native S3) uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.kfs.impl",
-    "value" : "org.apache.hadoop.fs.kfs.KosmosFileSystem",
-    "description" : "The FileSystem for kfs: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.hftp.impl",
-    "value" : "org.apache.hadoop.hdfs.HftpFileSystem",
-    "description" : null,
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.hsftp.impl",
-    "value" : "org.apache.hadoop.hdfs.HsftpFileSystem",
-    "description" : null,
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.webhdfs.impl",
-    "value" : "org.apache.hadoop.hdfs.web.WebHdfsFileSystem",
-    "description" : null,
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.ftp.impl",
-    "value" : "org.apache.hadoop.fs.ftp.FTPFileSystem",
-    "description" : "The FileSystem for ftp: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.ramfs.impl",
-    "value" : "org.apache.hadoop.fs.InMemoryFileSystem",
-    "description" : "The FileSystem for ramfs: uris.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.har.impl",
-    "value" : "org.apache.hadoop.fs.HarFileSystem",
-    "description" : "The filesystem for Hadoop archives. ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.har.impl.disable.cache",
-    "value" : "true",
-    "description" : "Don't cache 'har' filesystem instances.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.checkpoint.dir",
-    "value" : "${hadoop.tmp.dir}/dfs/namesecondary",
-    "description" : "Determines where on the local filesystem the DFS secondary\n      name node should store the temporary images to merge.\n      If this is a comma-delimited list of directories then the image is\n      replicated in all of the directories for redundancy.\n  ",
-    "filename" : "core-site.xml"
   }, {
     "name" : "fs.checkpoint.edits.dir",
     "value" : "${fs.checkpoint.dir}",
-    "description" : "Determines where on the local filesystem the DFS secondary\n      name node should store the temporary edits to merge.\n      If this is a comma-delimited list of directoires then teh edits is\n      replicated in all of the directoires for redundancy.\n      Default value is same as fs.checkpoint.dir\n  ",
+    "description" : "Determines where on the local filesystem the DFS secondary\n        name node should store the temporary edits to merge.\n        If this is a comma-delimited list of directoires then teh edits is\n        replicated in all of the directoires for redundancy.\n        Default value is same as fs.checkpoint.dir\n    ",
     "filename" : "core-site.xml"
   }, {
     "name" : "fs.checkpoint.period",
-    "value" : "3600",
+    "value" : "21600",
     "description" : "The number of seconds between two periodic checkpoints.\n  ",
     "filename" : "core-site.xml"
   }, {
     "name" : "fs.checkpoint.size",
-    "value" : "67108864",
+    "value" : "536870912",
     "description" : "The size of the current edit log (in bytes) that triggers\n       a periodic checkpoint even if the fs.checkpoint.period hasn't expired.\n  ",
     "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3.block.size",
-    "value" : "67108864",
-    "description" : "Block size to use when writing files to S3.",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3.buffer.dir",
-    "value" : "${hadoop.tmp.dir}/s3",
-    "description" : "Determines where on the local filesystem the S3 filesystem\n  should store files before sending them to S3\n  (or after retrieving them from S3).\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3.maxRetries",
-    "value" : "4",
-    "description" : "The maximum number of retries for reading or writing files to S3,\n  before we signal failure to the application.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "fs.s3.sleepTimeSeconds",
-    "value" : "10",
-    "description" : "The number of seconds to sleep between each S3 retry.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "local.cache.size",
-    "value" : "10737418240",
-    "description" : "The limit on the size of cache you want to keep, set by default\n  to 10GB. This will act as a soft limit on the cache directory for out of band data.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.seqfile.compress.blocksize",
-    "value" : "1000000",
-    "description" : "The minimum block size for compression in block compressed\n          SequenceFiles.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.seqfile.lazydecompress",
-    "value" : "true",
-    "description" : "Should values of block-compressed SequenceFiles be decompressed\n          only when necessary.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.seqfile.sorter.recordlimit",
-    "value" : "1000000",
-    "description" : "The limit on number of records to be kept in memory in a spill\n          in SequenceFiles.Sorter\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.mapfile.bloom.size",
-    "value" : "1048576",
-    "description" : "The size of BloomFilter-s used in BloomMapFile. Each time this many\n  keys is appended the next BloomFilter will be created (inside a DynamicBloomFilter).\n  Larger values minimize the number of filters, which slightly increases the performance,\n  but may waste too much space if the total number of keys is usually much smaller\n  than this number.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "io.mapfile.bloom.error.rate",
-    "value" : "0.005",
-    "description" : "The rate of false positives in BloomFilter-s used in BloomMapFile.\n  As this value decreases, the size of BloomFilter-s increases exponentially. This\n  value is the probability of encountering false positives (default is 0.5%).\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.util.hash.type",
-    "value" : "murmur",
-    "description" : "The default implementation of Hash. Currently this can take one of the\n  two values: 'murmur' to select MurmurHash and 'jenkins' to select JenkinsHash.\n  ",
-    "filename" : "core-site.xml"
   }, {
     "name" : "ipc.client.idlethreshold",
-    "value" : "4000",
+    "value" : "8000",
     "description" : "Defines the threshold number of connections after which\n               connections will be inspected for idleness.\n  ",
     "filename" : "core-site.xml"
-  }, {
-    "name" : "ipc.client.kill.max",
-    "value" : "10",
-    "description" : "Defines the maximum number of clients to disconnect in one go.\n  ",
-    "filename" : "core-site.xml"
   }, {
     "name" : "ipc.client.connection.maxidletime",
-    "value" : "10000",
-    "description" : "The maximum time in msec after which a client will bring down the\n               connection to the server.\n  ",
+    "value" : "30000",
+    "description" : "The maximum time after which a client will bring down the\n               connection to the server.\n  ",
     "filename" : "core-site.xml"
   }, {
     "name" : "ipc.client.connect.max.retries",
-    "value" : "10",
-    "description" : "Indicates the number of retries a client will make to establish\n               a server connection.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "ipc.server.listen.queue.size",
-    "value" : "128",
-    "description" : "Indicates the length of the listen queue for servers accepting\n               client connections.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "ipc.server.tcpnodelay",
-    "value" : "false",
-    "description" : "Turn on/off Nagle's algorithm for the TCP socket connection on\n  the server. Setting to true disables the algorithm and may decrease latency\n  with a cost of more/smaller packets.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "ipc.client.tcpnodelay",
-    "value" : "false",
-    "description" : "Turn on/off Nagle's algorithm for the TCP socket connection on\n  the client. Setting to true disables the algorithm and may decrease latency\n  with a cost of more/smaller packets.\n  ",
+    "value" : "50",
+    "description" : "Defines the maximum number of retries for IPC connections.",
     "filename" : "core-site.xml"
   }, {
     "name" : "webinterface.private.actions",
     "value" : "false",
     "description" : " If set to true, the web interfaces of JT and NN may contain\n                actions, such as kill job, delete file, etc., that should\n                not be exposed to public. Enable this option if the interfaces\n                are only reachable by those who have the right authorization.\n  ",
     "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.rpc.socket.factory.class.default",
-    "value" : "org.apache.hadoop.net.StandardSocketFactory",
-    "description" : " Default SocketFactory to use. This parameter is expected to be\n    formatted as \"package.FactoryClassName\".\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "topology.node.switch.mapping.impl",
-    "value" : "org.apache.hadoop.net.ScriptBasedMapping",
-    "description" : " The default implementation of the DNSToSwitchMapping. It\n    invokes a script specified in topology.script.file.name to resolve\n    node names. If the value for topology.script.file.name is not set, the\n    default value of DEFAULT_RACK is returned for all node names.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "topology.script.number.args",
-    "value" : "100",
-    "description" : " The max number of args that the script configured with\n    topology.script.file.name should be run with. Each arg is an\n    IP address.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.security.uid.cache.secs",
-    "value" : "14400",
-    "description" : " NativeIO maintains a cache from UID to UserName. This is\n  the timeout for an entry in that cache. ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.type",
-    "value" : "simple",
-    "description" : "\n    Defines authentication used for Oozie HTTP endpoint.\n    Supported values are: simple | kerberos | #AUTHENTICATION_HANDLER_CLASSNAME#\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.token.validity",
-    "value" : "36000",
-    "description" : "\n    Indicates how long (in seconds) an authentication token is valid before it has\n    to be renewed.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.signature.secret.file",
-    "value" : "${user.home}/hadoop-http-auth-signature-secret",
-    "description" : "\n    The signature secret for signing the authentication tokens.\n    If not set a random secret is generated at startup time.\n    The same secret should be used for JT/NN/DN/TT configurations.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.simple.anonymous.allowed",
-    "value" : "true",
-    "description" : "\n    Indicates if anonymous requests are allowed when using 'simple' authentication.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.kerberos.principal",
-    "value" : "HTTP/localhost@LOCALHOST",
-    "description" : "\n    Indicates the Kerberos principal to be used for HTTP endpoint.\n    The principal MUST start with 'HTTP/' as per Kerberos HTTP SPNEGO specification.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.http.authentication.kerberos.keytab",
-    "value" : "${user.home}/hadoop.keytab",
-    "description" : "\n    Location of the keytab file with the credentials for the principal.\n    Referring to the same keytab file Oozie uses for its Kerberos credentials for Hadoop.\n  ",
-    "filename" : "core-site.xml"
-  }, {
-    "name" : "hadoop.relaxed.worker.version.check",
-    "value" : "false",
-    "description" : "\n    By default datanodes refuse to connect to namenodes if their build\n    revision (svn revision) do not match, and tasktrackers refuse to\n    connect to jobtrackers if their build version (version, revision,\n    user, and source checksum) do not match. This option changes the\n    behavior of hadoop workers to only check for a version match (eg\n    \"1.0.2\") but ignore the other build fields (revision, user, and\n    source checksum).\n  ",
-    "filename" : "core-site.xml"
   } ],
   "components" : [ {
     "name" : "NAMENODE",
@@ -575,6 +190,7 @@
     "client" : true,
     "master" : false
   } ],
+  "clientOnlyService" : false,
   "clientComponent" : {
     "name" : "HDFS_CLIENT",
     "category" : "CLIENT",

+ 77 - 24
ambari-web/app/assets/data/wizard/stack/hdp/version01/HIVE.json

@@ -1,27 +1,80 @@
 {
-  "name": "HIVE",
-  "version": "1.0",
-  "user": "root",
-  "comment": "This is comment for HIVE service",
-  "properties": [ ],
-  "components": [
-    {
-      "name": "HIVE_SERVER",
-      "category": "MASTER",
-      "client": false,
-      "master": true
-    },
-    {
-      "name": "HIVE_CLIENT",
-      "category": "CLIENT",
-      "client": true,
-      "master": false
-    }
-  ],
-  "clientComponent": {
-    "name": "HIVE_CLIENT",
-    "category": "CLIENT",
-    "client": true,
-    "master": false
+  "name" : "HIVE",
+  "version" : "0.9.0.1-1",
+  "user" : "root",
+  "comment" : "This is comment for HIVE service",
+  "properties" : [ {
+    "name" : "hive.metastore.local",
+    "value" : "false",
+    "description" : "controls whether to connect to remove metastore server or\n    open a new metastore server in Hive Client JVM",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "javax.jdo.option.ConnectionDriverName",
+    "value" : "com.mysql.jdbc.Driver",
+    "description" : "Driver class name for a JDBC metastore",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.metastore.warehouse.dir",
+    "value" : "/apps/hive/warehouse",
+    "description" : "location of default database for the warehouse",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.metastore.cache.pinobjtypes",
+    "value" : "Table,Database,Type,FieldSchema,Order",
+    "description" : "List of comma separated metastore object types that should be pinned in the cache",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.semantic.analyzer.factory.impl",
+    "value" : "org.apache.hivealog.cli.HCatSemanticAnalyzerFactory",
+    "description" : "controls which SemanticAnalyzerFactory implemenation class is used by CLI",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hadoop.clientside.fs.operations",
+    "value" : "true",
+    "description" : "FS operations are owned by client",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.metastore.client.socket.timeout",
+    "value" : "60",
+    "description" : "MetaStore Client socket timeout in seconds",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.metastore.execute.setugi",
+    "value" : "true",
+    "description" : "In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and     server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.security.authorization.enabled",
+    "value" : "true",
+    "description" : "enable or disable the hive client authorization",
+    "filename" : "hive-site.xml"
+  }, {
+    "name" : "hive.security.authorization.manager",
+    "value" : "org.apache.hcatalog.security.HdfsAuthorizationProvider",
+    "description" : "the hive client authorization manager class name.\n    The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider.  ",
+    "filename" : "hive-site.xml"
+  } ],
+  "components" : [ {
+    "name" : "HIVE_SERVER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "MYSQL_SERVER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "HIVE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : false,
+  "clientComponent" : {
+    "name" : "HIVE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
   }
 }

+ 222 - 721
ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json

@@ -1,724 +1,225 @@
 {
-  "name": "MAPREDUCE",
-  "version": "1.0",
-  "user": "mapred",
-  "comment": "This is comment for MAPREDUCE service",
-  "properties": [
-    {
-      "name": "io.sort.factor",
-      "value": "10",
-      "description": "The number of streams to merge at once while sorting\n  files.  This determines the number of open file handles.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "io.sort.mb",
-      "value": "100",
-      "description": "The total amount of buffer memory to use while sorting\n  files, in megabytes.  By default, gives each merge stream 1MB, which\n  should minimize seeks.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "io.sort.record.percent",
-      "value": "0.05",
-      "description": "The percentage of io.sort.mb dedicated to tracking record\n  boundaries. Let this value be r, io.sort.mb be x. The maximum number\n  of records collected before the collection thread must block is equal\n  to (r * x) / 4",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "io.sort.spill.percent",
-      "value": "0.80",
-      "description": "The soft limit in either the buffer or record collection\n  buffers. Once reached, a thread will begin to spill the contents to disk\n  in the background. Note that this does not imply any chunking of data to\n  the spill. A value less than 0.5 is not recommended.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "io.map.index.skip",
-      "value": "0",
-      "description": "Number of index entries to skip between each entry.\n  Zero by default. Setting this to values larger than zero can\n  facilitate opening large map files using less memory.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker",
-      "value": "local",
-      "description": "The host and port that the MapReduce job tracker runs\n  at.  If \"local\", then jobs are run in-process as a single map\n  and reduce task.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.http.address",
-      "value": "0.0.0.0:50030",
-      "description": "\n    The job tracker http server address and port the server will listen on.\n    If the port is 0 then the server will start on a free port.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.handler.count",
-      "value": "10",
-      "description": "\n    The number of server threads for the JobTracker. This should be roughly\n    4% of the number of tasktracker nodes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.tracker.report.address",
-      "value": "127.0.0.1:0",
-      "description": "The interface and port that task tracker server listens on.\n  Since it is only connected to by the tasks, it uses the local interface.\n  EXPERT ONLY. Should only be changed if your host does not have the loopback\n  interface.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.local.dir",
-      "value": "${hadoop.tmp.dir}/mapred/local",
-      "description": "The local directory where MapReduce stores intermediate\n  data files.  May be a comma-separated list of\n  directories on different devices in order to spread disk i/o.\n  Directories that do not exist are ignored.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.system.dir",
-      "value": "${hadoop.tmp.dir}/mapred/system",
-      "description": "The directory where MapReduce stores control files.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.jobtracker.staging.root.dir",
-      "value": "${hadoop.tmp.dir}/mapred/staging",
-      "description": "The root of the staging area for users' job files\n  In practice, this should be the directory where users' home\n  directories are located (usually /user)\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.temp.dir",
-      "value": "${hadoop.tmp.dir}/mapred/temp",
-      "description": "A shared directory for temporary files.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.local.dir.minspacestart",
-      "value": "0",
-      "description": "If the space in mapred.local.dir drops under this,\n  do not ask for more tasks.\n  Value in bytes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.local.dir.minspacekill",
-      "value": "0",
-      "description": "If the space in mapred.local.dir drops under this,\n    do not ask more tasks until all the current ones have finished and\n    cleaned up. Also, to save the rest of the tasks we have running,\n    kill one of them, to clean up some space. Start with the reduce tasks,\n    then go with the ones that have finished the least.\n    Value in bytes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.expiry.interval",
-      "value": "600000",
-      "description": "Expert: The time-interval, in miliseconds, after which\n  a tasktracker is declared 'lost' if it doesn't send heartbeats.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.taskmemorymanager.monitoring-interval",
-      "value": "5000",
-      "description": "The interval, in milliseconds, for which the tasktracker waits\n   between two cycles of monitoring its tasks' memory usage. Used only if\n   tasks' memory management is enabled via mapred.tasktracker.tasks.maxmemory.\n   ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.tasks.sleeptime-before-sigkill",
-      "value": "5000",
-      "description": "The time, in milliseconds, the tasktracker waits for sending a\n  SIGKILL to a process, after it has been sent a SIGTERM.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.map.tasks",
-      "value": "2",
-      "description": "The default number of map tasks per job.\n  Ignored when mapred.job.tracker is \"local\".\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.reduce.tasks",
-      "value": "1",
-      "description": "The default number of reduce tasks per job. Typically set to 99%\n  of the cluster's reduce capacity, so that if a node fails the reduces can\n  still be executed in a single wave.\n  Ignored when mapred.job.tracker is \"local\".\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.tasktracker.outofband.heartbeat",
-      "value": "false",
-      "description": "Expert: Set this to true to let the tasktracker send an\n  out-of-band heartbeat on task-completion for better latency.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.tasktracker.outofband.heartbeat.damper",
-      "value": "1000000",
-      "description": "When out-of-band heartbeats are enabled, provides\n  damping to avoid overwhelming the JobTracker if too many out-of-band\n  heartbeats would occur. The damping is calculated such that the\n  heartbeat interval is divided by (T*D + 1) where T is the number\n  of completed tasks and D is the damper value.\n\n  Setting this to a high value like the default provides no damping --\n  as soon as any task finishes, a heartbeat will be sent. Setting this\n  parameter to 0 is equivalent to disabling the out-of-band heartbeat feature.\n  A value of 1 would indicate that, after one task has completed, the\n  time to wait before the next heartbeat would be 1/2 the usual time.\n  After two tasks have finished, it would be 1/3 the usual time, etc.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.restart.recover",
-      "value": "false",
-      "description": "\"true\" to enable (job) recovery upon restart,\n               \"false\" to start afresh\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.job.history.block.size",
-      "value": "3145728",
-      "description": "The block size of the job history file. Since the job recovery\n               uses job history, its important to dump job history to disk as\n               soon as possible. Note that this is an expert level parameter.\n               The default value is set to 3 MB.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.split.metainfo.maxsize",
-      "value": "10000000",
-      "description": "The maximum permissible size of the split metainfo file.\n  The JobTracker won't attempt to read split metainfo files bigger than\n  the configured value.\n  No limits if set to -1.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.taskScheduler",
-      "value": "org.apache.hadoop.mapred.JobQueueTaskScheduler",
-      "description": "The class responsible for scheduling the tasks.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.map.max.attempts",
-      "value": "4",
-      "description": "Expert: The maximum number of attempts per map task.\n  In other words, framework will try to execute a map task these many number\n  of times before giving up on it.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.reduce.max.attempts",
-      "value": "4",
-      "description": "Expert: The maximum number of attempts per reduce task.\n  In other words, framework will try to execute a reduce task these many number\n  of times before giving up on it.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.reduce.parallel.copies",
-      "value": "5",
-      "description": "The default number of parallel transfers run by reduce\n  during the copy(shuffle) phase.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.reduce.shuffle.maxfetchfailures",
-      "value": "10",
-      "description": "The maximum number of times a reducer tries to\n  fetch a map output before it reports it.\n",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.reduce.shuffle.connect.timeout",
-      "value": "180000",
-      "description": "Expert: The maximum amount of time (in milli seconds) a reduce\n  task spends in trying to connect to a tasktracker for getting map output.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.reduce.shuffle.read.timeout",
-      "value": "180000",
-      "description": "Expert: The maximum amount of time (in milli seconds) a reduce\n  task waits for map output data to be available for reading after obtaining\n  connection.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.timeout",
-      "value": "600000",
-      "description": "The number of milliseconds before a task will be\n  terminated if it neither reads an input, writes an output, nor\n  updates its status string.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.map.tasks.maximum",
-      "value": "2",
-      "description": "The maximum number of map tasks that will be run\n  simultaneously by a task tracker.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.reduce.tasks.maximum",
-      "value": "2",
-      "description": "The maximum number of reduce tasks that will be run\n  simultaneously by a task tracker.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.completeuserjobs.maximum",
-      "value": "100",
-      "description": "The maximum number of complete jobs per user to keep around\n  before delegating them to the job history.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.reduce.input.limit",
-      "value": "-1",
-      "description": "The limit on the input size of the reduce. If the estimated\n  input size of the reduce is greater than this value, job is failed. A\n  value of -1 means that there is no limit set. ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.retiredjobs.cache.size",
-      "value": "1000",
-      "description": "The number of retired job status to keep in the cache.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.jobhistory.lru.cache.size",
-      "value": "5",
-      "description": "The number of job history files loaded in memory. The jobs are\n  loaded when they are first accessed. The cache is cleared based on LRU.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.child.java.opts",
-      "value": "-Xmx200m",
-      "description": "Java opts for the task tracker child processes.\n  The following symbol, if present, will be interpolated: @taskid@ is replaced\n  by current TaskID. Any other occurrences of '@' will go unchanged.\n  For example, to enable verbose gc logging to a file named for the taskid in\n  /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:\n        -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc\n\n  The configuration variable mapred.child.ulimit can be used to control the\n  maximum virtual memory of the child processes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.cluster.map.memory.mb",
-      "value": "-1",
-      "description": "The size, in terms of virtual memory, of a single map slot\n  in the Map-Reduce framework, used by the scheduler.\n  A job can ask for multiple slots for a single map task via\n  mapred.job.map.memory.mb, upto the limit specified by\n  mapred.cluster.max.map.memory.mb, if the scheduler supports the feature.\n  The value of -1 indicates that this feature is turned off.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.cluster.reduce.memory.mb",
-      "value": "-1",
-      "description": "The size, in terms of virtual memory, of a single reduce slot\n  in the Map-Reduce framework, used by the scheduler.\n  A job can ask for multiple slots for a single reduce task via\n  mapred.job.reduce.memory.mb, upto the limit specified by\n  mapred.cluster.max.reduce.memory.mb, if the scheduler supports the feature.\n  The value of -1 indicates that this feature is turned off.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.cluster.max.map.memory.mb",
-      "value": "-1",
-      "description": "The maximum size, in terms of virtual memory, of a single map\n  task launched by the Map-Reduce framework, used by the scheduler.\n  A job can ask for multiple slots for a single map task via\n  mapred.job.map.memory.mb, upto the limit specified by\n  mapred.cluster.max.map.memory.mb, if the scheduler supports the feature.\n  The value of -1 indicates that this feature is turned off.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.cluster.max.reduce.memory.mb",
-      "value": "-1",
-      "description": "The maximum size, in terms of virtual memory, of a single reduce\n  task launched by the Map-Reduce framework, used by the scheduler.\n  A job can ask for multiple slots for a single reduce task via\n  mapred.job.reduce.memory.mb, upto the limit specified by\n  mapred.cluster.max.reduce.memory.mb, if the scheduler supports the feature.\n  The value of -1 indicates that this feature is turned off.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.map.memory.mb",
-      "value": "-1",
-      "description": "The size, in terms of virtual memory, of a single map task\n  for the job.\n  A job can ask for multiple slots for a single map task, rounded up to the\n  next multiple of mapred.cluster.map.memory.mb and upto the limit\n  specified by mapred.cluster.max.map.memory.mb, if the scheduler supports\n  the feature.\n  The value of -1 indicates that this feature is turned off iff\n  mapred.cluster.map.memory.mb is also turned off (-1).\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.reduce.memory.mb",
-      "value": "-1",
-      "description": "The size, in terms of virtual memory, of a single reduce task\n  for the job.\n  A job can ask for multiple slots for a single map task, rounded up to the\n  next multiple of mapred.cluster.reduce.memory.mb and upto the limit\n  specified by mapred.cluster.max.reduce.memory.mb, if the scheduler supports\n  the feature.\n  The value of -1 indicates that this feature is turned off iff\n  mapred.cluster.reduce.memory.mb is also turned off (-1).\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.child.tmp",
-      "value": "./tmp",
-      "description": " To set the value of tmp directory for map and reduce tasks.\n  If the value is an absolute path, it is directly assigned. Otherwise, it is\n  prepended with task's working directory. The java tasks are executed with\n  option -Djava.io.tmpdir='the absolute path of the tmp dir'. Pipes and\n  streaming are set with environment variable,\n   TMPDIR='the absolute path of the tmp dir'\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.inmem.merge.threshold",
-      "value": "1000",
-      "description": "The threshold, in terms of the number of files\n  for the in-memory merge process. When we accumulate threshold number of files\n  we initiate the in-memory merge and spill to disk. A value of 0 or less than\n  0 indicates we want to DON'T have any threshold and instead depend only on\n  the ramfs's memory consumption to trigger the merge.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.shuffle.merge.percent",
-      "value": "0.66",
-      "description": "The usage threshold at which an in-memory merge will be\n  initiated, expressed as a percentage of the total memory allocated to\n  storing in-memory map outputs, as defined by\n  mapred.job.shuffle.input.buffer.percent.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.shuffle.input.buffer.percent",
-      "value": "0.70",
-      "description": "The percentage of memory to be allocated from the maximum heap\n  size to storing map outputs during the shuffle.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.reduce.input.buffer.percent",
-      "value": "0.0",
-      "description": "The percentage of memory- relative to the maximum heap size- to\n  retain map outputs during the reduce. When the shuffle is concluded, any\n  remaining map outputs in memory must consume less than this threshold before\n  the reduce can begin.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.map.tasks.speculative.execution",
-      "value": "true",
-      "description": "If true, then multiple instances of some map tasks\n               may be executed in parallel.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.reduce.tasks.speculative.execution",
-      "value": "true",
-      "description": "If true, then multiple instances of some reduce tasks\n               may be executed in parallel.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.reuse.jvm.num.tasks",
-      "value": "1",
-      "description": "How many tasks to run per jvm. If set to -1, there is\n  no limit.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.min.split.size",
-      "value": "0",
-      "description": "The minimum size chunk that map input should be split\n  into.  Note that some file formats may have minimum split sizes that\n  take priority over this setting.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.maxtasks.per.job",
-      "value": "-1",
-      "description": "The maximum number of tasks for a single job.\n  A value of -1 indicates that there is no maximum.  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.submit.replication",
-      "value": "10",
-      "description": "The replication level for submitted job files.  This\n  should be around the square root of the number of nodes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.dns.interface",
-      "value": "default",
-      "description": "The name of the Network Interface from which a task\n  tracker should report its IP address.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.dns.nameserver",
-      "value": "default",
-      "description": "The host name or IP address of the name server (DNS)\n  which a TaskTracker should use to determine the host name used by\n  the JobTracker for communication and display purposes.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "tasktracker.http.threads",
-      "value": "40",
-      "description": "The number of worker threads that for the http server. This is\n               used for map output fetching\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.tracker.http.address",
-      "value": "0.0.0.0:50060",
-      "description": "\n    The task tracker http server address and port.\n    If the port is 0 then the server will start on a free port.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "keep.failed.task.files",
-      "value": "false",
-      "description": "Should the files for failed tasks be kept. This should only be\n               used on jobs that are failing, because the storage is never\n               reclaimed. It also prevents the map outputs from being erased\n               from the reduce directory as they are consumed.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.output.compress",
-      "value": "false",
-      "description": "Should the job outputs be compressed?\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.output.compression.type",
-      "value": "RECORD",
-      "description": "If the job outputs are to compressed as SequenceFiles, how should\n               they be compressed? Should be one of NONE, RECORD or BLOCK.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.output.compression.codec",
-      "value": "org.apache.hadoop.io.compress.DefaultCodec",
-      "description": "If the job outputs are compressed, how should they be compressed?\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.compress.map.output",
-      "value": "false",
-      "description": "Should the outputs of the maps be compressed before being\n               sent across the network. Uses SequenceFile compression.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.map.output.compression.codec",
-      "value": "org.apache.hadoop.io.compress.DefaultCodec",
-      "description": "If the map outputs are compressed, how should they be\n               compressed?\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "map.sort.class",
-      "value": "org.apache.hadoop.util.QuickSort",
-      "description": "The default sort class for sorting keys.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.userlog.limit.kb",
-      "value": "0",
-      "description": "The maximum size of user-logs of each task in KB. 0 disables the cap.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.userlog.retain.hours",
-      "value": "24",
-      "description": "The maximum time, in hours, for which the user-logs are to be\n               retained after the job completion.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.user.jobconf.limit",
-      "value": "5242880",
-      "description": "The maximum allowed size of the user jobconf. The\n  default is set to 5 MB",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.heartbeats.in.second",
-      "value": "100",
-      "description": "Expert: Approximate number of heart-beats that could arrive\n               at JobTracker in a second. Assuming each RPC can be processed\n               in 10msec, the default value is made 100 RPCs in a second.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.max.tracker.blacklists",
-      "value": "4",
-      "description": "The number of blacklists for a tasktracker by various jobs\n               after which the tasktracker will be marked as potentially\n               faulty and is a candidate for graylisting across all jobs.\n               (Unlike blacklisting, this is advisory; the tracker remains\n               active.  However, it is reported as graylisted in the web UI,\n               with the expectation that chronically graylisted trackers\n               will be manually decommissioned.)  This value is tied to\n               mapred.jobtracker.blacklist.fault-timeout-window; faults\n               older than the window width are forgiven, so the tracker\n               will recover from transient problems.  It will also become\n               healthy after a restart.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.blacklist.fault-timeout-window",
-      "value": "180",
-      "description": "The timeout (in minutes) after which per-job tasktracker\n               faults are forgiven.  The window is logically a circular\n               buffer of time-interval buckets whose width is defined by\n               mapred.jobtracker.blacklist.fault-bucket-width; when the\n               \"now\" pointer moves across a bucket boundary, the previous\n               contents (faults) of the new bucket are cleared.  In other\n               words, the timeout's granularity is determined by the bucket\n               width.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.jobtracker.blacklist.fault-bucket-width",
-      "value": "15",
-      "description": "The width (in minutes) of each bucket in the tasktracker\n               fault timeout window.  Each bucket is reused in a circular\n               manner after a full timeout-window interval (defined by\n               mapred.jobtracker.blacklist.fault-timeout-window).\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.max.tracker.failures",
-      "value": "4",
-      "description": "The number of task-failures on a tasktracker of a given job\n               after which new tasks of that job aren't assigned to it.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "jobclient.output.filter",
-      "value": "FAILED",
-      "description": "The filter for controlling the output of the task's userlogs sent\n               to the console of the JobClient.\n               The permissible options are: NONE, KILLED, FAILED, SUCCEEDED and\n               ALL.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.persist.jobstatus.active",
-      "value": "false",
-      "description": "Indicates if persistency of job status information is\n      active or not.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.persist.jobstatus.hours",
-      "value": "0",
-      "description": "The number of hours job status information is persisted in DFS.\n    The job status information will be available after it drops of the memory\n    queue and between jobtracker restarts. With a zero value the job status\n    information is not persisted at all in DFS.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.tracker.persist.jobstatus.dir",
-      "value": "/jobtracker/jobsInfo",
-      "description": "The directory where the job status information is persisted\n      in a file system to be available after it drops of the memory queue and\n      between jobtracker restarts.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.complete.cancel.delegation.tokens",
-      "value": "true",
-      "description": " if false - do not unregister/cancel delegation tokens\n    from renewal, because same tokens may be used by spawned jobs\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.profile",
-      "value": "false",
-      "description": "To set whether the system should collect profiler\n     information for some of the tasks in this job? The information is stored\n     in the user log directory. The value is \"true\" if task profiling\n     is enabled.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.profile.maps",
-      "value": "0-2",
-      "description": " To set the ranges of map tasks to profile.\n    mapred.task.profile has to be set to true for the value to be accounted.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.profile.reduces",
-      "value": "0-2",
-      "description": " To set the ranges of reduce tasks to profile.\n    mapred.task.profile has to be set to true for the value to be accounted.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.line.input.format.linespermap",
-      "value": "1",
-      "description": " Number of lines per split in NLineInputFormat.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.skip.attempts.to.start.skipping",
-      "value": "2",
-      "description": " The number of Task attempts AFTER which skip mode\n    will be kicked off. When skip mode is kicked off, the\n    tasks reports the range of records which it will process\n    next, to the TaskTracker. So that on failures, TT knows which\n    ones are possibly the bad records. On further executions,\n    those are skipped.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.skip.map.auto.incr.proc.count",
-      "value": "true",
-      "description": " The flag which if set to true,\n    SkipBadRecords.COUNTER_MAP_PROCESSED_RECORDS is incremented\n    by MapRunner after invoking the map function. This value must be set to\n    false for applications which process the records asynchronously\n    or buffer the input records. For example streaming.\n    In such cases applications should increment this counter on their own.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.skip.reduce.auto.incr.proc.count",
-      "value": "true",
-      "description": " The flag which if set to true,\n    SkipBadRecords.COUNTER_REDUCE_PROCESSED_GROUPS is incremented\n    by framework after invoking the reduce function. This value must be set to\n    false for applications which process the records asynchronously\n    or buffer the input records. For example streaming.\n    In such cases applications should increment this counter on their own.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.skip.map.max.skip.records",
-      "value": "0",
-      "description": " The number of acceptable skip records surrounding the bad\n    record PER bad record in mapper. The number includes the bad record as well.\n    To turn the feature of detection/skipping of bad records off, set the\n    value to 0.\n    The framework tries to narrow down the skipped range by retrying\n    until this threshold is met OR all attempts get exhausted for this task.\n    Set the value to Long.MAX_VALUE to indicate that framework need not try to\n    narrow down. Whatever records(depends on application) get skipped are\n    acceptable.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.skip.reduce.max.skip.groups",
-      "value": "0",
-      "description": " The number of acceptable skip groups surrounding the bad\n    group PER bad group in reducer. The number includes the bad group as well.\n    To turn the feature of detection/skipping of bad groups off, set the\n    value to 0.\n    The framework tries to narrow down the skipped range by retrying\n    until this threshold is met OR all attempts get exhausted for this task.\n    Set the value to Long.MAX_VALUE to indicate that framework need not try to\n    narrow down. Whatever groups(depends on application) get skipped are\n    acceptable.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.ifile.readahead",
-      "value": "true",
-      "description": "Configuration key to enable/disable IFile readahead.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.ifile.readahead.bytes",
-      "value": "4194304",
-      "description": "Configuration key to set the IFile readahead length in bytes.\n    ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "job.end.retry.attempts",
-      "value": "0",
-      "description": "Indicates how many times hadoop should attempt to contact the\n               notification URL ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "job.end.retry.interval",
-      "value": "30000",
-      "description": "Indicates time in milliseconds between notification URL retry\n                calls",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.cache.levels",
-      "value": "2",
-      "description": " This is the max level of the task cache. For example, if\n    the level is 2, the tasks cached are at the host level and at the rack\n    level.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.queue.names",
-      "value": "default",
-      "description": " Comma separated list of queues configured for this jobtracker.\n    Jobs are added to queues and schedulers can configure different\n    scheduling properties for the various queues. To configure a property\n    for a queue, the name of the queue must match the name specified in this\n    value. Queue properties that are common to all schedulers are configured\n    here with the naming convention, mapred.queue.$QUEUE-NAME.$PROPERTY-NAME,\n    for e.g. mapred.queue.default.submit-job-acl.\n    The number of queues configured in this parameter could depend on the\n    type of scheduler being used, as specified in\n    mapred.jobtracker.taskScheduler. For example, the JobQueueTaskScheduler\n    supports only a single queue, which is the default configured here.\n    Before adding more queues, ensure that the scheduler you've configured\n    supports multiple queues.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.acls.enabled",
-      "value": "false",
-      "description": " Specifies whether ACLs should be checked\n    for authorization of users for doing various queue and job level operations.\n    ACLs are disabled by default. If enabled, access control checks are made by\n    JobTracker and TaskTracker when requests are made by users for queue\n    operations like submit job to a queue and kill a job in the queue and job\n    operations like viewing the job-details (See mapreduce.job.acl-view-job)\n    or for modifying the job (See mapreduce.job.acl-modify-job) using\n    Map/Reduce APIs, RPCs or via the console and web user interfaces.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.queue.default.state",
-      "value": "RUNNING",
-      "description": "\n   This values defines the state , default queue is in.\n   the values can be either \"STOPPED\" or \"RUNNING\"\n   This value can be changed at runtime.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.job.queue.name",
-      "value": "default",
-      "description": " Queue to which a job is submitted. This must match one of the\n    queues defined in mapred.queue.names for the system. Also, the ACL setup\n    for the queue must allow the current user to submit a job to the queue.\n    Before specifying a queue, ensure that the system is configured with\n    the queue, and access is allowed for submitting jobs to the queue.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.acl-modify-job",
-      "value": " ",
-      "description": " Job specific access-control list for 'modifying' the job. It\n    is only used if authorization is enabled in Map/Reduce by setting the\n    configuration property mapred.acls.enabled to true.\n    This specifies the list of users and/or groups who can do modification\n    operations on the job. For specifying a list of users and groups the\n    format to use is \"user1,user2 group1,group\". If set to '*', it allows all\n    users/groups to modify this job. If set to ' '(i.e. space), it allows\n    none. This configuration is used to guard all the modifications with respect\n    to this job and takes care of all the following operations:\n      o killing this job\n      o killing a task of this job, failing a task of this job\n      o setting the priority of this job\n    Each of these operations are also protected by the per-queue level ACL\n    \"acl-administer-jobs\" configured via mapred-queues.xml. So a caller should\n    have the authorization to satisfy either the queue-level ACL or the\n    job-level ACL.\n\n    Irrespective of this ACL configuration, job-owner, the user who started the\n    cluster, cluster administrators configured via\n    mapreduce.cluster.administrators and queue administrators of the queue to\n    which this job is submitted to configured via\n    mapred.queue.queue-name.acl-administer-jobs  in mapred-queue-acls.xml can\n    do all the modification operations on a job.\n\n    By default, nobody else besides job-owner, the user who started the cluster,\n    cluster administrators and queue administrators can perform modification\n    operations on a job.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.acl-view-job",
-      "value": " ",
-      "description": " Job specific access-control list for 'viewing' the job. It is\n    only used if authorization is enabled in Map/Reduce by setting the\n    configuration property mapred.acls.enabled to true.\n    This specifies the list of users and/or groups who can view private details\n    about the job. For specifying a list of users and groups the\n    format to use is \"user1,user2 group1,group\". If set to '*', it allows all\n    users/groups to modify this job. If set to ' '(i.e. space), it allows\n    none. This configuration is used to guard some of the job-views and at\n    present only protects APIs that can return possibly sensitive information\n    of the job-owner like\n      o job-level counters\n      o task-level counters\n      o tasks' diagnostic information\n      o task-logs displayed on the TaskTracker web-UI and\n      o job.xml showed by the JobTracker's web-UI\n    Every other piece of information of jobs is still accessible by any other\n    user, for e.g., JobStatus, JobProfile, list of jobs in the queue, etc.\n\n    Irrespective of this ACL configuration, job-owner, the user who started the\n    cluster, cluster administrators configured via\n    mapreduce.cluster.administrators and queue administrators of the queue to\n    which this job is submitted to configured via\n    mapred.queue.queue-name.acl-administer-jobs in mapred-queue-acls.xml can do\n    all the view operations on a job.\n\n    By default, nobody else besides job-owner, the user who started the\n    cluster, cluster administrators and queue administrators can perform\n    view operations on a job.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.tasktracker.indexcache.mb",
-      "value": "10",
-      "description": " The maximum memory that a task tracker allows for the\n    index cache that is used when serving map outputs to reducers.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.combine.recordsBeforeProgress",
-      "value": "10000",
-      "description": " The number of records to process during combine output collection\n   before sending a progress notification to the TaskTracker.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.merge.recordsBeforeProgress",
-      "value": "10000",
-      "description": " The number of records to process during merge before\n   sending a progress notification to the TaskTracker.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.reduce.slowstart.completed.maps",
-      "value": "0.05",
-      "description": "Fraction of the number of maps in the job which should be\n  complete before reduces are scheduled for the job.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.task.tracker.task-controller",
-      "value": "org.apache.hadoop.mapred.DefaultTaskController",
-      "description": "TaskController which is used to launch and manage task execution\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.disk.healthChecker.interval",
-      "value": "60000",
-      "description": "How often the TaskTracker checks the health of its\n  local directories. Configuring this to a value smaller than the\n  heartbeat interval is equivalent to setting this to heartbeat\n  interval value.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.healthChecker.interval",
-      "value": "60000",
-      "description": "Frequency of the node health script to be run,\n  in milliseconds",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapred.healthChecker.script.timeout",
-      "value": "600000",
-      "description": "Time after node health script should be killed if\n  unresponsive and considered that the script has failed.",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.counters.max",
-      "value": "120",
-      "description": "Limit on the number of counters allowed per job.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.counters.groups.max",
-      "value": "50",
-      "description": "Limit on the number of counter groups allowed per job.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.counters.counter.name.max",
-      "value": "64",
-      "description": "Limit on the length of counter names in jobs. Names\n  exceeding this limit will be truncated.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.job.counters.group.name.max",
-      "value": "128",
-      "description": "Limit on the length of counter group names in jobs. Names\n  exceeding this limit will be truncated.\n  ",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.history.server.embedded",
-      "value": "false",
-      "description": "",
-      "filename": "mapred-site.xml"
-    },
-    {
-      "name": "mapreduce.history.server.http.address",
-      "value": "localhost:51111",
-      "description": "",
-      "filename": "mapred-site.xml"
-    }
-  ],
-  "components": [
-    {
-      "name": "JOBTRACKER",
-      "category": "MASTER",
-      "client": false,
-      "master": true
-    },
-    {
-      "name": "TASKTRACKER",
-      "category": "SLAVE",
-      "client": false,
-      "master": false
-    },
-    {
-      "name": "MAPREDUCE_CLIENT",
-      "category": "CLIENT",
-      "client": true,
-      "master": false
-    }
-  ],
-  "clientComponent": {
-    "name": "MAPREDUCE_CLIENT",
-    "category": "CLIENT",
-    "client": true,
-    "master": false
+  "name" : "MAPREDUCE",
+  "version" : "1.1.0.1-1",
+  "user" : "mapred",
+  "comment" : "This is comment for MAPREDUCE service",
+  "properties" : [ {
+    "name" : "io.sort.record.percent",
+    "value" : ".2",
+    "description" : "No description",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "io.sort.factor",
+    "value" : "100",
+    "description" : "No description",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.tasktracker.tasks.sleeptime-before-sigkill",
+    "value" : "250",
+    "description" : "Normally, this is the amount of time before killing\n  processes, and the recommended-default is 5.000 seconds - a value of\n  5000 here.  In this case, we are using it solely to blast tasks before\n  killing them, and killing them very quickly (1/4 second) to guarantee\n  that we do not leave VMs around for later jobs.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.tracker.handler.count",
+    "value" : "50",
+    "description" : "\n    The number of server threads for the JobTracker. This should be roughly\n    4% of the number of tasktracker nodes.\n    ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.cluster.administrators",
+    "value" : " hadoop",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.reduce.parallel.copies",
+    "value" : "30",
+    "description" : "No description",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "tasktracker.http.threads",
+    "value" : "50",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.map.tasks.speculative.execution",
+    "value" : "false",
+    "description" : "If true, then multiple instances of some map tasks\n               may be executed in parallel.",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.reduce.tasks.speculative.execution",
+    "value" : "false",
+    "description" : "If true, then multiple instances of some reduce tasks\n               may be executed in parallel.",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.reduce.slowstart.completed.maps",
+    "value" : "0.05",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.inmem.merge.threshold",
+    "value" : "1000",
+    "description" : "The threshold, in terms of the number of files\n  for the in-memory merge process. When we accumulate threshold number of files\n  we initiate the in-memory merge and spill to disk. A value of 0 or less than\n  0 indicates we want to DON'T have any threshold and instead depend only on\n  the ramfs's memory consumption to trigger the merge.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.shuffle.merge.percent",
+    "value" : "0.66",
+    "description" : "The usage threshold at which an in-memory merge will be\n  initiated, expressed as a percentage of the total memory allocated to\n  storing in-memory map outputs, as defined by\n  mapred.job.shuffle.input.buffer.percent.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.shuffle.input.buffer.percent",
+    "value" : "0.7",
+    "description" : "The percentage of memory to be allocated from the maximum heap\n  size to storing map outputs during the shuffle.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.output.compression.type",
+    "value" : "BLOCK",
+    "description" : "If the job outputs are to compressed as SequenceFiles, how should\n               they be compressed? Should be one of NONE, RECORD or BLOCK.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.completeuserjobs.maximum",
+    "value" : "0",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.restart.recover",
+    "value" : "false",
+    "description" : "\"true\" to enable (job) recovery upon restart,\n               \"false\" to start afresh\n    ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.reduce.input.buffer.percent",
+    "value" : "0.0",
+    "description" : "The percentage of memory- relative to the maximum heap size- to\n  retain map outputs during the reduce. When the shuffle is concluded, any\n  remaining map outputs in memory must consume less than this threshold before\n  the reduce can begin.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.reduce.input.limit",
+    "value" : "10737418240",
+    "description" : "The limit on the input size of the reduce. (This value\n  is 10 Gb.)  If the estimated input size of the reduce is greater than\n  this value, job is failed. A value of -1 means that there is no limit\n  set. ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.task.timeout",
+    "value" : "600000",
+    "description" : "The number of milliseconds before a task will be\n  terminated if it neither reads an input, writes an output, nor\n  updates its status string.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "jetty.connector",
+    "value" : "org.mortbay.jetty.nio.SelectChannelConnector",
+    "description" : "No description",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.child.root.logger",
+    "value" : "INFO,TLA",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.max.tracker.blacklists",
+    "value" : "16",
+    "description" : "\n    if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.healthChecker.interval",
+    "value" : "135000",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.healthChecker.script.timeout",
+    "value" : "60000",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.tracker.persist.jobstatus.active",
+    "value" : "false",
+    "description" : "Indicates if persistency of job status information is\n  active or not.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.tracker.persist.jobstatus.hours",
+    "value" : "1",
+    "description" : "The number of hours job status information is persisted in DFS.\n    The job status information will be available after it drops of the memory\n    queue and between jobtracker restarts. With a zero value the job status\n    information is not persisted at all in DFS.\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.retirejob.check",
+    "value" : "10000",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.retirejob.interval",
+    "value" : "0",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.tracker.history.completed.location",
+    "value" : "/mapred/history/done",
+    "description" : "No description",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.fileoutputcommitter.marksuccessfuljobs",
+    "value" : "false",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.job.reuse.jvm.num.tasks",
+    "value" : "1",
+    "description" : "\n    How many tasks to run per jvm. If set to -1, there is no limit\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "hadoop.job.history.user.location",
+    "value" : "none",
+    "description" : null,
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.jobtracker.staging.root.dir",
+    "value" : "/user",
+    "description" : "The Path prefix for where the staging directories should be placed. The next level is always the user's\n   name. It is a path in the default file system.",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.tasktracker.group",
+    "value" : "hadoop",
+    "description" : "The group that the task controller uses for accessing the task controller. The mapred user must be a member and users should *not* be members.",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.jobtracker.split.metainfo.maxsize",
+    "value" : "50000000",
+    "description" : "If the size of the split metainfo file is larger than this, the JobTracker will fail the job during\n    initialize.\n   ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapreduce.history.server.embedded",
+    "value" : "false",
+    "description" : "Should job history server be embedded within Job tracker\nprocess",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.blacklist.fault-timeout-window",
+    "value" : "180",
+    "description" : "\n    3-hour sliding window (value is in minutes)\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.jobtracker.blacklist.fault-bucket-width",
+    "value" : "15",
+    "description" : "\n    15-minute bucket size (value is in minutes)\n  ",
+    "filename" : "mapred-site.xml"
+  }, {
+    "name" : "mapred.queue.names",
+    "value" : "default",
+    "description" : " Comma separated list of queues configured for this jobtracker.",
+    "filename" : "mapred-site.xml"
+  } ],
+  "components" : [ {
+    "name" : "JOBTRACKER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "TASKTRACKER",
+    "category" : "SLAVE",
+    "client" : false,
+    "master" : false
+  }, {
+    "name" : "MAPREDUCE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : false,
+  "clientComponent" : {
+    "name" : "MAPREDUCE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
   }
 }

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 247
ambari-web/app/assets/data/wizard/stack/hdp/version01/OOZIE.json


+ 22 - 24
ambari-web/app/assets/data/wizard/stack/hdp/version01/ZOOKEEPER.json

@@ -1,27 +1,25 @@
 {
-  "name": "ZOOKEEPER",
-  "version": "1.0",
-  "user": "root",
-  "comment": "This is comment for ZOOKEEPER service",
-  "properties": [ ],
-  "components": [
-    {
-      "name": "ZOOKEEPER_SERVER",
-      "category": "MASTER",
-      "client": false,
-      "master": true
-    },
-    {
-      "name": "ZOOKEEPER_CLIENT",
-      "category": "CLIENT",
-      "client": true,
-      "master": false
-    }
-  ],
-  "clientComponent": {
-    "name": "ZOOKEEPER_CLIENT",
-    "category": "CLIENT",
-    "client": true,
-    "master": false
+  "name" : "ZOOKEEPER",
+  "version" : "3.4.5.1-1",
+  "user" : "root",
+  "comment" : "This is comment for ZOOKEEPER service",
+  "properties" : [ ],
+  "components" : [ {
+    "name" : "ZOOKEEPER_SERVER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "ZOOKEEPER_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : false,
+  "clientComponent" : {
+    "name" : "ZOOKEEPER_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
   }
 }

+ 10 - 4
ambari-web/app/controllers/global/background_operations_controller.js

@@ -82,7 +82,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
   generateUrl: function(){
     var url = App.testMode ?
       '/data/background_operations/list_on_start.json' :
-      '/api/clusters/' + App.router.getClusterName() + '/requests/?fields=tasks/*&tasks/Tasks/status!=COMPLETED';
+      App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/requests/?fields=tasks/*&tasks/Tasks/status!=COMPLETED';
 
     this.set('url', url);
     return url;
@@ -100,6 +100,14 @@ App.BackgroundOperationsController = Em.Controller.extend({
     }
     var self = this;
 
+    if(!App.router.getClusterName()){
+      console.log('clusterName is undefined')
+      setTimeout(function(){
+        self.loadOperations();
+      },1000);
+      return;
+    }
+
     var url = this.get('url');
     if(!url){
       url = this.generateUrl();
@@ -109,7 +117,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
       type: "GET",
       url: url,
       dataType: 'json',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         //refresh model
         self.updateBackgroundOperations(data);
@@ -125,8 +133,6 @@ App.BackgroundOperationsController = Em.Controller.extend({
       error: function (request, ajaxOptions, error) {
         console.log('cannot load background operations array');
 
-        //next code is temporary code to fix testMode issues
-        self.set('url', '/data/background_operations/list_on_start.json');
         //load data again if isWorking = true
         if(self.get('isWorking')){
           setTimeout(function(){

+ 92 - 80
ambari-web/app/controllers/global/cluster_controller.js

@@ -19,57 +19,61 @@
 var App = require('app');
 
 App.ClusterController = Em.Controller.extend({
-  name: 'clusterController',
+  name:'clusterController',
   cluster:null,
-  isLoaded: false,
-  updateLoadStatus: function(item){
+  isLoaded:false,
+  updateLoadStatus:function (item) {
     var loadList = this.get('dataLoadList');
     var loaded = true;
     loadList.set(item, true);
-    for(var i in loadList){
-      if(loadList.hasOwnProperty(i) && !loadList[i] && loaded){
+    for (var i in loadList) {
+      if (loadList.hasOwnProperty(i) && !loadList[i] && loaded) {
         loaded = false;
       }
     }
     this.set('isLoaded', loaded);
   },
-  dataLoadList: Em.Object.create({
-    'hosts': false,
-    'runs': false,
-    'services': false,
-    'cluster' : false,
-    'racks' : false,
-    'alerts' : false,
-    'users' : false
+
+  dataLoadList:Em.Object.create({
+    'hosts':false,
+    'services':false,
+    'cluster':false,
+    'racks':false,
+    'alerts':false,
+    'users':false
   }),
+
+  postLoadList:{
+    'runs':false
+  },
   /**
    * load cluster name
    */
-  loadClusterName: function(reload){
-    if(this.get('clusterName') && !reload){
+  loadClusterName:function (reload) {
+    if (this.get('clusterName') && !reload) {
       return;
     }
     var self = this;
-    var url = (App.testMode) ? '/data/clusters/info.json' : '/api/clusters';
+    var url = (App.testMode) ? '/data/clusters/info.json' : App.apiPrefix + '/clusters';
     $.ajax({
-      async: false,
-      type: "GET",
-      url: url,
-      dataType: 'json',
-      timeout: 5000,
-      success: function (data) {
+      async:false,
+      type:"GET",
+      url:url,
+      dataType:'json',
+      timeout:App.timeout,
+      success:function (data) {
         self.set('cluster', data.items[0]);
       },
-      error: function (request, ajaxOptions, error) {
+      error:function (request, ajaxOptions, error) {
         console.log('failed on loading cluster name');
         self.set('isLoaded', true);
       },
-      statusCode: require('data/statusCodes')
+      statusCode:require('data/statusCodes')
     });
   },
 
-  getUrl: function(testUrl, url){
-    return (App.testMode) ? testUrl: '/api/clusters/' + this.get('clusterName') + url;
+  getUrl:function (testUrl, url) {
+    return (App.testMode) ? testUrl : App.apiPrefix + '/clusters/' + this.get('clusterName') + url;
   },
 
   /**
@@ -79,7 +83,7 @@ App.ClusterController = Em.Controller.extend({
    *
    * If null is returned, it means NAGIOS service is not installed.
    */
-  nagiosUrl: function () {
+  nagiosUrl:function () {
     if (App.testMode) {
       return 'http://nagiosserver/nagios';
     } else {
@@ -90,10 +94,11 @@ App.ClusterController = Em.Controller.extend({
         var svcComponents = nagiosSvc.get('components');
         if (svcComponents) {
           var nagiosSvcComponent = svcComponents.findProperty("componentName", "NAGIOS_SERVER");
-          if(nagiosSvcComponent){
+          if (nagiosSvcComponent) {
             var hostName = nagiosSvcComponent.get('host.hostName');
-            if(hostName){
-              return "http://"+hostName+"/nagios";
+            if (hostName) {
+              return null;
+              //return "http://"+hostName+"/nagios";
             }
           }
         }
@@ -102,13 +107,13 @@ App.ClusterController = Em.Controller.extend({
     }
   }.property('dataLoadList.services'),
 
-  isNagiosInstalled: function(){
-    if(App.testMode){
+  isNagiosInstalled:function () {
+    if (App.testMode) {
       return true;
-    }else{
+    } else {
       var svcs = App.Service.find();
       var nagiosSvc = svcs.findProperty("serviceName", "NAGIOS");
-      return nagiosSvc!=null;
+      return nagiosSvc != null;
     }
   }.property('dataLoadList.services'),
 
@@ -116,7 +121,7 @@ App.ClusterController = Em.Controller.extend({
    * Sorted list of alerts.
    * Changes whenever alerts are loaded.
    */
-  alerts: function () {
+  alerts:function () {
     var alerts = App.Alert.find();
     var alertsArray = alerts.toArray();
     var sortedArray = alertsArray.sort(function (left, right) {
@@ -133,12 +138,29 @@ App.ClusterController = Em.Controller.extend({
     return sortedArray;
   }.property('dataLoadList.alerts'),
 
+  loadRuns: function(){
+    if(this.get('postLoadList.runs')){
+      return;
+    }
+
+    var self= this;
+    var runsUrl = App.testMode ? "/data/apps/runs.json" : App.apiPrefix + "/jobhistory/workflow";
+
+    App.HttpClient.get(runsUrl, App.runsMapper, {
+      complete:function (jqXHR, textStatus) {
+        self.set('postLoadList.runs', true);
+      }
+    }, function(){
+      self.set('postLoadList.runs', true);
+    });
+  },
+
   /**
    * This method automatically loads alerts when Nagios URL
    * changes. Once done it will trigger dataLoadList.alerts
    * property, which will trigger the alerts property.
    */
-  loadAlerts: function () {
+  loadAlerts:function () {
     var nagiosUrl = this.get('nagiosUrl');
     if (nagiosUrl) {
       var lastSlash = nagiosUrl.lastIndexOf('/');
@@ -147,10 +169,10 @@ App.ClusterController = Em.Controller.extend({
       }
       var dataUrl;
       var ajaxOptions = {
-        dataType: "jsonp",
-        jsonp: "jsonp",
-        context: this,
-        complete: function (jqXHR, textStatus) {
+        dataType:"jsonp",
+        jsonp:"jsonp",
+        context:this,
+        complete:function (jqXHR, textStatus) {
           this.updateLoadStatus('alerts')
         }
       };
@@ -171,58 +193,48 @@ App.ClusterController = Em.Controller.extend({
    *
    *  load all data and update load status
    */
-  loadClusterData: function(){
+  loadClusterData:function () {
     var self = this;
-    if(!this.get('clusterName')){
-        return;
+    if (!this.get('clusterName')) {
+      return;
     }
 
-     var clusterUrl = this.getUrl('/data/clusters/cluster.json', '?fields=Clusters');
-     var hostsUrl = this.getUrl('/data/hosts/hosts.json', '/hosts?fields=*');
-     var servicesUrl1 = this.getUrl('/data/dashboard/services.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/host_components/*');
-     var servicesUrl2 = this.getUrl('/data/dashboard/serviceComponents.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/ServiceComponentInfo');
-     var usersUrl = App.testMode ? '/data/users/users.json' : '/api/users/?fields=*';
-     var runsUrl = App.testMode ? "/data/apps/runs.json" : "/api/jobhistory/workflow";
-
-     var racksUrl = "/data/racks/racks.json";
+    var clusterUrl = this.getUrl('/data/clusters/cluster.json', '?fields=Clusters');
+    var hostsUrl = this.getUrl('/data/hosts/hosts.json', '/hosts?fields=*');
+    var servicesUrl1 = this.getUrl('/data/dashboard/services.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/host_components/*');
+    var servicesUrl2 = this.getUrl('/data/dashboard/serviceComponents.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/ServiceComponentInfo');
+    var usersUrl = App.testMode ? '/data/users/users.json' : App.apiPrefix + '/users/?fields=*';
+    var racksUrl = "/data/racks/racks.json";
 
-    App.HttpClient.get(racksUrl, App.racksMapper,{
-      complete:function(jqXHR, textStatus){
+    App.HttpClient.get(racksUrl, App.racksMapper, {
+      complete:function (jqXHR, textStatus) {
         self.updateLoadStatus('racks');
       }
-    },function(jqXHR, textStatus){
+    }, function (jqXHR, textStatus) {
       self.updateLoadStatus('racks');
     });
 
-    App.HttpClient.get(clusterUrl, App.clusterMapper,{
-      complete:function(jqXHR, textStatus){
+    App.HttpClient.get(clusterUrl, App.clusterMapper, {
+      complete:function (jqXHR, textStatus) {
         self.updateLoadStatus('cluster');
       }
-    },function(jqXHR, textStatus){
+    }, function (jqXHR, textStatus) {
       self.updateLoadStatus('cluster');
     });
 
-    App.HttpClient.get(runsUrl, App.runsMapper,{
-      complete:function(jqXHR, textStatus) {
-        self.updateLoadStatus('runs');
-      }
-    },function(jqXHR, textStatus){
-      self.updateLoadStatus('runs');
-    });
-
-    App.HttpClient.get(hostsUrl, App.hostsMapper,{
-      complete:function(jqXHR, textStatus){
+    App.HttpClient.get(hostsUrl, App.hostsMapper, {
+      complete:function (jqXHR, textStatus) {
         self.updateLoadStatus('hosts');
       }
-    },function(jqXHR, textStatus){
+    }, function (jqXHR, textStatus) {
       self.updateLoadStatus('hosts');
     });
 
-    App.HttpClient.get(usersUrl, App.usersMapper,{
-      complete:function(jqXHR, textStatus){
+    App.HttpClient.get(usersUrl, App.usersMapper, {
+      complete:function (jqXHR, textStatus) {
         self.updateLoadStatus('users');
       }
-    },function(jqXHR, textStatus){
+    }, function (jqXHR, textStatus) {
       self.updateLoadStatus('users');
     });
 
@@ -232,12 +244,12 @@ App.ClusterController = Em.Controller.extend({
     var metricsJson = null;
     var serviceComponentJson = null;
     var metricsMapper = {
-        map: function(data){
-          metricsJson = data;
-        }
+      map:function (data) {
+        metricsJson = data;
+      }
     };
     var serviceComponentMapper = {
-      map: function (data) {
+      map:function (data) {
         serviceComponentJson = data;
         if (metricsJson != null && serviceComponentJson != null) {
           var hdfsSvc1 = null;
@@ -330,10 +342,10 @@ App.ClusterController = Em.Controller.extend({
         }
       }
     }
-    App.HttpClient.get(servicesUrl1, metricsMapper,{
-      complete:function(jqXHR, textStatus){
-        App.HttpClient.get(servicesUrl2, serviceComponentMapper,{
-          complete:function(jqXHR, textStatus){
+    App.HttpClient.get(servicesUrl1, metricsMapper, {
+      complete:function (jqXHR, textStatus) {
+        App.HttpClient.get(servicesUrl2, serviceComponentMapper, {
+          complete:function (jqXHR, textStatus) {
           }
         });
       }
@@ -344,7 +356,7 @@ App.ClusterController = Em.Controller.extend({
 
   },
 
-  clusterName: function(){
+  clusterName:function () {
     return (this.get('cluster')) ? this.get('cluster').Clusters.cluster_name : null;
   }.property('cluster')
 })

+ 29 - 31
ambari-web/app/controllers/installer.js

@@ -224,7 +224,6 @@ App.InstallerController = Em.Controller.extend({
     services: null,
     hostsInfo: [],
     slaveComponentHosts: null,
-    hostSlaveComponents: null,
     masterComponentHosts: null,
     serviceConfigProperties: null,
     advancedServiceConfig: null,
@@ -390,7 +389,7 @@ App.InstallerController = Em.Controller.extend({
    * Will be used at <code>Assign Masters(step5)</code> step
    */
   loadConfirmedHosts: function () {
-    this.set('content.hostsInfo', App.db.getHosts());
+    this.set('content.hostsInfo', App.db.getHosts() || []);
   },
 
   /**
@@ -440,6 +439,7 @@ App.InstallerController = Em.Controller.extend({
     var servicesInfo = App.db.getService();
     servicesInfo.forEach(function (item, index) {
       servicesInfo[index] = Em.Object.create(item);
+      servicesInfo[index].isInstalled = false;
     });
     this.set('content.services', servicesInfo);
     console.log('installerController.loadServices: loaded data ', servicesInfo);
@@ -474,6 +474,7 @@ App.InstallerController = Em.Controller.extend({
         display_name: _component.get('display_name'),
         component: _component.get('component_name'),
         hostName: _component.get('selectedHost'),
+        serviceId: _component.get('serviceId'),
         isInstalled: false
       });
     });
@@ -487,7 +488,7 @@ App.InstallerController = Em.Controller.extend({
    * Load master component hosts data for using in required step controllers
    */
   loadMasterComponentHosts: function () {
-    var masterComponentHosts = App.db.getMasterComponentHosts();
+    var masterComponentHosts = App.db.getMasterComponentHosts() || [];
     this.set("content.masterComponentHosts", masterComponentHosts);
     console.log("InstallerController.loadMasterComponentHosts: loaded hosts ", masterComponentHosts);
   },
@@ -502,9 +503,6 @@ App.InstallerController = Em.Controller.extend({
     var isMrSelected = stepController.get('isMrSelected');
     var isHbSelected = stepController.get('isHbSelected');
 
-    App.db.setHostSlaveComponents(hosts);
-    this.set('content.hostSlaveComponents', hosts);
-
     var dataNodeHosts = [];
     var taskTrackerHosts = [];
     var regionServerHosts = [];
@@ -514,25 +512,29 @@ App.InstallerController = Em.Controller.extend({
       if (host.get('isDataNode')) {
         dataNodeHosts.push({
           hostName: host.hostName,
-          group: 'Default'
+          group: 'Default',
+          isInstalled : false
         });
       }
       if (isMrSelected && host.get('isTaskTracker')) {
         taskTrackerHosts.push({
           hostName: host.hostName,
-          group: 'Default'
+          group: 'Default',
+          isInstalled : false
         });
       }
       if (isHbSelected && host.get('isRegionServer')) {
         regionServerHosts.push({
           hostName: host.hostName,
-          group: 'Default'
+          group: 'Default',
+          isInstalled : false
         });
       }
       if (host.get('isClient')) {
         clientHosts.pushObject({
           hostName: host.hostName,
-          group: 'Default'
+          group: 'Default',
+          isInstalled : false
         });
       }
     }, this);
@@ -565,26 +567,16 @@ App.InstallerController = Em.Controller.extend({
 
     App.db.setSlaveComponentHosts(slaveComponentHosts);
     this.set('content.slaveComponentHosts', slaveComponentHosts);
+    console.log("InstallerController.saveSlaveComponentHosts: saved hosts ", slaveComponentHosts);
   },
 
   /**
    * Load master component hosts data for using in required step controllers
    */
   loadSlaveComponentHosts: function () {
-    var slaveComponentHosts = App.db.getSlaveComponentHosts();
-    if (slaveComponentHosts !== undefined) {
-      this.set("content.slaveComponentHosts", slaveComponentHosts);
-      console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
-    } else {
-      this.set("content.slaveComponentHosts", null);
-    }
-    var hostSlaveComponents = App.db.getHostSlaveComponents();
-    if (hostSlaveComponents !== undefined) {
-      this.set('content.hostSlaveComponents', hostSlaveComponents);
-      console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", hostSlaveComponents);
-    } else {
-      this.set("content.hostSlaveComponents", null);
-    }
+    var slaveComponentHosts = App.db.getSlaveComponentHosts() || null;
+    this.set("content.slaveComponentHosts", slaveComponentHosts);
+    console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
   },
 
   /**
@@ -624,6 +616,8 @@ App.InstallerController = Em.Controller.extend({
     var serviceConfigProperties = App.db.getServiceConfigProperties();
     this.set('content.serviceConfigProperties', serviceConfigProperties);
     console.log("InstallerController.loadServiceConfigProperties: loaded config ", serviceConfigProperties);
+
+    this.set('content.advancedServiceConfig', App.db.getAdvancedServiceConfig());
   },
 
   /**
@@ -648,7 +642,8 @@ App.InstallerController = Em.Controller.extend({
       if (client) {
         clients.pushObject({
           component_name: client.component_name,
-          display_name: client.display_name
+          display_name: client.display_name,
+          isInstalled: false
         });
       }
     }, this);
@@ -693,13 +688,13 @@ App.InstallerController = Em.Controller.extend({
   loadComponents: function (stepController) {
     var self = this;
     var method = 'GET';
-    var url = (App.testMode) ? '/data/wizard/stack/hdp/version0.1.json' : '/api/stacks/HDP/version/1.2.0'; // TODO: get this url from the stack selected by the user in Install Options page
+    var url = (App.testMode) ? '/data/wizard/stack/hdp/version0.1.json' : App.apiPrefix + '/stacks/HDP/version/1.2.0'; // TODO: get this url from the stack selected by the user in Install Options page
     $.ajax({
       type: method,
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep5 -> In success function for the getServiceComponents call");
@@ -736,14 +731,14 @@ App.InstallerController = Em.Controller.extend({
 
   loadAdvancedConfig: function (serviceName) {
     var self = this;
-    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : '/api/stacks/HDP/version/1.2.0/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
+    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + '/stacks/HDP/version/1.2.0/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
     var method = 'GET';
     $.ajax({
       type: method,
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: Step6 submit -> In success function for the loadAdvancedConfig call");
@@ -780,7 +775,7 @@ App.InstallerController = Em.Controller.extend({
   installServices: function () {
     var self = this;
     var clusterName = this.get('content.cluster.name');
-    var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : '/api/clusters/' + clusterName + '/services?state=INIT';
+    var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT';
     var method = (App.testMode) ? 'GET' : 'PUT';
     var data = '{"ServiceInfo": {"state": "INSTALLED"}}';
     $.ajax({
@@ -789,7 +784,7 @@ App.InstallerController = Em.Controller.extend({
       data: data,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         var installSartTime = new Date().getTime();
@@ -836,6 +831,9 @@ App.InstallerController = Em.Controller.extend({
   finish: function(){
     this.setCurrentStep('1', false);
     App.db.setService(undefined); //not to use this data at AddService page
+    App.db.setHosts(undefined);
+    App.db.setMasterComponentHosts(undefined);
+    App.db.setSlaveComponentHosts(undefined);
   }
 
 });

+ 2 - 2
ambari-web/app/controllers/main/admin/user.js

@@ -68,7 +68,7 @@ App.MainAdminUserController = Em.Controller.extend({
   sendCommandToServer : function(url, method, postData, callback){
     var url =  (App.testMode) ?
         '/data/wizard/deploy/poll_1.json' : //content is the same as ours
-        '/api/' + url;
+        App.apiPrefix + '/' + url;
 
     var method = App.testMode ? 'GET' : method;
 
@@ -77,7 +77,7 @@ App.MainAdminUserController = Em.Controller.extend({
       url: url,
       data: JSON.stringify(postData),
       dataType: 'json',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function(data){
         if(data && data.Requests){
           callback(data.Requests.id);

+ 1 - 1
ambari-web/app/controllers/main/apps/item_controller.js

@@ -39,7 +39,7 @@ App.MainAppsItemController = Em.Controller.extend({
     var self = this;
 
     var url = App.testMode ? '/data/apps/jobs.json' :
-      "/api/jobhistory/job?workflowId=" + currentId;
+      App.apiPrefix + "/jobhistory/job?workflowId=" + currentId;
 
     App.HttpClient.get(url, App.jobsMapper,{
       complete:function(jqXHR, textStatus) {

+ 3 - 1
ambari-web/app/controllers/main/apps_controller.js

@@ -22,7 +22,9 @@ require('utils/jquery.unique');
 App.MainAppsController = Em.ArrayController.extend({
 
   name:'mainAppsController',
-  content: App.Run.find(),
+  content: function(){
+    return App.Run.find();
+  }.property('App.router.clusterController.postLoadList.runs'),
 
   staredRuns: [],
   filteredRuns: [],

+ 84 - 58
ambari-web/app/controllers/main/host.js

@@ -27,35 +27,55 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
   content:[],
   fullContent:App.Host.find(),
   clusters:App.Cluster.find(),
-  componentsForFilter:App.Component.find(),
+  //componentsForFilter: App.Component.find(),
+  componentsForFilter:function() {
+    var components = App.Component.find();
+    ret = new Array();
+    if (!components) {
+      return ret;
+    }
+    components.forEach(function(item) {
+      var o = Ember.Object.create({
+        id: item.get('id'),
+        isMaster: item.get('isMaster'),
+        displayName: item.get('displayName'),
+        componentName: item.get('componentName'),
+        checkedForHostFilter: item.get('checkedForHostFilter')
+      });
+      console.log(o);
+      ret.push(o);
+    });
+    return ret;
+  }.property(),
+
   totalBinding:'fullContent.length',
   filters:{components:[]},
   pageSize: 25,
   pageSizeRange:[10, 25, 50, 100, 'all'],
   rangeStart:0,
-  allChecked:false,
-  selectedHostsIds:[],
+//  allChecked:false,
+//  selectedHostsIds:[],
   selectedRack:null,
 
-  assignHostsToRack:function () {
-    var selectedRack = this.get('selectedRack');
-    var sureMessage = this.t('hosts.assignToRack.sure');
-    var hostsIds = this.get('selectedHostsIds');
-
-    var hostString = hostsIds.length + " " + this.t(hostsIds.length > 1 ? "host.plural" : "host.singular");
-
-    if (selectedRack.constructor == 'App.Cluster' && hostsIds.length
-      && confirm(sureMessage.format(hostString, selectedRack.get('clusterName')))) {
-      this.get('content').forEach(function (host) {
-        if (host.get('isChecked')) {
-          host.set('cluster', selectedRack);
-          host.set('isChecked', false);
-        }
-      })
-      this.set('selectedHostsIds', []);
-    }
-
-  },
+//  assignHostsToRack:function () {
+//    var selectedRack = this.get('selectedRack');
+//    var sureMessage = this.t('hosts.assignToRack.sure');
+//    var hostsIds = this.get('selectedHostsIds');
+//
+//    var hostString = hostsIds.length + " " + this.t(hostsIds.length > 1 ? "host.plural" : "host.singular");
+//
+//    if (selectedRack.constructor == 'App.Cluster' && hostsIds.length
+//      && confirm(sureMessage.format(hostString, selectedRack.get('clusterName')))) {
+//      this.get('content').forEach(function (host) {
+//        if (host.get('isChecked')) {
+//          host.set('cluster', selectedRack);
+//          host.set('isChecked', false);
+//        }
+//      })
+//      this.set('selectedHostsIds', []);
+//    }
+//
+//  },
 
   sortingAsc:true,
   isSort:false,
@@ -83,7 +103,7 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
   slaveComponents:function () {
     var components = [];
     this.get('componentsForFilter').forEach(function (component) {
-      if (component.get('isSlave')) {
+      if (!component.get('isMaster')) {
         components.push(component);
       }
     });
@@ -94,37 +114,37 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
     return 5;
   }.property(),
 
-  onAllChecked:function () {
-    var hosts = this.get('content');
-    hosts.setEach('isChecked', this.get('allChecked'));
-    this.set('isDisabled', !this.get('allChecked'));
-    var selectedHostsIds = this.get('allChecked') ? hosts.getEach('id') : [];
-    this.set('selectedHostsIds', selectedHostsIds);
-  }.observes('allChecked'),
-
-  onHostChecked:function (host) {
-    var selected = this.get('selectedHostsIds');
-    host.set('isChecked', !host.get('isChecked'));
-    if (host.get('isChecked')) {
-      selected.push(host.get('id'));
-    } else {
-      var index = selected.indexOf(host.get('id'));
-      if (index != -1) selected.splice(index, 1);
-    }
-    this.set('isDisabled', selected.length == 0);
-    this.propertyDidChange('selectedHostsIds');
-  },
-
-  changeSelectedHosts:function () {
-    var visibleHosts = this.get('content');
-    var selectedHosts = visibleHosts.filterProperty('isChecked', true);
-    this.get('fullContent').forEach(function (item) {
-      var index = visibleHosts.getEach('id').indexOf(item.get('id'));
-      if (index == -1) item.set('isChecked', false);
-    });
-    this.set('isDisabled', selectedHosts.length == 0);
-    this.set('selectedHostsIds', selectedHosts.getEach('id'));
-  },
+//  onAllChecked:function () {
+//    var hosts = this.get('content');
+//    hosts.setEach('isChecked', this.get('allChecked'));
+//    this.set('isDisabled', !this.get('allChecked'));
+//    var selectedHostsIds = this.get('allChecked') ? hosts.getEach('id') : [];
+//    this.set('selectedHostsIds', selectedHostsIds);
+//  }.observes('allChecked'),
+//
+//  onHostChecked:function (host) {
+//    var selected = this.get('selectedHostsIds');
+//    host.set('isChecked', !host.get('isChecked'));
+//    if (host.get('isChecked')) {
+//      selected.push(host.get('id'));
+//    } else {
+//      var index = selected.indexOf(host.get('id'));
+//      if (index != -1) selected.splice(index, 1);
+//    }
+//    this.set('isDisabled', selected.length == 0);
+//    this.propertyDidChange('selectedHostsIds');
+//  },
+//
+//  changeSelectedHosts:function () {
+//    var visibleHosts = this.get('content');
+//    var selectedHosts = visibleHosts.filterProperty('isChecked', true);
+//    this.get('fullContent').forEach(function (item) {
+//      var index = visibleHosts.getEach('id').indexOf(item.get('id'));
+//      if (index == -1) item.set('isChecked', false);
+//    });
+//    this.set('isDisabled', selectedHosts.length == 0);
+//    this.set('selectedHostsIds', selectedHosts.getEach('id'));
+//  },
 
   checkedComponentsIds:function () {
     var checked = [];
@@ -151,9 +171,14 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
   },
 
   filterByComponent:function (component) {
-    this.get('componentsForFilter').setEach('isChecked', false);
-    component.set('isChecked', true);
+    var id = component.get('id');
+    /*this.get('componentsForFilter').setEach('isChecked', false);
+    component.set('isChecked', true);*/
+    this.get('componentsForFilter').setEach('checkedForHostFilter', false);
+    this.get('componentsForFilter').filterProperty('id', id).setEach('checkedForHostFilter', true);
+    //component.set('checkedForHostFilter', true);
     this.set('filters.components', [component.get('id')]);
+    console.log(this.get('filters.components').objectAt(0));
     this.changeContent();
   },
 
@@ -203,7 +228,8 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
         if (inFilters) {
           items.push(item);
         }
-      } else {
+      }
+      else {
         items.push(item);
       }
     });
@@ -213,7 +239,7 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
 
     var content = items.slice(this.get('rangeStart'), this.get('rangeStop'));
     this.replace(0, this.get('length'), content);
-    this.changeSelectedHosts();
+//    this.changeSelectedHosts();
   }.observes('rangeStart', 'rangeStop', 'total'),
 
   showNextPage:function () {

+ 2 - 10
ambari-web/app/controllers/main/host/add_controller.js

@@ -40,7 +40,6 @@ App.AddHostController = Em.Controller.extend({
     services: null,
     hostsInfo: null,
     slaveComponentHosts: null,
-    hostSlaveComponents: null,
     masterComponentHosts: null,
     serviceConfigProperties: null
   }),
@@ -462,9 +461,6 @@ App.AddHostController = Em.Controller.extend({
     var isMrSelected = stepController.get('isMrSelected');
     var isHbSelected = stepController.get('isHbSelected');
 
-    App.db.setHostSlaveComponents(hosts);
-    this.set('content.hostSlaveComponents', hosts);
-
     var dataNodeHosts = [];
     var taskTrackerHosts = [];
     var regionServerHosts = [];
@@ -534,10 +530,6 @@ App.AddHostController = Em.Controller.extend({
     var slaveComponentHosts = App.db.getSlaveComponentHosts();
     this.set("content.slaveComponentHosts", slaveComponentHosts);
     console.log("AddHostController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
-
-    var hostSlaveComponents = App.db.getHostSlaveComponents();
-    this.set('content.hostSlaveComponents', hostSlaveComponents);
-    console.log("AddHostController.loadSlaveComponentHosts: loaded hosts ", hostSlaveComponents);
   },
 
   /**
@@ -637,7 +629,7 @@ App.AddHostController = Em.Controller.extend({
   installServices: function () {
     var self = this;
     var clusterName = this.get('content.cluster.name');
-    var url = '/api/clusters/' + clusterName + '/services?state=INIT';
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT';
     var data = '{"ServiceInfo": {"state": "INSTALLED"}}';
     $.ajax({
       type: 'PUT',
@@ -645,7 +637,7 @@ App.AddHostController = Em.Controller.extend({
       data: data,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the installService call");

+ 2 - 2
ambari-web/app/controllers/main/host/details.js

@@ -39,7 +39,7 @@ App.MainHostDetailsController = Em.Controller.extend({
   sendCommandToServer : function(url, postData, callback){
     var url =  (App.testMode) ?
       '/data/wizard/deploy/poll_1.json' : //content is the same as ours
-      '/api/clusters/' + App.router.getClusterName() + url;
+      App.apiPrefix + '/clusters/' + App.router.getClusterName() + url;
 
     var method = App.testMode ? 'GET' : 'PUT';
 
@@ -48,7 +48,7 @@ App.MainHostDetailsController = Em.Controller.extend({
       url: url,
       data: JSON.stringify(postData),
       dataType: 'json',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function(data){
         if(data && data.Requests){
           callback(data.Requests.id);

+ 161 - 43
ambari-web/app/controllers/main/service/add_controller.js

@@ -30,7 +30,7 @@ App.AddServiceController = Em.Controller.extend({
    * hosts - hosts, ssh key, repo info, etc.
    * services - services list
    * hostsInfo - list of selected hosts
-   * slaveComponentHosts, hostSlaveComponents - info about slave hosts
+   * slaveComponentHosts, - info about slave hosts
    * masterComponentHosts - info about master hosts
    * config??? - to be described later
    */
@@ -40,9 +40,9 @@ App.AddServiceController = Em.Controller.extend({
     services: null,
     hostsInfo: null,
     slaveComponentHosts: null,
-    hostSlaveComponents: null,
     masterComponentHosts: null,
     serviceConfigProperties: null,
+    advancedServiceConfig: null,
     controllerName: 'addServiceController'
   }),
 
@@ -166,25 +166,15 @@ App.AddServiceController = Em.Controller.extend({
    * Load clusterInfo(step1) to model
    */
   loadClusterInfo: function(){
-    var cStatus = App.db.getClusterStatus() || {status: "", isCompleted: false};
     var cluster = {
-      name: App.db.getClusterName() || "",
-      status: cStatus.status,
-      isCompleted: cStatus.isCompleted
+      name: App.router.getClusterName(),
+      status: "",
+      isCompleted: true
     };
     this.set('content.cluster', cluster);
     console.log("AddServiceController:loadClusterInfo: loaded data ", cluster);
   },
 
-  /**
-   * save status of the cluster. This is called from step8 and step9 to persist install and start requestId
-   * @param clusterStatus object with status, isCompleted, requestId, isInstallError and isStartError field.
-   */
-  saveClusterStatus: function (clusterStatus) {
-    this.set('content.cluster', clusterStatus);
-    App.db.setClusterStatus(clusterStatus);
-  },
-
   /**
    * Temporary function for wizardStep9, before back-end integration
    */
@@ -203,6 +193,8 @@ App.AddServiceController = Em.Controller.extend({
    * Will be used at <code>Assign Masters(step5)</code> step
    */
   loadConfirmedHosts: function(){
+    var hosts = App.db.getHosts();
+    if(!hosts){
     var hosts = {};
 
     App.Host.find().forEach(function(item){
@@ -214,8 +206,10 @@ App.AddServiceController = Em.Controller.extend({
         isInstalled: true
       };
     });
+    }
 
     this.set('content.hostsInfo', hosts);
+    console.log('AddServiceController.loadConfirmedHosts: loaded hosts', hosts);
   },
 
   /**
@@ -268,6 +262,7 @@ App.AddServiceController = Em.Controller.extend({
       servicesInfo.forEach(function(item, index){
         servicesInfo[index].isSelected = App.Service.find().someProperty('id', item.serviceName);
         servicesInfo[index].isDisabled = servicesInfo[index].isSelected;
+        servicesInfo[index].isInstalled = servicesInfo[index].isSelected;
       });
     }
 
@@ -276,7 +271,7 @@ App.AddServiceController = Em.Controller.extend({
     });
     this.set('content.services', servicesInfo);
     console.log('AddServiceController.loadServices: loaded data ', servicesInfo);
-    console.log('selected services ', servicesInfo.filterProperty('isSelected', true).mapProperty('serviceName'));
+    console.log('selected services ', servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName'));
   },
 
   /**
@@ -285,15 +280,14 @@ App.AddServiceController = Em.Controller.extend({
    */
   saveServices: function (stepController) {
     var serviceNames = [];
-    // we can also do it without stepController since all data,
-    // changed at page, automatically changes in model(this.content.services)
     App.db.setService(stepController.get('content'));
-    stepController.filterProperty('isSelected', true).filterProperty('isDisabled', false).forEach(function (item) {
+    console.log('AddServiceController.saveServices: saved data', stepController.get('content'));
+    stepController.filterProperty('isSelected', true).filterProperty('isInstalled', false).forEach(function (item) {
       serviceNames.push(item.serviceName);
     });
     this.set('content.selectedServiceNames', serviceNames);
     App.db.setSelectedServiceNames(serviceNames);
-    console.log('AddServiceController.saveServices: saved data ', serviceNames);
+    console.log('AddServiceController.selectedServiceNames:', serviceNames);
   },
 
   /**
@@ -306,14 +300,13 @@ App.AddServiceController = Em.Controller.extend({
     var installedComponents = App.Component.find();
 
     obj.forEach(function (_component) {
-      if(!installedComponents.someProperty('componentName', _component.component_name)){
         masterComponentHosts.push({
           display_name: _component.display_name,
           component: _component.component_name,
           hostName: _component.selectedHost,
-          isInstalled: false
+          serviceId: _component.serviceId,
+          isInstalled: installedComponents.someProperty('componentName', _component.component_name)
         });
-      }
     });
 
     console.log("AddServiceController.saveMasterComponentHosts: saved hosts ", masterComponentHosts);
@@ -325,15 +318,18 @@ App.AddServiceController = Em.Controller.extend({
    * Load master component hosts data for using in required step controllers
    */
   loadMasterComponentHosts: function () {
-    var masterComponentHosts = App.db.getMasterComponentHosts() || [];
+    var masterComponentHosts = App.db.getMasterComponentHosts();
+    if(!masterComponentHosts){
+      masterComponentHosts = [];
     App.Component.find().filterProperty('isMaster', true).forEach(function(item){
       masterComponentHosts.push({
         component: item.get('componentName'),
-        display_name: item.get('displayName'),
         hostName: item.get('host.hostName'),
         isInstalled: true
       })
     });
+
+    }
     this.set("content.masterComponentHosts", masterComponentHosts);
     console.log("AddServiceController.loadMasterComponentHosts: loaded hosts ", masterComponentHosts);
   },
@@ -348,44 +344,39 @@ App.AddServiceController = Em.Controller.extend({
     var isMrSelected = stepController.get('isMrSelected');
     var isHbSelected = stepController.get('isHbSelected');
 
-    App.db.setHostSlaveComponents(hosts);
-    this.set('content.hostSlaveComponents', hosts);
-
     var dataNodeHosts = [];
     var taskTrackerHosts = [];
     var regionServerHosts = [];
     var clientHosts = [];
 
-    var installedComponents = App.Component.find();
-
     hosts.forEach(function (host) {
 
       if (host.get('isDataNode')) {
         dataNodeHosts.push({
           hostName: host.hostName,
           group: 'Default',
-          isInstalled: installedComponents.someProperty('componentName', 'DATANODE')
+          isInstalled: host.get('isDataNodeInstalled')
         });
       }
       if (isMrSelected && host.get('isTaskTracker')) {
         taskTrackerHosts.push({
           hostName: host.hostName,
           group: 'Default',
-          isInstalled: installedComponents.someProperty('componentName', 'TASKTRACKER')
+          isInstalled: host.get('isTaskTrackerInstalled')
         });
       }
       if (isHbSelected && host.get('isRegionServer')) {
         regionServerHosts.push({
           hostName: host.hostName,
           group: 'Default',
-          isInstalled: installedComponents.someProperty('componentName', 'HBASE_REGIONSERVER')
+          isInstalled: host.get('isRegionServerInstalled')
         });
       }
       if (host.get('isClient')) {
         clientHosts.pushObject({
           hostName: host.hostName,
           group: 'Default',
-          isInstalled: installedComponents.someProperty('componentName', 'CLIENT')
+          isInstalled: host.get('isClientInstalled')
         });
       }
     }, this);
@@ -417,20 +408,85 @@ App.AddServiceController = Em.Controller.extend({
     });
 
     App.db.setSlaveComponentHosts(slaveComponentHosts);
+    console.log('addServiceController.slaveComponentHosts: saved hosts', slaveComponentHosts);
     this.set('content.slaveComponentHosts', slaveComponentHosts);
   },
+  /**
+   * return slaveComponents bound to hosts
+   * @return {Array}
+   */
+  getSlaveComponentHosts: function () {
+    var components = [{
+      name : 'DATANODE',
+      service : 'HDFS'
+    },
+    {
+      name: 'TASKTRACKER',
+      service: 'MAPREDUCE'
+    },{
+      name: 'HBASE_REGIONSERVER',
+      service: 'HBASE'
+    }];
+
+    var result = [];
+    var services = App.Service.find();
+    var selectedServices = this.get('content.services').filterProperty('isSelected', true).mapProperty('serviceName');
+    for(var index=0; index < components.length; index++){
+      var comp = components[index];
+      if(!selectedServices.contains(comp.service)){
+        continue;
+      }
+
 
+      var service = services.findProperty('id', comp.service);
+      var hosts = [];
+
+      service.get('hostComponents').filterProperty('componentName', comp.name).forEach(function (host_component) {
+          hosts.push({
+            group: "Default",
+            hostName: host_component.get('host.id'),
+            isInstalled: true
+          });
+      }, this);
+
+      result.push({
+        componentName: comp.name,
+        displayName: App.format.role(comp.name),
+        hosts: hosts,
+        isInstalled: true
+      })
+    }
+
+    var clientsHosts = App.HostComponent.find().filterProperty('componentName', 'HDFS_CLIENT');
+    var hosts = [];
+
+    clientsHosts.forEach(function (host_component) {
+        hosts.push({
+          group: "Default",
+          hostName: host_component.get('host.id'),
+          isInstalled: true
+        });
+    }, this);
+
+    result.push({
+      componentName: 'CLIENT',
+      displayName: 'client',
+      hosts: hosts,
+      isInstalled: true
+    })
+
+    return result;
+  },
   /**
    * Load master component hosts data for using in required step controllers
    */
   loadSlaveComponentHosts: function () {
     var slaveComponentHosts = App.db.getSlaveComponentHosts();
+    if(!slaveComponentHosts){
+      slaveComponentHosts = this.getSlaveComponentHosts();
+    }
     this.set("content.slaveComponentHosts", slaveComponentHosts);
     console.log("AddServiceController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
-
-    var hostSlaveComponents = App.db.getHostSlaveComponents();
-    this.set('content.hostSlaveComponents', hostSlaveComponents);
-    console.log("AddServiceController.loadSlaveComponentHosts: loaded hosts ", hostSlaveComponents);
   },
 
   /**
@@ -480,13 +536,15 @@ App.AddServiceController = Em.Controller.extend({
   saveClients: function(stepController){
     var clients = [];
     var serviceComponents = require('data/service_components');
+    var hostComponents = App.HostComponent.find();
 
     stepController.get('content').filterProperty('isSelected',true).forEach(function (_service) {
       var client = serviceComponents.filterProperty('service_name', _service.serviceName).findProperty('isClient', true);
       if (client) {
         clients.pushObject({
           component_name: client.component_name,
-          display_name: client.display_name
+          display_name: client.display_name,
+          isInstalled: hostComponents.filterProperty('componentName', client.component_name).length > 0
         });
       }
     }, this);
@@ -518,6 +576,55 @@ App.AddServiceController = Em.Controller.extend({
     }
   },
 
+  loadAdvancedConfigs: function () {
+    App.db.getSelectedServiceNames().forEach(function (_serviceName) {
+      this.loadAdvancedConfig(_serviceName);
+    }, this);
+  },
+  /**
+   * Generate serviceProperties save it to localdata
+   * called form stepController step6WizardController
+   */
+
+  loadAdvancedConfig: function (serviceName) {
+    var self = this;
+    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + '/stacks/HDP/version/1.2.0/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
+    var method = 'GET';
+    $.ajax({
+      type: method,
+      url: url,
+      async: false,
+      dataType: 'text',
+      timeout: App.timeout,
+      success: function (data) {
+        var jsonData = jQuery.parseJSON(data);
+        console.log("TRACE: Step6 submit -> In success function for the loadAdvancedConfig call");
+        console.log("TRACE: Step6 submit -> value of the url is: " + url);
+        var serviceComponents = jsonData.properties;
+        serviceComponents.setEach('serviceName', serviceName);
+        var configs;
+        if (App.db.getAdvancedServiceConfig()) {
+          configs = App.db.getAdvancedServiceConfig();
+        } else {
+          configs = [];
+        }
+        configs = configs.concat(serviceComponents);
+        self.set('content.advancedServiceConfig', configs);
+        App.db.setAdvancedServiceConfig(configs);
+        console.log('TRACE: servicename: ' + serviceName);
+      },
+
+      error: function (request, ajaxOptions, error) {
+        console.log("TRACE: STep6 submit -> In error function for the loadAdvancedConfig call");
+        console.log("TRACE: STep6 submit-> value of the url is: " + url);
+        console.log("TRACE: STep6 submit-> error code status is: " + request.status);
+        console.log('Step6 submit: Error message is: ' + request.responseText);
+      },
+
+      statusCode: require('data/statusCodes')
+    });
+  },
+
   /**
    * Generate clients list for selected services and save it to model
    * @param stepController step8WizardController or step9WizardController
@@ -525,7 +632,7 @@ App.AddServiceController = Em.Controller.extend({
   installServices: function () {
     var self = this;
     var clusterName = this.get('content.cluster.name');
-    var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : '/api/clusters/' + clusterName + '/services?state=INIT';
+    var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT';
     var method = (App.testMode) ? 'GET' : 'PUT';
     var data = '{"ServiceInfo": {"state": "INSTALLED"}}';
     $.ajax({
@@ -534,7 +641,7 @@ App.AddServiceController = Em.Controller.extend({
       data: data,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         var installSartTime = new Date().getTime();
@@ -551,7 +658,7 @@ App.AddServiceController = Em.Controller.extend({
             isCompleted: false,
             installStartTime: installSartTime
           };
-          self.saveClusterStatus(clusterStatus);
+          //self.saveClusterStatus(clusterStatus);
         } else {
           console.log('ERROR: Error occurred in parsing JSON data');
         }
@@ -567,7 +674,7 @@ App.AddServiceController = Em.Controller.extend({
           isInstallError: true,
           isCompleted: false
         };
-        self.saveClusterStatus(clusterStatus);
+        //self.saveClusterStatus(clusterStatus);
       },
 
       statusCode: require('data/statusCodes')
@@ -582,6 +689,17 @@ App.AddServiceController = Em.Controller.extend({
   clearAllSteps: function () {
     this.clearHosts();
     //todo it)
+  },
+
+  /**
+   * Clear all temporary data
+   */
+  finish: function(){
+    this.setCurrentStep('1', false);
+    App.db.setService(undefined); //not to use this data at AddService page
+    App.db.setHosts(undefined);
+    App.db.setMasterComponentHosts(undefined);
+    App.db.setSlaveComponentHosts(undefined);
   }
 
 });

+ 4 - 2
ambari-web/app/controllers/main/service/info/configs.js

@@ -30,8 +30,10 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   }.property('stepConfigs.@each.errorCount'),
 
   slaveComponentHosts : function(){
-    console.log('slaveComponentHosts');
-    console.log(App.db.getSlaveComponentHosts());
+    if(!this.get('content')){
+      return;
+    }
+    console.log('slaveComponentHosts', App.db.getSlaveComponentHosts());
     return App.db.getSlaveComponentHosts();
   }.property('content'),
 

+ 2 - 2
ambari-web/app/controllers/main/service/item.js

@@ -29,7 +29,7 @@ App.MainServiceItemController = Em.Controller.extend({
   sendCommandToServer : function(url, method,postData, callback){
     var url =  (App.testMode) ?
       '/data/wizard/deploy/poll_1.json' : //content is the same as ours
-      '/api/clusters/' + App.router.getClusterName() + url;
+      App.apiPrefix + '/clusters/' + App.router.getClusterName() + url;
 
     method = App.testMode ? 'GET' : method;
 
@@ -38,7 +38,7 @@ App.MainServiceItemController = Em.Controller.extend({
       url: url,
       data: JSON.stringify(postData),
       dataType: 'json',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function(data){
         if(data && data.Requests){
           callback(data.Requests.id);

+ 7 - 3
ambari-web/app/controllers/wizard/slave_component_groups_controller.js

@@ -42,6 +42,10 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
 
   }.property('App.router.wizardStep7Controller.selectedService'),
 
+  selectedComponentDisplayName: function() {
+    return App.format.role(this.get('selectedComponentName'));
+  }.property('selectedComponentName'),
+
   selectedSlaveComponent: function () {
     var selectedComponentName = this.get('selectedComponentName');
     if (selectedComponentName) {
@@ -111,7 +115,7 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
       onPrimary: function (event) {
         if (component.tempSelectedGroups && component.tempSelectedGroups.length) {
           component.tempSelectedGroups.forEach(function (item) {
-            var changed = component.hosts.filterProperty('hostname', item.hostName);
+            var changed = component.hosts.filterProperty('hostName', item.hostName);
             changed.setEach('group', item.groupName);
           })
         }
@@ -139,9 +143,9 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
     if (component.tempSelectedGroups === undefined) {
       component.tempSelectedGroups = [];
     }
-    var values = component.tempSelectedGroups.filterProperty('hostName', host.hostname);
+    var values = component.tempSelectedGroups.filterProperty('hostName', host.hostName);
     if (values.length === 0)
-      component.tempSelectedGroups.pushObject({hostName: host.hostname, groupName: groupName});
+      component.tempSelectedGroups.pushObject({hostName: host.hostName, groupName: groupName});
     else
       values.setEach('groupName', groupName);
 

+ 3 - 2
ambari-web/app/controllers/wizard/step10_controller.js

@@ -43,7 +43,7 @@ App.WizardStep10Controller = Em.Controller.extend({
     slaveHosts.forEach(function (_hosts) {
       hostObj = hostObj.concat(_hosts.hosts);
     }, this);
-    slaveHosts = hostObj.mapProperty('hostname').uniq();
+    slaveHosts = hostObj.mapProperty('hostName').uniq();
     var registeredHosts = masterHosts.concat(slaveHosts).uniq();
     var registerHostsStatement = registeredHosts.length + ' hosts registered to the cluster.';
     var registerHostsObj = Ember.Object.create({
@@ -153,7 +153,8 @@ App.WizardStep10Controller = Em.Controller.extend({
           this.loadJt(component);
           break;
         case 'ZOOKEEPER_SERVER' :
-          this.loadZk(component);
+          // TODO: Fix this; redundant entries and wrong number
+          //this.loadZk(component);
           break;
         case 'HBASE_MASTER':
           this.loadHb(component);

+ 4 - 4
ambari-web/app/controllers/wizard/step2_controller.js

@@ -146,20 +146,20 @@ App.WizardStep2Controller = Em.Controller.extend({
     }
 
     var method = App.testMode ? 'GET' : 'POST';
-    var url = App.testMode ? '/data/wizard/bootstrap/bootstrap.json' : '/api/bootstrap';
+    var url = App.testMode ? '/data/wizard/bootstrap/bootstrap.json' : App.apiPrefix + '/bootstrap';
 
     $.ajax({
       type: method,
       url: url,
       data: bootStrapData,
-      timeout: 10000,
+      timeout: App.timeout,
       contentType: 'application/json',
       success: function () {
-        console.log("TRACE: POST /api/bootstrap succeeded");
+        console.log("TRACE: POST bootstrap succeeded");
         App.router.send('next');
       },
       error: function () {
-        console.log("ERROR: POST /api/bootstrap failed");
+        console.log("ERROR: POST bootstrap failed");
         alert('Bootstrap call failed.  Please try again.');
       }
     });

+ 2 - 2
ambari-web/app/controllers/wizard/step3_controller.js

@@ -196,11 +196,11 @@ App.WizardStep3Controller = Em.Controller.extend({
   doBootstrap: function () {
     this.numPolls++;
     var self = this;
-    var url = App.testMode ? '/data/wizard/bootstrap/poll_' + this.numPolls + '.json' : '/api/bootstrap/1';
+    var url = App.testMode ? '/data/wizard/bootstrap/poll_' + this.numPolls + '.json' : App.apiPrefix + '/bootstrap/1';
     $.ajax({
       type: 'GET',
       url: url,
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         if (data.hostsStatus !== null) {
           // in case of bootstrapping just one server, the server returns an object rather than an array...

+ 59 - 44
ambari-web/app/controllers/wizard/step5_controller.js

@@ -42,6 +42,11 @@ App.WizardStep5Controller = Em.Controller.extend({
     this.clearStep();
     this.renderHostInfo();
     this.renderComponents(this.loadComponents());
+
+    if(!this.get("selectedServicesMasters").filterProperty('isInstalled', false).length){
+      console.log('no master components to add');
+      App.router.send('next');
+    }
   },
 
   /**
@@ -74,46 +79,69 @@ App.WizardStep5Controller = Em.Controller.extend({
   loadComponents: function () {
 
     var services = this.get('content.services')
-      .filterProperty('isSelected', true).mapProperty('serviceName');
+      .filterProperty('isSelected', true).mapProperty('serviceName'); //list of shown services
 
     services.forEach(function (item) {
       this.get("selectedServices").pushObject(Ember.Object.create({service_name: item}));
     }, this);
 
-    var masterHosts = this.get('content.masterComponentHosts');
-
-    var components = new Ember.Set();
-    if (!masterHosts) {
-
-      var masterComponents = this.get('components').filterProperty('isMaster', true);
-      for (var index in services) {
-        var componentInfo = masterComponents.filterProperty('service_name', services[index]);
-        componentInfo.forEach(function (_componentInfo) {
-          console.log("TRACE: master component name is: " + _componentInfo.display_name);
+    var masterHosts = this.get('content.masterComponentHosts'); //saved to local storadge info
+
+    var resultComponents = new Ember.Set();
+
+    var masterComponents = this.get('components').filterProperty('isMaster', true); //get full list from mock data
+
+    var servicesLength = services.length;
+    for (var index =0; index < servicesLength; index++) {
+      var componentInfo = masterComponents.filterProperty('service_name', services[index]);
+
+      componentInfo.forEach(function (_componentInfo) {
+
+        if(_componentInfo.component_name == 'ZOOKEEPER_SERVER'){
+          var savedComponents = masterHosts.filterProperty('component', _componentInfo.component_name);
+          if(savedComponents.length){
+
+            savedComponents.forEach(function(item){
+              var zooKeeperHost = {};
+              zooKeeperHost.display_name = _componentInfo.display_name;
+              zooKeeperHost.component_name = _componentInfo.component_name;
+              zooKeeperHost.selectedHost = item.hostName;
+              zooKeeperHost.availableHosts = [];
+              zooKeeperHost.serviceId = services[index];
+              zooKeeperHost.isInstalled = item.isInstalled;
+              resultComponents.add(zooKeeperHost);
+            })
+
+          } else{
+
+            var zooHosts = this.selectHost(_componentInfo.component_name);
+            zooHosts.forEach(function (_host) {
+              var zooKeeperHost = {};
+              zooKeeperHost.display_name = _componentInfo.display_name;
+              zooKeeperHost.component_name = _componentInfo.component_name;
+              zooKeeperHost.selectedHost = _host;
+              zooKeeperHost.availableHosts = [];
+              zooKeeperHost.serviceId = services[index];
+              zooKeeperHost.isInstalled = false;
+              resultComponents.add(zooKeeperHost);
+            });
+
+          }
+        } else {
+          var savedComponent = masterHosts.findProperty('component', _componentInfo.component_name);
           var componentObj = {};
           componentObj.component_name = _componentInfo.component_name;
           componentObj.display_name = _componentInfo.display_name;
-          componentObj.selectedHost = this.selectHost(_componentInfo.component_name);   // call the method that plays selectNode algorithm or fetches from server
-          componentObj.isInstalled = App.Component.find().someProperty('componentName', _componentInfo.component_name);
+          componentObj.selectedHost = savedComponent ? savedComponent.hostName : this.selectHost(_componentInfo.component_name);   // call the method that plays selectNode algorithm or fetches from server
+          componentObj.isInstalled = savedComponent ? savedComponent.isInstalled : App.Component.find().someProperty('componentName', _componentInfo.component_name);
+          componentObj.serviceId = services[index];
           componentObj.availableHosts = [];
-          components.add(componentObj);
-        }, this);
-      }
-
-    } else {
-
-      masterHosts.forEach(function (_masterComponentHost) {
-        var componentObj = {};
-        componentObj.component_name = _masterComponentHost.component;
-        componentObj.display_name = _masterComponentHost.display_name;
-        componentObj.selectedHost = _masterComponentHost.hostName;
-        componentObj.isInstalled = _masterComponentHost.isInstalled;
-        componentObj.availableHosts = [];
-        components.add(componentObj);
+          resultComponents.add(componentObj);
+        }
       }, this);
-
     }
-    return components;
+
+    return resultComponents;
   },
 
   /**
@@ -127,7 +155,6 @@ App.WizardStep5Controller = Em.Controller.extend({
       this.set('selectedServicesMasters', []);
     }
 
-
     masterComponents.forEach(function (item) {
       //add the zookeeper component at the end if exists
       console.log("TRACE: render master component name is: " + item.component_name);
@@ -150,6 +177,7 @@ App.WizardStep5Controller = Em.Controller.extend({
         this.get("selectedServicesMasters").pushObject(componentObj);
       }
     }, this);
+
   },
 
   getKerberosServer: function (noOfHosts) {
@@ -337,20 +365,7 @@ App.WizardStep5Controller = Em.Controller.extend({
     } else if (componentName === 'TEMPLETON_SERVER') {
       return this.getTempletonServer(noOfHosts).host_name;
     } else if (componentName === 'ZOOKEEPER_SERVER') {
-      var zhosts = this.getZooKeeperServer(noOfHosts);
-      var extraHosts = zhosts.slice(0, zhosts.length - 1);
-      var zooKeeperHosts = new Ember.Set();
-      extraHosts.forEach(function (_host) {
-        var zooKeeperHost = {};
-        zooKeeperHost.display_name = 'ZooKeeper';
-        zooKeeperHost.component_name = 'ZOOKEEPER';
-        zooKeeperHost.selectedHost = _host;
-        zooKeeperHost.availableHosts = [];
-        zooKeeperHosts.add(zooKeeperHost);
-      });
-      this.renderComponents(zooKeeperHosts);
-      var lastHost = zhosts[zhosts.length - 1];
-      return lastHost;
+      return this.getZooKeeperServer(noOfHosts);
     } else if (componentName === 'GANGLIA_SERVER') {
       return this.getGangliaServer(noOfHosts);
     } else if (componentName === 'NAGIOS_SERVER') {

+ 31 - 16
ambari-web/app/controllers/wizard/step6_controller.js

@@ -28,7 +28,6 @@ var db = require('utils/db');
  *   masterComponentHosts: App.db.masterComponentHosts (master-components-to-hosts mapping the user selected in Step 5)
  *
  * Step 6 will set the following information in App.db:
- *   hostSlaveComponents: App.db.hostSlaveComponents (hosts-to-slave-components mapping the user selected in Steo 6)
  *   slaveComponentHosts: App.db.slaveComponentHosts (slave-components-to-hosts mapping the user selected in Step 6)
  *
  */
@@ -105,35 +104,43 @@ App.WizardStep6Controller = Em.Controller.extend({
   },
 
   selectAllDataNodes: function () {
-    this.get('hosts').setEach('isDataNode', true);
+    var forFilter = this.get('hosts').filterProperty('isDataNodeInstalled', false);
+    forFilter.setEach('isDataNode', true);
   },
 
   selectAllTaskTrackers: function () {
-    this.get('hosts').setEach('isTaskTracker', true);
+    var forFilter = this.get('hosts').filterProperty('isTaskTrackerInstalled', false);
+    forFilter.setEach('isTaskTracker', true);
   },
 
   selectAllRegionServers: function () {
-    this.get('hosts').setEach('isRegionServer', true);
+    var forFilter = this.get('hosts').filterProperty('isRegionServerInstalled', false);
+    forFilter.setEach('isRegionServer', true);
   },
 
   selectAllClients: function () {
-    this.get('hosts').setEach('isClient', true);
+    var forFilter = this.get('hosts').filterProperty('isClientInstalled', false);
+    forFilter.setEach('isClient', true);
   },
 
   deselectAllDataNodes: function () {
-    this.get('hosts').setEach('isDataNode', false);
+    var forFilter = this.get('hosts').filterProperty('isDataNodeInstalled', false);
+    forFilter.setEach('isDataNode', false);
   },
 
   deselectAllTaskTrackers: function () {
-    this.get('hosts').setEach('isTaskTracker', false);
+    var forFilter = this.get('hosts').filterProperty('isTaskTrackerInstalled', false);
+    forFilter.setEach('isTaskTracker', false);
   },
 
   deselectAllRegionServers: function () {
-    this.get('hosts').setEach('isRegionServer', false);
+    var forFilter = this.get('hosts').filterProperty('isRegionServerInstalled', false);
+    forFilter.setEach('isRegionServer', false);
   },
 
   deselectAllClients: function () {
-    this.get('hosts').setEach('isClient', false);
+    var forFilter = this.get('hosts').filterProperty('isClientInstalled', false);
+    forFilter.setEach('isClient', false);
   },
 
   clearStep: function () {
@@ -169,7 +176,7 @@ App.WizardStep6Controller = Em.Controller.extend({
     var hostsObj = Em.Set.create();
     var allHosts = this.getHostNames();
     var maxNoofHostComponents = 9;
-    var slaveHosts = this.get('content.slaveComponentHosts');
+    var slaveComponents = this.get('content.slaveComponentHosts');
 
     allHosts.forEach(function (_hostName) {
       hostsObj.push(Em.Object.create({
@@ -178,11 +185,15 @@ App.WizardStep6Controller = Em.Controller.extend({
         isDataNode: false,
         isTaskTracker: false,
         isRegionServer: false,
-        isClient: false
+        isClient: false,
+        isDataNodeInstalled: false,
+        isTaskTrackerInstalled: false,
+        isRegionServerInstalled: false,
+        isClientInstalled: false
       }));
     });
 
-    if (!slaveHosts) { // we are at this page for the first time
+    if (!slaveComponents) { // we are at this page for the first time
       if (allHosts.length > 3) {             //multiple nodes scenario
         hostsObj.forEach(function (host) {
           host.isMaster = this.hasMasterComponents(host.hostName);
@@ -215,39 +226,43 @@ App.WizardStep6Controller = Em.Controller.extend({
 
     } else {
 
-      var dataNodes = slaveHosts.findProperty('componentName', 'DATANODE');
+      var dataNodes = slaveComponents.findProperty('componentName', 'DATANODE');
       dataNodes.hosts.forEach(function (_dataNode) {
         var dataNode = hostsObj.findProperty('hostName', _dataNode.hostName);
         if (dataNode) {
           dataNode.set('isDataNode', true);
+          dataNode.set('isDataNodeInstalled', true);
         }
       });
 
       if (this.get('isMrSelected')) {
-        var taskTrackers = slaveHosts.findProperty('componentName', 'TASKTRACKER');
+        var taskTrackers = slaveComponents.findProperty('componentName', 'TASKTRACKER');
         taskTrackers.hosts.forEach(function (_taskTracker) {
           var taskTracker = hostsObj.findProperty('hostName', _taskTracker.hostName);
           if (taskTracker) {
             taskTracker.set('isTaskTracker', true);
+            taskTracker.set('isTaskTrackerInstalled', true);
           }
         });
       }
 
       if (this.get('isHbSelected')) {
-        var regionServers = slaveHosts.findProperty('componentName', 'HBASE_REGIONSERVER');
+        var regionServers = slaveComponents.findProperty('componentName', 'HBASE_REGIONSERVER');
         regionServers.hosts.forEach(function (_regionServer) {
           var regionServer = hostsObj.findProperty('hostName', _regionServer.hostName);
           if (regionServer) {
             regionServer.set('isRegionServer', true);
+            regionServer.set('isRegionServerInstalled', true);
           }
         });
       }
 
-      var clients = slaveHosts.findProperty('componentName', 'CLIENT');
+      var clients = slaveComponents.findProperty('componentName', 'CLIENT');
       clients.hosts.forEach(function (_client) {
         var client = hostsObj.findProperty('hostName', _client.hostName);
         if (client) {
           client.set('isClient', true);
+          client.set('isClientInstalled', true);
         }
       }, this);
 

+ 28 - 23
ambari-web/app/controllers/wizard/step8_controller.js

@@ -29,10 +29,6 @@ App.WizardStep8Controller = Em.Controller.extend({
   configMapping: require('data/config_mapping'),
 
   selectedServices: function () {
-    var services = App.Service.find();
-    this.get('content.services').forEach(function (item) {
-      item.set('isInstalled', services.someProperty('serviceName', item.get('serviceName')));
-    });
     return this.get('content.services').filterProperty('isSelected', true).filterProperty('isInstalled', false);
   }.property('content.services').cacheable(),
 
@@ -624,7 +620,7 @@ App.WizardStep8Controller = Em.Controller.extend({
     }
 
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName;
+    var url = App.apiPrefix + '/clusters/' + clusterName;
     $.ajax({
       type: 'POST',
       url: url,
@@ -632,7 +628,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       //accepts: 'text',
       dataType: 'text',
       data: '{"Clusters": {"version" : "HDP-1.2.0"}}',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for createCluster call");
@@ -660,13 +656,13 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   createService: function (service, httpMethod) {
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/services/' + service;
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/services/' + service;
     $.ajax({
       type: httpMethod,
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the createService call");
@@ -685,27 +681,27 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   createComponents: function () {
-    //TODO: Uncomment following after hooking up with all services.
+
     var serviceComponents = require('data/service_components');
     var services = this.get('selectedServices').mapProperty('serviceName');
     services.forEach(function (_service) {
       var components = serviceComponents.filterProperty('service_name', _service);
       components.forEach(function (_component) {
-        console.log("value of component is: " + _component.component_name);
         this.createComponent(_service, _component.component_name);
       }, this);
     }, this);
+
   },
 
   createComponent: function (service, component) {
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/services/' + service + '/components/' + component;
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/services/' + service + '/components/' + component;
     $.ajax({
       type: 'POST',
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for createComponent");
@@ -734,13 +730,13 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   registerHostToCluster: function (hostName) {
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/hosts/' + hostName;
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/hosts/' + hostName;
     $.ajax({
       type: 'POST',
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for registerHostToCluster");
@@ -780,11 +776,12 @@ App.WizardStep8Controller = Em.Controller.extend({
           this.createHostComponent(slaveObj);
         }, this);
       } else {
+        //: todo
         this.get('content.clients').forEach(function (_client) {
           slaveObj.component = _client.component_name;
           _slaveHosts.hosts.forEach(function (_slaveHost) {
             slaveObj.hostName = _slaveHost.hostName;
-            slaveObj.isInstalled = _slaveHost.isInstalled;
+            slaveObj.isInstalled = _slaveHost.isInstalled && _client.isInstalled;
             this.createHostComponent(slaveObj);
           }, this);
         }, this);
@@ -800,20 +797,20 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   createHostComponent: function (hostComponent) {
-    console.log(hostComponent);
+    console.log('try to install', hostComponent.component, 'on host',  hostComponent.hostName, 'isInstalled', hostComponent.isInstalled);
     if (hostComponent.isInstalled) {
       return false;
     }
 
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/hosts/' + hostComponent.hostName + '/host_components/' + hostComponent.component;
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/hosts/' + hostComponent.hostName + '/host_components/' + hostComponent.component;
 
     $.ajax({
       type: 'POST',
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the createComponent with new host call");
@@ -841,7 +838,6 @@ App.WizardStep8Controller = Em.Controller.extend({
       this.createConfigSite(this.createMrSiteObj('MAPREDUCE'));
     }
     if (selectedServices.someProperty('serviceName', 'HBASE')) {
-      // TODO
       this.createConfigSite(this.createHbaseSiteObj('HBASE'));
     }
     if (selectedServices.someProperty('serviceName', 'OOZIE')) {
@@ -856,14 +852,14 @@ App.WizardStep8Controller = Em.Controller.extend({
   createConfigSite: function (data) {
     console.log("Inside createConfigSite");
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/configurations';
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/configurations';
     $.ajax({
       type: 'POST',
       url: url,
       data: JSON.stringify(data),
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the createConfigSite");
@@ -942,6 +938,10 @@ App.WizardStep8Controller = Em.Controller.extend({
     configs.forEach(function (_configProperty) {
       hbaseProperties[_configProperty.name] = _configProperty.value;
     }, this);
+    var masterHosts = App.db.getMasterComponentHosts();
+    // TODO: should filter on "component" but that gives unexpected results
+    var zkServers = masterHosts.filterProperty('display_name', 'ZooKeeper').mapProperty('hostName');
+    hbaseProperties['hbase.zookeeper.quorum'] = zkServers.join(',');
     return {type: 'hbase-site', tag: 'version1', properties: hbaseProperties};
   },
 
@@ -951,6 +951,11 @@ App.WizardStep8Controller = Em.Controller.extend({
     configs.forEach(function (_configProperty) {
       oozieProperties[_configProperty.name] = _configProperty.value;
     }, this);
+    var baseUrl = oozieProperties['oozie.base.url'];
+    oozieProperties = {
+      "oozie.service.JPAService.jdbc.password" : " ", "oozie.db.schema.name" : "oozie", "oozie.service.JPAService.jdbc.url" : "jdbc:derby:/var/data/oozie/oozie-db;create=true", "oozie.service.JPAService.jdbc.driver" : "org.apache.derby.jdbc.EmbeddedDriver", "oozie.service.WorkflowAppService.system.libpath" : "/user/oozie/share/lib", "oozie.service.JPAService.jdbc.username" : "sa", "oozie.service.SchemaService.wf.ext.schemas" : "shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd", "oozie.service.JPAService.create.db.schema" : "false",   "use.system.libpath.for.mapreduce.and.pig.jobs" : "false", "oozie.service.ActionService.executor.ext.classes" : "org.apache.oozie.action.email.EmailActionExecutor,org.apache.oozie.action.hadoop.HiveActionExecutor,org.apache.oozie.action.hadoop.ShellActionExecutor,org.apache.oozie.action.hadoop.SqoopActionExecutor,org.apache.oozie.action.hadoop.DistcpActionExecutor", "oozie.service.HadoopAccessorService.hadoop.configurations" : "*=/etc/hadoop/conf"
+    };
+    oozieProperties['oozie.base.url'] = baseUrl;
     return {type: 'oozie-site', tag: 'version1', properties: oozieProperties};
   },
 
@@ -974,7 +979,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   applyCreatedConfToService: function (service, httpMethod, data) {
     console.log("Inside applyCreatedConfToService");
     var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = '/api/clusters/' + clusterName + '/services/' + service;
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/services/' + service;
 
     $.ajax({
       type: httpMethod,
@@ -982,7 +987,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       async: false,
       dataType: 'text',
       data: JSON.stringify(data),
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the applyCreatedConfToService call");

+ 9 - 7
ambari-web/app/controllers/wizard/step9_controller.js

@@ -196,7 +196,7 @@ App.WizardStep9Controller = Em.Controller.extend({
   launchStartServices: function () {
     var self = this;
     var clusterName = this.get('content.cluster.name');
-    var url = '/api/clusters/' + clusterName + '/services?state=INSTALLED';
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/services?state=INSTALLED';
     var data = '{"ServiceInfo": {"state": "STARTED"}}';
     var method = 'PUT';
 
@@ -213,7 +213,7 @@ App.WizardStep9Controller = Em.Controller.extend({
       async: false,
       data: data,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: Step9 -> In success function for the startService call");
@@ -343,8 +343,10 @@ App.WizardStep9Controller = Em.Controller.extend({
   setHostsStatus: function (hostNames, status) {
     hostNames.forEach(function (_hostName) {
       var host = this.hosts.findProperty('name', _hostName);
-      host.set('status', status);
-      host.set('progress', '100');
+      if(host){
+        host.set('status', status)
+            .set('progress', '100');
+      }
     }, this);
   },
 
@@ -371,7 +373,7 @@ App.WizardStep9Controller = Em.Controller.extend({
           if (this.isStepFailed(polledData)) {
             clusterStatus.status = 'START FAILED';      // 'START FAILED' implies to step10 that installation was successful but start failed
             this.set('status', 'failed');
-            this.setHostsStatus(this.getFailedHostsForFailedRoles(polledData));
+            this.setHostsStatus(this.getFailedHostsForFailedRoles(polledData), 'failed');
           }
         }
         App.router.get(this.get('content.controllerName')).saveClusterStatus(clusterStatus);
@@ -490,7 +492,7 @@ App.WizardStep9Controller = Em.Controller.extend({
   getUrl: function () {
     var clusterName = this.get('content.cluster.name');
     var requestId = App.db.getClusterStatus().requestId;
-    var url = '/api/clusters/' + clusterName + '/requests/' + requestId + '?fields=tasks/*';
+    var url = App.apiPrefix + '/clusters/' + clusterName + '/requests/' + requestId + '?fields=tasks/*';
     console.log("URL for step9 is: " + url);
     return url;
   },
@@ -517,7 +519,7 @@ App.WizardStep9Controller = Em.Controller.extend({
       type: 'GET',
       url: url,
       async: true,
-      timeout: 10000,
+      timeout: App.timeout,
       dataType: 'text',
       success: function (data) {
         console.log("TRACE: In success function for the GET bootstrap call");

+ 18 - 0
ambari-web/app/data/config_mapping.js

@@ -262,6 +262,7 @@ module.exports = [
     "value": "<templateName[0]>",
     "filename": "hdfs-site.xml"
   },
+  /*
   {
     "name": "dfs.namenode.kerberos.internal.spnego.principal",
     "templateName": [],
@@ -276,6 +277,7 @@ module.exports = [
     "value": "<foreignKey[0]>",
     "filename": "hdfs-site.xml"
   },
+  */
   {
     "name": "mapred.local.dir",
     "templateName": ["mapred_local_dir"],
@@ -573,6 +575,7 @@ module.exports = [
     "value": "<templateName[0]>",
     "filename": "hbase-site.xml"
   },
+  /*
   {
     "name": "hbase.master.info.bindAddress",
     "templateName": ["hbasemaster.host"],
@@ -580,6 +583,7 @@ module.exports = [
     "value": "<templateName[0]>",
     "filename": "hbase-site.xml"
   },
+  */
   {
     "name": "hbase.regionserver.global.memstore.upperLimit",
     "templateName": ["regionserver_memstore_upperlimit"],
@@ -671,6 +675,20 @@ module.exports = [
     "value": "<templateName[0]>",
     "filename": "hbase-site.xml"
   },
+  {
+    "name": "hbase.cluster.distributed",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "true",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.zookeeper.property.clientPort",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "2181",
+    "filename": "hbase-site.xml"
+  },
   {
     "name": "zookeeper.session.timeout",
     "templateName": ["zookeeper_sessiontimeout"],

+ 1 - 3
ambari-web/app/data/config_properties.js

@@ -1389,10 +1389,9 @@ module.exports =
       "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
-    /* TODO: Uncomment when RCA integration is ready
     {
       "id": "puppet var",
-      "name": "enable_rca",
+      "name": "rca_enabled",
       "displayName": "Enable RCA",
       "description": "Enable RCA",
       "defaultValue": true,
@@ -1401,7 +1400,6 @@ module.exports =
       "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
-    */
     /*{
       "id": "puppet var",
       "name": "mapred-site.xml",

+ 4 - 0
ambari-web/app/initialize.js

@@ -21,6 +21,10 @@ window.App = require('app');
 
 App.testMode = false;
 App.skipBootstrap = false;
+App.alwaysGoToInstaller = false;
+App.apiPrefix = '/api';
+// default AJAX timeout
+App.timeout = 20000;
 
 require('messages');
 require('utils/data_table');

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1
ambari-web/app/mappers/jobs_mapper.js


+ 11 - 6
ambari-web/app/mappers/runs_mapper.js

@@ -32,10 +32,15 @@ App.runsMapper = App.QuickDataMapper.create({
         var r = '{dag: {';
         item.workflowContext.workflowDag.entries.forEach(function(item) {
           r += '"' + item.source + '": [';
-          item.targets.forEach(function(target) {
-            r += '"' + target + '",';
-          });
-          r = r.substr(0, r.length - 1);
+          // if a standalone MapReduce job, there won't be any targets
+          if (item.targets) {
+            item.targets.forEach(function(target) {
+              r += '"' + target + '",';
+            });
+            r = r.substr(0, r.length - 1);
+          } else {
+            r += item.source;
+          }
           r += '],';
         });
         r = r.substr(0, r.length - 1);
@@ -55,7 +60,7 @@ App.runsMapper = App.QuickDataMapper.create({
     user_name:'userName',
     start_time: 'startTime',
     elapsed_time: 'elapsedTime',
-    $input: 9403,
-    $output: 1230
+    input: 'inputBytes',
+    output: 'outputBytes'
   }
 });

+ 111 - 90
ambari-web/app/mappers/services_mapper.js

@@ -16,109 +16,121 @@
  */
 
 App.servicesMapper = App.QuickDataMapper.create({
-  model: App.Service,
-  config: {
-    id: 'ServiceInfo.service_name',
-    service_name: 'ServiceInfo.service_name',
-    $work_status: 'DEAD',
-    $service_audit: [ 1, 2, 3 ],
-    $alerts: [ 1, 2, 3 ],
-    components_key: 'components',
-    components_type: 'array',
-    components: {
-      item: 'ServiceComponentInfo.component_name',
-      host_components_key: 'host_components',
-      host_components_type: 'array',
-      host_components: {
-        item: 'HostRoles.component_name'
+  model:App.Service,
+  servicesSortOrder: [
+    'HDFS',
+    'MAPREDUCE',
+    'HBASE',
+    'HIVE',
+    'OOZIE',
+    'GANGLIA',
+    'NAGIOS',
+    'PIG',
+    'SQOOP'
+  ],
+  sortByOrder: function (sortOrder, array) {
+    var sorted = [];
+    for (var i = 0; i < sortOrder.length; i++)
+      for (var j = 0; j < array.length; j++) {
+        if (sortOrder[i] == array[j].id) {
+          sorted.push(array[j]);
+        }
       }
+    return sorted;
+  },
+  config:{
+    id:'ServiceInfo.service_name',
+    service_name:'ServiceInfo.service_name',
+    $work_status:'DEAD',
+    $service_audit:[ 1, 2, 3 ],
+    $alerts:[ 1, 2, 3 ],
+    components_key:'components',
+    components_type:'array',
+    components:{
+      item:'ServiceComponentInfo.component_name'
     },
-    host_components_key: 'components[0].host_components',
-    host_components_type: 'array',
-    host_components: {
-      item: 'id'
-    }
+    host_components:'host_components'
   },
 
-  hdfsConfig: {
-    version: 'nameNodeComponent.ServiceComponentInfo.Version',
-    name_node_id: 'nameNodeComponent.host_components[0].HostRoles.host_name',
-    sname_node_id: 'snameNodeComponent.host_components[0].HostRoles.host_name',
-    data_nodes: 'data_nodes',
-    name_node_start_time: 'nameNodeComponent.ServiceComponentInfo.StartTime',
-    jvm_memory_heap_used: 'nameNodeComponent.host_components[0].metrics.jvm.memHeapUsedM',
-    jvm_memory_heap_committed: 'nameNodeComponent.host_components[0].metrics.jvm.memHeapCommittedM',
-    live_data_nodes: 'live_data_nodes',
-    dead_data_nodes: 'dead_data_nodes',
-    decommision_data_nodes: 'decommission_data_nodes',
-    capacity_used: 'nameNodeComponent.ServiceComponentInfo.CapacityUsed',
-    capacity_total: 'nameNodeComponent.ServiceComponentInfo.CapacityTotal',
-    dfs_total_blocks: 'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.BlocksTotal',
-    dfs_corrupt_blocks: 'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CorruptBlocks',
-    dfs_missing_blocks: 'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.MissingBlocks',
-    dfs_under_replicated_blocks: 'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.UnderReplicatedBlocks',
-    dfs_total_files: 'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.FilesTotal',
-    upgrade_status: 'nameNodeComponent.ServiceComponentInfo.UpgradeFinalized',
-    safe_mode_status: 'nameNodeComponent.ServiceComponentInfo.Safemode'
+  hdfsConfig:{
+    version:'nameNodeComponent.ServiceComponentInfo.Version',
+    name_node_id:'nameNodeComponent.host_components[0].HostRoles.host_name',
+    sname_node_id:'snameNodeComponent.host_components[0].HostRoles.host_name',
+    data_nodes:'data_nodes',
+    name_node_start_time:'nameNodeComponent.ServiceComponentInfo.StartTime',
+    jvm_memory_heap_used:'nameNodeComponent.host_components[0].metrics.jvm.memHeapUsedM',
+    jvm_memory_heap_committed:'nameNodeComponent.host_components[0].metrics.jvm.memHeapCommittedM',
+    live_data_nodes:'live_data_nodes',
+    dead_data_nodes:'dead_data_nodes',
+    decommision_data_nodes:'decommission_data_nodes',
+    capacity_used:'nameNodeComponent.ServiceComponentInfo.CapacityUsed',
+    capacity_total:'nameNodeComponent.ServiceComponentInfo.CapacityTotal',
+    dfs_total_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.BlocksTotal',
+    dfs_corrupt_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CorruptBlocks',
+    dfs_missing_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.MissingBlocks',
+    dfs_under_replicated_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.UnderReplicatedBlocks',
+    dfs_total_files:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.FilesTotal',
+    upgrade_status:'nameNodeComponent.ServiceComponentInfo.UpgradeFinalized',
+    safe_mode_status:'nameNodeComponent.ServiceComponentInfo.Safemode'
   },
 
-  mapReduceConfig: {
-    version: 'jobTrackerComponent.ServiceComponentInfo.Version',
-    job_tracker_id: 'jobTrackerComponent.host_components[0].HostRoles.host_name',
-    task_trackers: 'task_trackers',
-    job_tracker_start_time: 'jobTrackerComponent.ServiceComponentInfo.StartTime',
-    job_tracker_heap_used: 'jobTrackerComponent.ServiceComponentInfo.HeapMemoryUsed',
-    job_tracker_heap_max: 'jobTrackerComponent.ServiceComponentInfo.HeapMemoryMax',
-    alive_trackers: 'alive_trackers',
-    black_list_trackers: 'black_list_trackers',
-    gray_list_trackers: 'gray_list_trackers',
-    map_slots: 'map_slots',
-    reduce_slots: 'reduce_slots',
-    jobs_submitted: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_submitted',
-    jobs_completed: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_completed',
-    map_slots_occupied: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_map_slots',
-    map_slots_reserved: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_map_slots',
-    reduce_slots_occupied: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_reduce_slots',
-    reduce_slots_reserved: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_reduce_slots',
-    maps_running: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_maps',
-    maps_waiting: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_maps',
-    reduces_running: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_reduces',
-    reduces_waiting: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_reduces',
-    trackers_decommisioned: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.trackers_decommissioned'
+  mapReduceConfig:{
+    version:'jobTrackerComponent.ServiceComponentInfo.Version',
+    job_tracker_id:'jobTrackerComponent.host_components[0].HostRoles.host_name',
+    task_trackers:'task_trackers',
+    job_tracker_start_time:'jobTrackerComponent.ServiceComponentInfo.StartTime',
+    job_tracker_heap_used:'jobTrackerComponent.ServiceComponentInfo.HeapMemoryUsed',
+    job_tracker_heap_max:'jobTrackerComponent.ServiceComponentInfo.HeapMemoryMax',
+    alive_trackers:'alive_trackers',
+    black_list_trackers:'black_list_trackers',
+    gray_list_trackers:'gray_list_trackers',
+    map_slots:'map_slots',
+    reduce_slots:'reduce_slots',
+    jobs_submitted:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_submitted',
+    jobs_completed:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_completed',
+    map_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_map_slots',
+    map_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_map_slots',
+    reduce_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_reduce_slots',
+    reduce_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_reduce_slots',
+    maps_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_maps',
+    maps_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_maps',
+    reduces_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_reduces',
+    reduces_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_reduces',
+    trackers_decommisioned:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.trackers_decommissioned'
   },
 
-  hbaseConfig: {
-    version: 'masterComponent.ServiceComponentInfo.Version',
-    master_id: 'masterComponent.host_components[0].HostRoles.host_name',
-    region_servers: 'region_servers',
-    master_start_time: 'masterComponent.ServiceComponentInfo.MasterStartTime',
-    master_active_time: 'masterComponent.ServiceComponentInfo.MasterActiveTime',
-    average_load: 'masterComponent.ServiceComponentInfo.AverageLoad',
-    regions_in_transition: 'regions_in_transition',
-    revision: 'masterComponent.ServiceComponentInfo.Revision',
-    heap_memory_used: 'masterComponent.ServiceComponentInfo.HeapMemoryUsed',
-    heap_memory_max: 'masterComponent.ServiceComponentInfo.HeapMemoryMax'
+  hbaseConfig:{
+    version:'masterComponent.ServiceComponentInfo.Version',
+    master_id:'masterComponent.host_components[0].HostRoles.host_name',
+    region_servers:'region_servers',
+    master_start_time:'masterComponent.ServiceComponentInfo.MasterStartTime',
+    master_active_time:'masterComponent.ServiceComponentInfo.MasterActiveTime',
+    average_load:'masterComponent.ServiceComponentInfo.AverageLoad',
+    regions_in_transition:'regions_in_transition',
+    revision:'masterComponent.ServiceComponentInfo.Revision',
+    heap_memory_used:'masterComponent.ServiceComponentInfo.HeapMemoryUsed',
+    heap_memory_max:'masterComponent.ServiceComponentInfo.HeapMemoryMax'
   },
 
-  model2: App.Component,
-  config2: {
-    id: 'ServiceComponentInfo.component_name',
-    component_name: 'ServiceComponentInfo.component_name',
-    service_id: 'ServiceComponentInfo.service_name',
-    work_status: 'host_components[0].HostRoles.state',
-    host_id: 'host_components[0].HostRoles.host_name',
-    $decommissioned: false
+  model2:App.Component,
+  config2:{
+    id:'ServiceComponentInfo.component_name',
+    component_name:'ServiceComponentInfo.component_name',
+    service_id:'ServiceComponentInfo.service_name',
+    work_status:'host_components[0].HostRoles.state',
+    host_id:'host_components[0].HostRoles.host_name',
+    $decommissioned:false
   },
-  model3: App.HostComponent,
-  config3: {
-    id: 'id',
-    work_status: 'HostRoles.state',
-    component_name: 'HostRoles.component_name',
-    host: 'HostRoles.host_name',
-    service: 'component[0].ServiceComponentInfo.service_name'
+  model3:App.HostComponent,
+  config3:{
+    id:'id',
+    work_status:'HostRoles.state',
+    component_name:'HostRoles.component_name',
+    host_id:'HostRoles.host_name',
+    service_id:'component[0].ServiceComponentInfo.service_name'
   },
 
-  map: function (json) {
+  map:function (json) {
     if (!this.get('model')) {
       return;
     }
@@ -127,11 +139,14 @@ App.servicesMapper = App.QuickDataMapper.create({
       var result = [];
       json.items.forEach(function (item) {
         var finalConfig = jQuery.extend({}, this.config);
+        item.host_components = [];
         item.components.forEach(function (component) {
           component.host_components.forEach(function (host_component) {
             host_component.id = host_component.HostRoles.component_name + "_" + host_component.HostRoles.host_name;
+            item.host_components.push(host_component.id);
           }, this)
         }, this);
+
         if (item && item.ServiceInfo && item.ServiceInfo.service_name == "HDFS") {
           // Change the JSON so that it is easy to map
           var hdfsConfig = this.hdfsConfig;
@@ -172,6 +187,7 @@ App.servicesMapper = App.QuickDataMapper.create({
           });
           // Map
           var finalJson = this.parseIt(item, finalConfig);
+          finalJson.quick_links = [1, 2, 3, 4];
           result.push(finalJson);
           App.store.load(App.HDFSService, finalJson);
         } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "MAPREDUCE") {
@@ -227,6 +243,7 @@ App.servicesMapper = App.QuickDataMapper.create({
           });
           // Map
           finalJson = this.parseIt(item, finalConfig);
+          finalJson.quick_links = [5, 6, 7, 8, 9, 10, 11, 12];
           result.push(finalJson);
           App.store.load(App.MapReduceService, finalJson);
         } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "HBASE") {
@@ -252,6 +269,7 @@ App.servicesMapper = App.QuickDataMapper.create({
           });
           // Map
           finalJson = this.parseIt(item, finalConfig);
+          finalJson.quick_links = [13, 14, 15, 16, 17, 18];
           result.push(finalJson);
           App.store.load(App.HBaseService, finalJson);
         } else {
@@ -260,6 +278,9 @@ App.servicesMapper = App.QuickDataMapper.create({
       }, this);
 
 
+
+
+      result = this.sortByOrder(this.get('servicesSortOrder'), result);
       App.store.loadMany(this.get('model'), result);
 
       result = [];

+ 0 - 4
ambari-web/app/messages.js

@@ -238,9 +238,6 @@ Em.I18n.translations = {
 
   'services.add.header':'Add Service Wizard',
 
-  'host.singular':'host',
-  'host.plural':'hosts',
-
   'hosts.host.start.popup.header':'Confirmation',
   'hosts.host.stop.popup.header':'Confirmation',
   'hosts.host.start.popup.body':'Are you sure?',
@@ -254,7 +251,6 @@ Em.I18n.translations = {
   'hosts.cant.do.popup.header':'Operation not allowed',
   'hosts.cant.do.popup.masterList.body':'You cannot delete this host because it is hosting following master services: {0}.',
   'hosts.cant.do.popup.workingList.body':'You cannot delete this host because following slave services are not fully stopped or decommissioned: {0}.',
-  'hosts.assignToRack.sure':'Sure you want to assign {0} to {1}?',
   'hosts.add.header':'Add Host Wizard',
   'hosts.add.step2.warning':'Hosts are already part of the cluster and will be ignored',
   'hosts.assignRack':'Assign Rack',

+ 1 - 0
ambari-web/app/models/component.js

@@ -37,6 +37,7 @@ App.Component = DS.Model.extend({
   isMaster: function () {
     switch (this.get('componentName')) {
       case 'NAMENODE':
+      case 'SECONDARY_NAMENODE':
       case 'SNAMENODE':
       case 'JOBTRACKER':
       case 'ZOOKEEPER_SERVER':

+ 1 - 1
ambari-web/app/models/host_component.js

@@ -27,7 +27,7 @@ App.HostComponent = DS.Model.extend({
   isRunning: function(){
     return (this.get('workStatus') == 'STARTED' || this.get('workStatus') == 'STARTING');
   }.property('workStatus'),
-  displayName: function () { console.log('model',this.get('isLoaded'));
+  displayName: function () {
     return App.format.role(this.get('componentName'));
   }.property('componentName')
 })

+ 3 - 7
ambari-web/app/models/service.js

@@ -30,16 +30,12 @@ App.Service = DS.Model.extend({
   components: DS.hasMany('App.Component'),
   hostComponents: DS.hasMany('App.HostComponent'),
   isRunning: function(){
-    var workStatus = this.get('workStatus');
-    if([App.Service.Health.live, App.Service.Health.starting].contains(workStatus) ){
-      return true;
-    }
-    return false;
-  }.property('workStatus'),
+    return (this.get('healthStatus') == 'green' | this.get('healthStatus') == 'green-blinking');
+  }.property('healthStatus'),
 
   healthStatus: function(){
     var components = this.get('components').filterProperty('isMaster', true);
-    if(components.everyProperty('workStatus', App.Component.Status.started)){
+    if (components.everyProperty('workStatus', App.Component.Status.started)){
       return 'green';
     } else if(components.someProperty('workStatus', App.Component.Status.stopped)){
       return 'red';

+ 3 - 0
ambari-web/app/models/service_config.js

@@ -103,6 +103,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'oozie_ambari_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
         break;
+      case 'zookeeperserver_hosts':
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'ZOOKEEPER_SERVER').hostName);
+        break;
     }
   },
 

+ 6 - 3
ambari-web/app/router.js

@@ -136,7 +136,7 @@ App.Router = Em.Router.extend({
     var router = this;
 
     $.ajax({
-      url : '/api/users/' + loginName,
+      url : App.apiPrefix + '/users/' + loginName,
       dataType : 'text',
       type: 'GET',
       beforeSend: function (xhr) {
@@ -177,13 +177,13 @@ App.Router = Em.Router.extend({
   setAmbariStacks: function () {
     var self = this;
     var method = 'GET';
-    var url = (App.testMode) ? '/data/wizard/stack/stacks.json' : '/api/stacks';
+    var url = (App.testMode) ? '/data/wizard/stack/stacks.json' : App.apiPrefix + '/stacks';
     $.ajax({
       type: method,
       url: url,
       async: false,
       dataType: 'text',
-      timeout: 5000,
+      timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: In success function for the setAmbariStacks call");
@@ -229,6 +229,9 @@ App.Router = Em.Router.extend({
   },
 
   getSection: function () {
+    if (App.alwaysGoToInstaller) {
+      return 'installer';
+    }
     var clusterController = App.router.get('clusterController');
     clusterController.loadClusterName(false);
     if (clusterController.get('clusterName')) {

+ 10 - 4
ambari-web/app/routes/add_service_routes.js

@@ -71,7 +71,6 @@ module.exports = Em.Route.extend({
       var wizardStep5Controller = router.get('wizardStep5Controller');
       addServiceController.saveMasterComponentHosts(wizardStep5Controller);
       App.db.setSlaveComponentHosts(undefined);
-      App.db.setHostSlaveComponents(undefined);
       router.transitionTo('step3');
     }
   }),
@@ -85,7 +84,14 @@ module.exports = Em.Route.extend({
       controller.loadAllPriorSteps();
       controller.connectOutlet('wizardStep6', controller.get('content'));
     },
-    back: Em.Router.transitionTo('step2'),
+    back: function(router){
+      var controller = router.get('addServiceController');
+      if(controller.get('content.masterComponentHosts').someProperty('isInstalled', false)){
+        router.transitionTo('step2');
+      } else {
+        router.transitionTo('step1');
+      }
+    },
     next: function (router) {
       var addServiceController = router.get('addServiceController');
       var wizardStep6Controller = router.get('wizardStep6Controller');
@@ -94,6 +100,7 @@ module.exports = Em.Route.extend({
         addServiceController.saveSlaveComponentHosts(wizardStep6Controller);
         addServiceController.get('content').set('serviceConfigProperties', null);
         App.db.setServiceConfigProperties(null);
+        addServiceController.loadAdvancedConfigs();
         router.transitionTo('step4');
       }
     }
@@ -176,8 +183,7 @@ module.exports = Em.Route.extend({
     back: Em.Router.transitionTo('step6'),
     complete: function (router, context) {
       if (true) {   // this function will be moved to installerController where it will validate
-        var addServiceController = router.get('addServiceController');
-        addServiceController.setCurrentStep('1', false);
+        router.get('addServiceController').finish();
         router.transitionTo('services');
       }
     }

+ 0 - 1
ambari-web/app/routes/installer.js

@@ -188,7 +188,6 @@ module.exports = Em.Route.extend({
       var wizardStep5Controller = router.get('wizardStep5Controller');
       controller.saveMasterComponentHosts(wizardStep5Controller);
       App.db.setSlaveComponentHosts(undefined);
-      App.db.setHostSlaveComponents(undefined);
       router.transitionTo('step6');
     }
   }),

+ 8 - 3
ambari-web/app/routes/main.js

@@ -36,8 +36,8 @@ module.exports = Em.Route.extend({
     redirectsTo:'dashboard'
   }),
 
-  test: Em.Route.extend({
-    route: '/test',
+  test:Em.Route.extend({
+    route:'/test',
     connectOutlets:function (router, context) {
       router.get('mainController').connectOutlet('mainTest');
     }
@@ -83,9 +83,12 @@ module.exports = Em.Route.extend({
   apps:Em.Route.extend({
     route:'/apps',
     connectOutlets:function (router) {
+
+      router.get('clusterController').loadRuns();
       router.get('mainController').connectOutlet('mainApps');
     }
   }),
+
   hosts:Em.Route.extend({
     route:'/hosts',
     connectOutlets:function (router, context) {
@@ -249,8 +252,10 @@ module.exports = Em.Route.extend({
       router.transitionTo('hostDetails.index', event.context)
     },
     filterHosts:function (router, component) {
-      router.get('mainHostController').filterByComponent(component.context);
       router.transitionTo('hosts');
+      Ember.run.next(function(){
+        router.get('mainHostController').filterByComponent(component.context);
+      })
     }
   }),
 

+ 2 - 1
ambari-web/app/styles/application.less

@@ -1128,7 +1128,8 @@ a:focus {
   }
 
   .form-horizontal .control-label {
-    width: 100px;
+    width: 120px;
+    padding-right: 10px;
   }
 
   .form-horizontal .control-group select {

+ 0 - 1
ambari-web/app/templates/main/apps/list_row.hbs

@@ -15,7 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-
 <td><a href="#" {{action "starClick" target="controller"}}><span class="icon-star"></span></a></td>
 <td class="appId">{{unbound run.id}}</td>
 <td>{{unbound run.appName}}</td>

+ 8 - 18
ambari-web/app/templates/main/background_operations_popup.hbs

@@ -18,27 +18,17 @@
 
 {{#each operation in allOperations}}
   {{#view App.MainBackgroundOperation contentBinding="operation"}}
-    <a class="open-details" {{action openDetails target="view"}} href="#">
-      <i {{bindAttr class="view.iconClass"}}></i>
-    </a>
-    {{operation.command}} {{operation.role}} on {{operation.host_name}}
-    <div class="operation-details">
-      {{#if operation.details.length}}
-        {{#each detail in operation.details}}
-        <div>{{detail.startTime}}: {{detail.name}}</div>
-        {{/each}}
-      {{/if}}
+    <div>
       <a {{action showOperationLog target="view"}} href="#">
-        {{#if view.isOpenShowLog}}Hide{{else}}Show{{/if}} operation log
+        {{#if view.isOpenShowLog}}Hide{{else}}Show{{/if}} info about {{operation.command}} {{operation.role}} on {{operation.host_name}}
       </a>
       {{#if view.isOpenShowLog}}
-      <div class="operation-log">
-        <dl class="dl-horizontal">
-          <dt>exitcode:</dt><dd>{{view.logDetails.exitcode}}</dd>
-          <dt>stdout:</dt><dd>{{view.logDetails.stdout}}</dd>
-          <dt>stderror:</dt><dd>{{view.logDetails.stderror}}</dd>
-        </dl>
-      </div>
+        <h5>exitcode:</h5>
+        <pre class="stderr">{{operation.exit_code}}</pre>
+        <h5>stderr:</h5>
+        <pre class="stderr">{{operation.stderr}}</pre>
+        <h5>stdout:</h5>
+        <pre class="stdout">{{operation.stdout}}</pre>
       {{/if}}
     </div>
   {{/view}}

+ 3 - 13
ambari-web/app/templates/main/host.hbs

@@ -28,11 +28,6 @@
   <table class="table table-bordered table-striped">
     <thead>
     <tr>
-      <th class="first">
-        <label class="checkbox">
-          {{view Ember.Checkbox checkedBinding="allChecked" class="checkbox"}}
-        </label>
-      </th>
       <th class="name">
         <div class="host-name-pos">
           <a class="filter-label" href="#" {{action sortByName target="controller" }}>Name
@@ -70,7 +65,7 @@
                 {{#each component in masterComponents}}
                 <li>
                   <label class="checkbox">
-                    {{view Ember.Checkbox checkedBinding="component.checkedForHostFilter" }} {{unbound component.componentName}}
+                    {{view Ember.Checkbox checkedBinding="component.checkedForHostFilter" }} {{unbound component.displayName}}
                   </label>
                 </li>
                 {{/each}}
@@ -85,7 +80,7 @@
                 {{#each component in slaveComponents}}
                 <li>
                   <label class="checkbox">
-                    {{view Ember.Checkbox checkedBinding="component.checkedForHostFilter" }} {{unbound component.componentName}}
+                    {{view Ember.Checkbox checkedBinding="component.checkedForHostFilter" }} {{unbound component.displayName}}
                   </label>
                 </li>
                 {{/each}}
@@ -109,18 +104,13 @@
     {{#each host in controller}}
     {{#view view.HostView contentBinding="host"}}
     <tr>
-      <td class="first">
-        <label class="checkbox">
-          {{view view.HostCheckboxView checkedBinding="host.isChecked" contentBinding="host"}}
-        </label>
-      </td>
       <td class="name">
         <span {{bindAttr class="host.healthClass"}}></span>
         <a href="#" {{action "showDetails" host}}>{{unbound host.hostName}}</a>
       </td>
       <td>{{host.cluster.clusterName}}</td>
       <td>{{host.cpu}}</td>
-      <td>{{host.memory}}</td>
+      <td>{{host.memoryFormatted}}</td>
       <td>
         <div class="progress progress-info">
           <div class="bar" {{bindAttr style="view.usageStyle"}} style="width: 20%"></div>

+ 2 - 2
ambari-web/app/templates/wizard/slave_component_hosts.hbs

@@ -24,10 +24,10 @@
 {{else}}
   <a href="#" {{action showEditSlaveComponentGroups view.serviceConfig.category target="controller"}}>
     {{#if view.hasOneHost}}
-      {{view.hosts.firstObject.hostname}}
+      {{view.hosts.firstObject.hostName}}
     {{/if}}
     {{#if view.hasMultipleHosts}}
-      {{view.hosts.firstObject.hostname}} and {{view.otherLength}}
+      {{view.hosts.firstObject.hostName}} and {{view.otherLength}}
     {{/if}}
   </a>
 {{/if}}

+ 2 - 2
ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-<div id="slave-hosts-popup" class="alert alert-info">Select which hosts should belong to which {{selectedComponentName}} group.</div>
+<div id="slave-hosts-popup" class="alert alert-info">Select which hosts should belong to which {{selectedComponentDisplayName}} group.</div>
 <table class="table table-striped">
   <thead>
     <tr>
@@ -28,7 +28,7 @@
   {{#each host in hosts}}
     <tr>
       <td>
-        <label>{{host.hostname}}</label>
+        <label>{{host.hostName}}</label>
       </td>
       <td>
         {{#view App.SlaveComponentDropDownGroupView contentBinding="host"}}

+ 2 - 2
ambari-web/app/templates/wizard/slave_hosts.hbs

@@ -21,10 +21,10 @@
 {{else}}
   <a href="#" {{action showEditSlaveComponentGroups view.serviceConfig.category target="controller"}}>
     {{#if view.hasOneHost}}
-      {{hosts.firstObject.hostname}}
+      {{hosts.firstObject.hostName}}
     {{/if}}
     {{#if view.hasMultipleHosts}}
-      {{hosts.firstObject.hostname}} and {{view.otherLength}}
+      {{hosts.firstObject.hostName}} and {{view.otherLength}}
     {{/if}}
   </a>
 {{/if}}

+ 5 - 5
ambari-web/app/templates/wizard/step6.hbs

@@ -71,21 +71,21 @@
             <i class=icon-asterisks>&#10037</i>
           {{/if}}
         {{/view}}
-      <td><label class="checkbox">{{view Ember.Checkbox checkedBinding="isDataNode"}}DataNode</label></td>
+      <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isDataNodeInstalled" checkedBinding="isDataNode"}}DataNode</label></td>
       {{#if controller.isMrSelected}}
-      <td><label class="checkbox">{{view Ember.Checkbox checkedBinding="isTaskTracker"}}TaskTracker</label></td>
+      <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isTaskTrackerInstalled" checkedBinding="isTaskTracker"}}TaskTracker</label></td>
       {{/if}}
       {{#if controller.isHbSelected}}
-      <td><label class="checkbox">{{view Ember.Checkbox checkedBinding="isRegionServer"}}RegionServer</label></td>
+      <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isRegionServerInstalled" checkedBinding="isRegionServer"}}RegionServer</label></td>
       {{/if}}
-      <td><label class="checkbox">{{view Ember.Checkbox checkedBinding="isClient"}}Client</label></td>
+      <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isClientInstalled" checkedBinding="isClient"}}Client</label></td>
     </tr>
     {{/each}}
     </tbody>
   </table>
   </div>
   <div class="btn-area">
-    <a class="btn" {{action back href="true"}}>&larr; Back</a>
+    <a class="btn" {{action back}}>&larr; Back</a>
     <a class="btn btn-success pull-right" {{action next}}>Next &rarr;</a>
   </div>
 </div>

+ 2 - 1
ambari-web/app/utils/data_table.js

@@ -272,6 +272,7 @@ jQuery.extend($.fn.dataTableExt.afnFiltering.push(
       }
 
       function dateFilter(condition, rowValue) {
+        refinedRowValue = $.trim(rowValue.replace(/<script[^>]*?>.*<\/script>/g, ''));
         var nowTime = new Date().getTime();
         var oneDayPast = nowTime - 86400000;
         var twoDaysPast = nowTime - 172800000;
@@ -281,7 +282,7 @@ jQuery.extend($.fn.dataTableExt.afnFiltering.push(
         rowValue = (jQuery(rowValue).text()) ? jQuery(rowValue).text() : rowValue;
         var lastChar = rowValue.charAt(rowValue.length - 1);
         rowValue = lastChar === '*' ? rowValue.substr(0, rowValue.length - 1) : rowValue;
-        rowValue = new Date(rowValue).getTime();
+        rowValue = new Date(refinedRowValue).getTime();
         match = false;
         switch (condition) {
           case 'Any':

+ 0 - 13
ambari-web/app/utils/db.js

@@ -159,7 +159,6 @@ App.db.removeHosts = function (hostInfo) {
 };
 
 App.db.setService = function (serviceInfo) {
-  console.log('TRACE: Entering db:setService function');
   App.db.data = localStorage.getObject('ambari');
   App.db.data.Installer.serviceInfo = serviceInfo;
   localStorage.setObject('ambari', App.db.data);
@@ -183,12 +182,6 @@ App.db.setMasterComponentHosts = function (masterComponentHosts) {
   localStorage.setObject('ambari', App.db.data);
 };
 
-App.db.setHostSlaveComponents = function (hostSlaveComponents) {
-  App.db.data = localStorage.getObject('ambari');
-  App.db.data.Installer.hostSlaveComponents = hostSlaveComponents;
-  localStorage.setObject('ambari', App.db.data);
-};
-
 App.db.setSlaveComponentHosts = function (slaveComponentHosts) {
   App.db.data = localStorage.getObject('ambari');
   App.db.data.Installer.slaveComponentHosts = slaveComponentHosts;
@@ -323,7 +316,6 @@ App.db.getBootStatus = function () {
 };
 
 App.db.getService = function () {
-  console.log('TRACE: Entering db:getService function');
   App.db.data = localStorage.getObject('ambari');
   return App.db.data.Installer.serviceInfo;
 };
@@ -343,11 +335,6 @@ App.db.getMasterComponentHosts = function () {
   return App.db.data.Installer.masterComponentHosts;
 };
 
-App.db.getHostSlaveComponents = function () {
-  App.db.data = localStorage.getObject('ambari');
-  return App.db.data.Installer.hostSlaveComponents;
-};
-
 App.db.getSlaveComponentHosts = function () {
   App.db.data = localStorage.getObject('ambari');
   return App.db.data.Installer.slaveComponentHosts;

+ 2 - 1
ambari-web/app/utils/graph.js

@@ -20,6 +20,7 @@
 module.exports = {
   drawJobTimeLine:function (json_str, w, h, element, legend_id, timeline_id) {
     var json = $.parseJSON(json_str);
+    console.log('json', json);
     if (!json) {
       return new Error("unable to load data");
     }
@@ -128,7 +129,7 @@ module.exports = {
           data:json[3],
           color:'red',
           name:'reduce'
-        },
+        }
       ]
     });
     graph.render();

+ 6 - 6
ambari-web/app/views/common/quick_view_link_view.js

@@ -28,12 +28,12 @@ App.QuickViewLinks = Em.View.extend({
     var components = this.get('content.components');
     var host;
 
-    if(serviceName === 'hdfs'){
-      host = components.filterProperty('componentName', 'NameNode').objectAt(0).get('host.hostName');
-    } else if(serviceName === 'mapreduce'){
-      host = components.filterProperty('componentName', 'JobTracker').objectAt(0).get('host.hostName');
-    } else if(serviceName === 'hbase'){
-      host = components.filterProperty('componentName', 'HBase Master').objectAt(0).get('host.hostName');
+    if(serviceName === 'HDFS'){
+      host = components.filterProperty('id', 'NAMENODE').objectAt(0).get('host.hostName');
+    } else if(serviceName === 'MAPREDUCE'){
+      host = components.filterProperty('id', 'JOBTRACKER').objectAt(0).get('host.hostName');
+    } else if(serviceName === 'HBASE'){
+      host = components.filterProperty('id', 'HBASE_MASTER').objectAt(0).get('host.hostName');
     }
     if(!host){
       return [];

+ 23 - 12
ambari-web/app/views/main/apps_view.js

@@ -373,16 +373,31 @@ App.MainAppsView = Em.View.extend({
     this.set('filtered', oTable.fnSettings().fnRecordsDisplay());
 
   },
-  didInsertElement: function () {
+
+  loaded: false,
+  inserted: false,
+
+  onLoad: function(){
+    if(this.get('loaded')){
+      return;
+    }
+    if(!App.router.get('clusterController.postLoadList.runs')){
+      return;
+    }
+    if(!this.get('inserted')){
+      return;
+    }
+
+    this.set('loaded', true);
     var self = this;
-    /**
-     * Running datatable with delay to take time to load all data
-     */
-    Ember.run.next(function () {
-      Ember.run.next(function () {
-        self.createDataTable();
-      })
+    Ember.run.next(function(){
+      self.createDataTable();
     });
+  }.observes('App.router.clusterController.postLoadList.runs'),
+
+  didInsertElement: function () {
+    this.set('inserted', true);
+    this.onLoad();
   },
   /**
    * reset all filters in dataTable
@@ -469,9 +484,6 @@ App.MainAppsView = Em.View.extend({
    * Filter-field for RunDate
    */
   rundateSelectView: Em.Select.extend({
-    change:function(e) {
-      console.log(this.get('selection'));
-    },
     content: ['Any', 'Running Now', 'Past 1 Day', 'Past 2 Days', 'Past 7 Days', 'Past 14 Days', 'Past 30 Days'],
     selected: 'Any',
     classNames:['input-medium'],
@@ -750,7 +762,6 @@ App.MainAppsView = Em.View.extend({
       this.get('parentView').expandToggle();
     }
 
-
   })
 
 });

+ 11 - 12
ambari-web/app/views/main/dashboard.js

@@ -19,21 +19,20 @@
 var App = require('app');
 
 App.MainDashboardView = Em.View.extend({
-  templateName: require('templates/main/dashboard'),
-  didInsertElement: function() {
-      this.services();
+  templateName:require('templates/main/dashboard'),
+  didInsertElement:function () {
+    this.services();
   },
-  content : [],
-  services:function(){
-    if( this.get('content').length > 0)
-    {
+  content:[],
+  services:function () {
+    if (this.get('content').length > 0) {
       return false;
     }
     var services = App.Service.find();
-    services.forEach(function(item){
+    services.forEach(function (item) {
       var vName;
       var item2;
-      switch(item.get('serviceName')) {
+      switch (item.get('serviceName')) {
         case "HDFS":
           vName = App.MainDashboardServiceHdfsView;
           item2 = App.HDFSService.find(item.get('id'));
@@ -47,7 +46,7 @@ App.MainDashboardView = Em.View.extend({
           item2 = App.HBaseService.find(item.get('id'));
           break;
         case "HIVE":
-          vName = App.MainDashboardServiceHiveView ;
+          vName = App.MainDashboardServiceHiveView;
           break;
         case "ZOOKEEPER":
           vName = App.MainDashboardServiceZookeperView;
@@ -59,8 +58,8 @@ App.MainDashboardView = Em.View.extend({
           vName = Em.View;
       }
       this.get('content').pushObject({
-        viewName : vName,
-        model: item2 || item
+        viewName:vName,
+        model:item2 || item
       })
     }, this);
 

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js

@@ -29,7 +29,7 @@ var App = require('app');
 App.ChartClusterMetricsCPU = App.ChartLinearTimeView.extend({
   id: "cluster-metrics-cpu",
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}?fields=metrics/cpu[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}?fields=metrics/cpu[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/cluster_metrics/cpu_1hr.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/load.js

@@ -31,7 +31,7 @@ App.ChartClusterMetricsLoad = App.ChartLinearTimeView.extend({
   id: "cluster-metrics-load",
   url: "/data/cluster_metrics/load_1hr.json",
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}?fields=metrics/load[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}?fields=metrics/load[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/cluster_metrics/load_1hr.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/memory.js

@@ -29,7 +29,7 @@ var App = require('app');
 App.ChartClusterMetricsMemory = App.ChartLinearTimeView.extend({
   id: "cluster-metrics-memory",
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}?fields=metrics/memory[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}?fields=metrics/memory[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/cluster_metrics/memory_1hr.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/network.js

@@ -30,7 +30,7 @@ var App = require('app');
 App.ChartClusterMetricsNetwork = App.ChartLinearTimeView.extend({
   id: "cluster-metrics-network",
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}?fields=metrics/network[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}?fields=metrics/network[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/cluster_metrics/network_1hr.json");
   }.property('App.router.clusterController.clusterName'),

+ 10 - 11
ambari-web/app/views/main/host.js

@@ -68,7 +68,6 @@ App.MainHostView = Em.View.extend({
   }.observes('slaveComponentsChecked'),
 
   didInsertElement:function () {
-    this._super();
     this.set('allComponentsChecked', true); // select all components (checkboxes) on start.
   },
 
@@ -113,16 +112,16 @@ App.MainHostView = Em.View.extend({
 
     usageStyle:function () {
       return "width:" + this.get('content.diskUsage') + "%";
-    }.property('content.diskUsage'),
-
-    HostCheckboxView:Em.Checkbox.extend({
-      content:null,
-      isChecked:false,
-      change:function (event) {
-        this.set('isChecked', !this.get('content.isChecked'));
-        App.router.get('mainHostController').onHostChecked(this.get('content'));
-      }
-    })
+    }.property('content.diskUsage')
+
+//    HostCheckboxView:Em.Checkbox.extend({
+//      content:null,
+//      isChecked:false,
+//      change:function (event) {
+//        this.set('isChecked', !this.get('content.isChecked'));
+//        App.router.get('mainHostController').onHostChecked(this.get('content'));
+//      }
+//    })
   }),
 
   RackCombobox:App.Combobox.extend({

+ 1 - 1
ambari-web/app/views/main/host/metrics/cpu.js

@@ -32,7 +32,7 @@ App.ChartHostMetricsCPU = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.PercentageFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/cpu/cpu_user[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_wio[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_nice[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_aidle[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_system[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_idle[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/cpu/cpu_user[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_wio[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_nice[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_aidle[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_system[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_idle[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/cpu.json");

+ 1 - 1
ambari-web/app/views/main/host/metrics/disk.js

@@ -32,7 +32,7 @@ App.ChartHostMetricsDisk = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/disk/disk_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/part_max_used[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/disk_free[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/disk/disk_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/part_max_used[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/disk_free[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/disk.json");

+ 1 - 1
ambari-web/app/views/main/host/metrics/load.js

@@ -31,7 +31,7 @@ App.ChartHostMetricsLoad = App.ChartLinearTimeView.extend({
   title: "Load",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/load/load_fifteen[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_one[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_five[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/load/load_fifteen[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_one[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_five[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/load.json");

+ 1 - 1
ambari-web/app/views/main/host/metrics/memory.js

@@ -32,7 +32,7 @@ App.ChartHostMetricsMemory = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/memory/swap_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_cached[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_buffers[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/memory/swap_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_cached[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_buffers[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/memory.json");

+ 1 - 1
ambari-web/app/views/main/host/metrics/network.js

@@ -32,7 +32,7 @@ App.ChartHostMetricsNetwork = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/network/bytes_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/bytes_out[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_out[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/network/bytes_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/bytes_out[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_out[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/network.json");

+ 1 - 1
ambari-web/app/views/main/host/metrics/processes.js

@@ -31,7 +31,7 @@ App.ChartHostMetricsProcesses = App.ChartLinearTimeView.extend({
   title: "Processes",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/process/proc_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/process/proc_run[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/process/proc_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/process/proc_run[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: this.get('content').get('hostName')
     }, "/data/hosts/metrics/processes.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_ClusterRequests = App.ChartLinearTimeView.extend({
   title: "Cluster Requests",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/cluster_requests[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/cluster_requests[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/cluster_requests.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js

@@ -32,7 +32,7 @@ App.ChartServiceMetricsHBASE_HlogSplitSize = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitSize_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitSize_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/hlog_split_size.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js

@@ -32,7 +32,7 @@ App.ChartServiceMetricsHBASE_HlogSplitTime = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/hlog_split_time.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServerQueueSize = App.ChartLinearTimeView.ext
   title: "RegionServer Queue Size",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/flushQueueSize[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/compactionQueueSize[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/flushQueueSize[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/compactionQueueSize[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/regionserver_queuesize.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServerRegions = App.ChartLinearTimeView.exten
   title: "RegionServer Regions",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/regions[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/regions[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/regionserver_regions.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServerReadWriteRequests = App.ChartLinearTime
   title: "RegionServer Requests",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/readRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/writeRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/readRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/writeRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hbase/regionserver_rw_requests.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js

@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_BlockStatus = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/block_status.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js

@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_FileOperations = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/namenode/FileInfoOps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/namenode/CreateFileOps[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/namenode/FileInfoOps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/namenode/CreateFileOps[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/file_operations.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/gc.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_GC = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/gc.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/io.js

@@ -32,7 +32,7 @@ App.ChartServiceMetricsHDFS_IO = App.ChartLinearTimeView.extend({
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/HDFS/components/DATANODE?fields=metrics/dfs/datanode/bytes_written[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/datanode/bytes_read[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HDFS/components/DATANODE?fields=metrics/dfs/datanode/bytes_written[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/datanode/bytes_read[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/hdfs/io.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_JVMHeap = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/jvm_heap.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js

@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_JVMThreads = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/jvm_threads.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_RPC = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/rpc.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_SpaceUtilization = App.ChartLinearTimeView.extend({
   url: function () {
     var hdfsService = App.HDFSService.find().objectAt(0);
     var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: nameNodeHostName
     }, "/data/services/metrics/hdfs/space_utilization.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_GC = App.ChartLinearTimeView.extend({
   url: function () {
     var mrService = App.MapReduceService.find().objectAt(0);
     var jtHostName = mrService.get('jobTracker').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: jtHostName
     }, "/data/services/metrics/mapreduce/gc.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_JobsRunningWaiting = App.ChartLinearTimeView.ex
   title: "Jobs (Running/Waiting)",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/mapreduce/jobs_running_waiting.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_JobsStatus = App.ChartLinearTimeView.extend({
   title: "Jobs Status",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/mapreduce/jobs_status.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_JVMHeap = App.ChartLinearTimeView.extend({
   url: function () {
     var mrService = App.MapReduceService.find().objectAt(0);
     var jtHostName = mrService.get('jobTracker').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: jtHostName
     }, "/data/services/metrics/mapreduce/jvm_heap.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js

@@ -33,7 +33,7 @@ App.ChartServiceMetricsMapReduce_JVMThreads = App.ChartLinearTimeView.extend({
   url: function () {
     var mrService = App.MapReduceService.find().objectAt(0);
     var jtHostName = mrService.get('jobTracker').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: jtHostName
     }, "/data/services/metrics/mapreduce/jvm_threads.json");

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_MapSlots = App.ChartLinearTimeView.extend({
   title: "Map Slot Utilization",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/mapreduce/map_slots.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_ReduceSlots = App.ChartLinearTimeView.extend({
   title: "Reduce Slots Utilization",
 
   url: function () {
-    return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName')
     }, "/data/services/metrics/mapreduce/reduce_slots.json");
   }.property('App.router.clusterController.clusterName'),

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js

@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_RPC = App.ChartLinearTimeView.extend({
   url: function () {
     var mrService = App.MapReduceService.find().objectAt(0);
     var jtHostName = mrService.get('jobTracker').get('hostName');
-    return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+    return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
       clusterName: App.router.get('clusterController.clusterName'),
       hostName: jtHostName
     }, "/data/services/metrics/mapreduce/rpc.json");

+ 12 - 11
ambari-web/app/views/main/service/menu.js

@@ -19,21 +19,22 @@
 var App = require('app');
 
 App.MainServiceMenuView = Em.CollectionView.extend({
-  content: function () {
+  content:function () {
     return App.router.get('mainServiceController.content');
   }.property('App.router.mainServiceController.content'),
 
-  didInsertElement: function () {
+
+  didInsertElement:function () {
     App.router.location.addObserver('lastSetURL', this, 'renderOnRoute');
     this.renderOnRoute();
   },
 
-  activeServiceId : null,
+  activeServiceId:null,
 
   /**
    *    Syncs navigation menu with requested URL
    */
-  renderOnRoute: function () {
+  renderOnRoute:function () {
     var last_url = App.router.location.lastSetURL || location.href.replace(/^[^#]*#/, '');
     if (last_url.substr(1, 4) !== 'main' || !this._childViews) {
       return;
@@ -45,15 +46,15 @@ App.MainServiceMenuView = Em.CollectionView.extend({
 
   },
 
-  tagName: 'ul',
-  classNames: ["nav", "nav-list", "nav-services"],
+  tagName:'ul',
+  classNames:["nav", "nav-list", "nav-services"],
 
-  itemViewClass: Em.View.extend({
-    classNameBindings: ["active"],
-    active: function(){
+  itemViewClass:Em.View.extend({
+    classNameBindings:["active"],
+    active:function () {
       return this.get('content.id') == this.get('parentView.activeServiceId') ? 'active' : '';
     }.property('parentView.activeServiceId'),
-    alertsCount: function () {
+    alertsCount:function () {
       var allAlerts = App.router.get('clusterController.alerts');
       var serviceId = this.get('content.serviceName');
       if (serviceId) {
@@ -62,6 +63,6 @@ App.MainServiceMenuView = Em.CollectionView.extend({
       return 0;
     }.property('App.router.clusterController.alerts'),
 
-    templateName: require('templates/main/service/menu_item')
+    templateName:require('templates/main/service/menu_item')
   })
 });

+ 2 - 2
ambari-web/app/views/wizard/controls_view.js

@@ -257,11 +257,11 @@ App.ServiceConfigMultipleHostsDisplay = Ember.Mixin.create(App.ServiceConfigHost
   }.property('value'),
 
   hasOneHost: function () {
-    return this.get('value').length === 1;
+    return this.get('value').length > 0;
   }.property('value'),
 
   hasMultipleHosts: function () {
-    return this.get('value').length > 1;
+    return (this.get('value').length > 1 && typeof(this.get('value')) == 'object');
   }.property('value'),
 
   otherLength: function () {

+ 6 - 3
ambari-web/app/views/wizard/step6_view.js

@@ -57,11 +57,14 @@ App.WizardStep6HostView = Em.View.extend({
   tagName: 'td',
 
   didInsertElement: function () {
-    var components = this.get('controller').getMasterComponentsForHost(this.get('host.hostname'));
-    if(components){
+    var components = this.get('controller').getMasterComponentsForHost(this.get('host.hostName'));
+    if (components && components.length > 0) {
+      components = components.map(function(_component) {
+        return App.format.role(_component);
+      });
       components = components.join(" /\n");
       this.$().popover({
-        title: 'master components hosted on ' + this.get('host.hostname'),
+        title: 'master components hosted on ' + this.get('host.hostName'),
         content: components,
         placement: 'right',
         trigger: 'hover'

+ 1 - 1
ambari-web/app/views/wizard/step9_view.js

@@ -180,7 +180,7 @@ App.HostStatusView = Em.View.extend({
             $.ajax({
               url: url,
               dataType: 'text',
-              timeout: 10000,
+              timeout: App.timeout,
               success: function (data) {
                 var task = $.parseJSON(data);
                 taskInfo.set('stdout', task.Tasks.stdout);

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff