Explorar el Código

AMBARI-8921 Remove support for MapReduce as part of 1.3 stack. (ababiichuk)

aBabiichuk hace 10 años
padre
commit
bd3a0bb72c
Se han modificado 100 ficheros con 83 adiciones y 6007 borrados
  1. 0 370
      ambari-web/app/assets/data/dashboard/mapreduce/mapreduce_start.json
  2. 0 370
      ambari-web/app/assets/data/dashboard/mapreduce/mapreduce_stop.json
  3. 0 46
      ambari-web/app/assets/data/dashboard/serviceComponents.json
  4. 0 477
      ambari-web/app/assets/data/dashboard/services_multi_hosts.json
  5. 0 18
      ambari-web/app/assets/data/jobs/hive-queries.json
  6. 0 3
      ambari-web/app/assets/data/jobs/hive-query-2.json
  7. 0 251
      ambari-web/app/assets/data/jobs/tezDag-name-to-id.json
  8. 0 21
      ambari-web/app/assets/data/jobs/tezDag.json
  9. 0 221
      ambari-web/app/assets/data/jobs/tezDagVertex.json
  10. 0 234
      ambari-web/app/assets/data/services/host_component_actual_configs.json
  11. 0 16
      ambari-web/app/assets/data/services/metrics/mapreduce/gc.json
  12. 0 19
      ambari-web/app/assets/data/services/metrics/mapreduce/jobs_status.json
  13. 0 19
      ambari-web/app/assets/data/services/metrics/mapreduce/jvm_heap.json
  14. 0 19
      ambari-web/app/assets/data/services/metrics/mapreduce/jvm_threads.json
  15. 0 16
      ambari-web/app/assets/data/services/metrics/mapreduce/map_slots.json
  16. 0 16
      ambari-web/app/assets/data/services/metrics/mapreduce/reduce_slots.json
  17. 0 16
      ambari-web/app/assets/data/services/metrics/mapreduce/rpc.json
  18. 0 18
      ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json
  19. 0 35
      ambari-web/app/assets/data/services/summary/mapreduce.json
  20. 0 289
      ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json
  21. 0 1188
      ambari-web/app/assets/data/wizard/stack/stacks.json
  22. 0 82
      ambari-web/app/assets/data/wizard/stack/versions.json
  23. 0 4
      ambari-web/app/assets/test/tests.js
  24. 0 5
      ambari-web/app/controllers.js
  25. 0 45
      ambari-web/app/controllers/global/cluster_controller.js
  26. 0 4
      ambari-web/app/controllers/global/update_controller.js
  27. 0 1
      ambari-web/app/controllers/main/admin/kerberos.js
  28. 0 2
      ambari-web/app/controllers/main/admin/security.js
  29. 0 15
      ambari-web/app/controllers/main/admin/security/add/step2.js
  30. 0 15
      ambari-web/app/controllers/main/charts/heatmap.js
  31. 0 46
      ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js
  32. 0 29
      ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js
  33. 0 29
      ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js
  34. 0 29
      ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js
  35. 0 29
      ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js
  36. 0 3
      ambari-web/app/controllers/main/host.js
  37. 0 73
      ambari-web/app/controllers/main/host/details.js
  38. 1 1
      ambari-web/app/controllers/main/service/add_controller.js
  39. 2 20
      ambari-web/app/controllers/main/service/info/configs.js
  40. 0 4
      ambari-web/app/controllers/main/service/info/summary.js
  41. 0 10
      ambari-web/app/controllers/main/service/reassign/step4_controller.js
  42. 0 7
      ambari-web/app/controllers/wizard/slave_component_groups_controller.js
  43. 1 3
      ambari-web/app/controllers/wizard/step8_controller.js
  44. 1 1
      ambari-web/app/controllers/wizard/step9_controller.js
  45. 0 11
      ambari-web/app/data/service_graph_config.js
  46. 0 5
      ambari-web/app/mappers/components_state_mapper.js
  47. 0 84
      ambari-web/app/mappers/service_metrics_mapper.js
  48. 12 100
      ambari-web/app/messages.js
  49. 0 1
      ambari-web/app/models.js
  50. 0 4
      ambari-web/app/models/alert.js
  51. 0 103
      ambari-web/app/models/quick_links.js
  52. 0 1
      ambari-web/app/models/service.js
  53. 0 55
      ambari-web/app/models/service/mapreduce.js
  54. 0 9
      ambari-web/app/models/stack_service.js
  55. 0 4
      ambari-web/app/templates/main/admin/security/notify_security_off_popup.hbs
  56. 0 67
      ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
  57. 0 56
      ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
  58. 0 81
      ambari-web/app/templates/main/service/services/mapreduce.hbs
  59. 0 40
      ambari-web/app/utils/ajax/ajax.js
  60. 0 1
      ambari-web/app/utils/batch_scheduled_requests.js
  61. 0 1
      ambari-web/app/utils/helper.js
  62. 0 16
      ambari-web/app/views.js
  63. 0 3
      ambari-web/app/views/common/chart/linear_time.js
  64. 1 28
      ambari-web/app/views/common/configs/service_configs_by_category_view.js
  65. 3 20
      ambari-web/app/views/common/quick_view_link_view.js
  66. 40 68
      ambari-web/app/views/main/dashboard/widgets.js
  67. 1 1
      ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js
  68. 1 1
      ambari-web/app/views/main/dashboard/widgets/hbase_links.js
  69. 1 1
      ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js
  70. 1 1
      ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js
  71. 1 1
      ambari-web/app/views/main/dashboard/widgets/hbase_regions_in_transition.js
  72. 1 1
      ambari-web/app/views/main/dashboard/widgets/hdfs_links.js
  73. 0 65
      ambari-web/app/views/main/dashboard/widgets/jobtracker_cpu.js
  74. 0 45
      ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js
  75. 0 163
      ambari-web/app/views/main/dashboard/widgets/jobtracker_rpc.js
  76. 0 36
      ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js
  77. 0 40
      ambari-web/app/views/main/dashboard/widgets/mapreduce_links.js
  78. 0 87
      ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js
  79. 1 1
      ambari-web/app/views/main/dashboard/widgets/metrics_cpu.js
  80. 1 1
      ambari-web/app/views/main/dashboard/widgets/metrics_load.js
  81. 1 1
      ambari-web/app/views/main/dashboard/widgets/metrics_memory.js
  82. 1 1
      ambari-web/app/views/main/dashboard/widgets/metrics_network.js
  83. 1 1
      ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js
  84. 1 1
      ambari-web/app/views/main/dashboard/widgets/node_managers_live.js
  85. 1 1
      ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js
  86. 1 1
      ambari-web/app/views/main/dashboard/widgets/resource_manager_uptime.js
  87. 1 1
      ambari-web/app/views/main/dashboard/widgets/supervisor_live.js
  88. 0 166
      ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js
  89. 1 1
      ambari-web/app/views/main/dashboard/widgets/yarn_links.js
  90. 1 1
      ambari-web/app/views/main/dashboard/widgets/yarn_memory.js
  91. 0 6
      ambari-web/app/views/main/host/hosts_table_menu_view.js
  92. 0 56
      ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
  93. 0 68
      ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
  94. 0 71
      ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
  95. 0 66
      ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
  96. 0 59
      ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
  97. 0 59
      ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
  98. 0 56
      ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
  99. 0 65
      ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
  100. 5 5
      ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js

+ 0 - 370
ambari-web/app/assets/data/dashboard/mapreduce/mapreduce_start.json

@@ -1,370 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/clusters/mycluster/services?ServiceInfo/service_name=MAPREDUCE&fields=components/host_components/*",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "mycluster",
-        "service_name" : "MAPREDUCE"
-      },
-      "components" : [
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "MAPREDUCE_CLIENT",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : "{}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "dev.hortonworks.com"
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "MAPREDUCE_CLIENT",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "JOBTRACKER",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/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" : "dev.hortonworks.com"
-              },
-              "metrics" : {
-                "boottime" : 1.353113263E9,
-                "process" : {
-                  "proc_total" : 542.4,
-                  "proc_run" : 1.04722222222
-                },
-                "rpc" : {
-                  "rpcAuthorizationSuccesses" : 0.0,
-                  "SentBytes" : 355.647619048,
-                  "rpcAuthorizationFailures" : 0.0,
-                  "ReceivedBytes" : 1040.35238095,
-                  "NumOpenConnections" : 0.0,
-                  "callQueueLen" : 0.0,
-                  "rpcAuthenticationSuccesses" : 0.0,
-                  "RpcQueueTime_num_ops" : 3.32380952381,
-                  "RpcProcessingTime_num_ops" : 3.32380952381,
-                  "RpcProcessingTime_avg_time" : 0.142915649166,
-                  "rpcAuthenticationFailures" : 0.0,
-                  "RpcQueueTime_avg_time" : 0.0767488298738
-                },
-                "ugi" : {
-                  "loginSuccess_num_ops" : 0.0,
-                  "loginFailure_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,
-                    "reduces_failed" : 0.0,
-                    "reserved_map_slots" : 0.0,
-                    "jobs_completed" : 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,
-                    "maps_failed" : 0.0,
-                    "jobs_killed" : 0.0
-                  },
-                  "jobtracker" : {
-                    "blacklisted_maps" : 0.0,
-                    "running_maps" : 0.0,
-                    "jobs_failed" : 0.0,
-                    "waiting_maps" : 0.0,
-                    "maps_completed" : 0.0,
-                    "trackers" : 1.0,
-                    "jobs_submitted" : 0.0,
-                    "map_slots" : 4.0,
-                    "reserved_reduce_slots" : 0.0,
-                    "trackers_graylisted" : 0.0,
-                    "heartbeats" : 3.32380952381,
-                    "jobs_running" : 0.0,
-                    "blacklisted_reduces" : 0.0,
-                    "maps_launched" : 0.0,
-                    "occupied_map_slots" : 0.0,
-                    "reduces_launched" : 0.0,
-                    "jobs_killed" : 0.0,
-                    "maps_failed" : 0.0,
-                    "maps_killed" : 0.0,
-                    "reduce_slots" : 2.0,
-                    "reduces_killed" : 0.0,
-                    "reduces_completed" : 0.0,
-                    "jobs_completed" : 0.0,
-                    "reserved_map_slots" : 0.0,
-                    "trackers_decommissioned" : 0.0,
-                    "reduces_failed" : 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_total" : 101.515,
-                  "disk_free" : 93.4107777778,
-                  "part_max_used" : 12.8
-                },
-                "cpu" : {
-                  "cpu_speed" : 1986.0,
-                  "cpu_wio" : 0.510555555556,
-                  "cpu_num" : 1.0,
-                  "cpu_idle" : 45.9291666667,
-                  "cpu_nice" : 0.0,
-                  "cpu_aidle" : 0.0,
-                  "cpu_system" : 6.88277777778,
-                  "cpu_user" : 46.6838888889
-                },
-                "rpcdetailed" : {
-                  "getJobProfile_num_ops" : 0.0,
-                  "getStagingAreaDir_num_ops" : 0.0,
-                  "getProtocolVersion_avg_time" : 0.0,
-                  "getBuildVersion_avg_time" : 0.0,
-                  "getBuildVersion_num_ops" : 0.0,
-                  "getNewJobId_avg_time" : 0.0,
-                  "getQueueAdmins_num_ops" : 0.0,
-                  "getSystemDir_num_ops" : 0.0,
-                  "getTaskCompletionEvents_num_ops" : 0.0,
-                  "getJobProfile_avg_time" : 0.0,
-                  "submitJob_num_ops" : 0.0,
-                  "getStagingAreaDir_avg_time" : 2.0,
-                  "getNewJobId_num_ops" : 0.0,
-                  "getJobCounters_num_ops" : 0.0,
-                  "getTaskCompletionEvents_avg_time" : 0.111111111111,
-                  "getProtocolVersion_num_ops" : 0.0,
-                  "submitJob_avg_time" : 312.0,
-                  "getSystemDir_avg_time" : 0.0,
-                  "getJobStatus_num_ops" : 0.0,
-                  "getJobCounters_avg_time" : 0.0,
-                  "getQueueAdmins_avg_time" : 0.0,
-                  "heartbeat_num_ops" : 3.32380952381,
-                  "heartbeat_avg_time" : 0.142915649166,
-                  "getJobStatus_avg_time" : 0.0
-                },
-                "load" : {
-                  "load_fifteen" : 0.8845,
-                  "load_one" : 0.516833333333,
-                  "load_five" : 0.740888888889
-                },
-                "jvm" : {
-                  "memHeapCommittedM" : 185.1875,
-                  "logFatal" : 0.0,
-                  "threadsBlocked" : 0.0,
-                  "threadsWaiting" : 19.0,
-                  "gcCount" : 0.00277777777778,
-                  "logWarn" : 0.0,
-                  "logError" : 0.0,
-                  "memNonHeapCommittedM" : 23.75,
-                  "gcTimeMillis" : 0.641666666667,
-                  "memNonHeapUsedM" : 23.1303326472,
-                  "logInfo" : 0.0,
-                  "threadsNew" : 0.0,
-                  "memHeapUsedM" : 101.890453742,
-                  "threadsTerminated" : 0.0,
-                  "threadsTimedWaiting" : 10.0,
-                  "threadsRunnable" : 6.0
-                },
-                "network" : {
-                  "pkts_out" : 0.455111111111,
-                  "bytes_in" : 50.645,
-                  "bytes_out" : 119.762888889,
-                  "pkts_in" : 0.411222222222
-                },
-                "memory" : {
-                  "mem_total" : 2054932.0,
-                  "swap_free" : 4074713.26667,
-                  "mem_buffers" : 13563.6333333,
-                  "mem_shared" : 0.0,
-                  "mem_cached" : 175195.088889,
-                  "mem_free" : 117578.155556,
-                  "swap_total" : 4128760.0
-                }
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "JOBTRACKER",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "TASKTRACKER",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/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" : "dev.hortonworks.com"
-              },
-              "metrics" : {
-                "boottime" : 1.353113263E9,
-                "process" : {
-                  "proc_total" : 542.625,
-                  "proc_run" : 1.81944444444
-                },
-                "rpc" : {
-                  "rpcAuthorizationSuccesses" : 7.15827882667E7,
-                  "SentBytes" : 7.15827882667E7,
-                  "rpcAuthorizationFailures" : 0.0,
-                  "ReceivedBytes" : 7.15827882667E7,
-                  "NumOpenConnections" : 0.0,
-                  "callQueueLen" : 0.0,
-                  "rpcAuthenticationSuccesses" : 0.0,
-                  "RpcQueueTime_num_ops" : 7.15827882667E7,
-                  "RpcProcessingTime_num_ops" : 7.15827882667E7,
-                  "RpcProcessingTime_avg_time" : 0.151111111111,
-                  "rpcAuthenticationFailures" : 0.0,
-                  "RpcQueueTime_avg_time" : 0.151111111111
-                },
-                "ugi" : {
-                  "loginSuccess_num_ops" : 0.0,
-                  "loginFailure_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_total" : 101.515,
-                  "disk_free" : 93.4107777778,
-                  "part_max_used" : 12.8
-                },
-                "cpu" : {
-                  "cpu_speed" : 1986.0,
-                  "cpu_wio" : 0.519444444444,
-                  "cpu_num" : 1.0,
-                  "cpu_idle" : 46.9705555556,
-                  "cpu_nice" : 0.0,
-                  "cpu_aidle" : 0.0,
-                  "cpu_system" : 6.75972222222,
-                  "cpu_user" : 45.7563888889
-                },
-                "rpcdetailed" : {
-                  "getProtocolVersion_avg_time" : 0.0,
-                  "getProtocolVersion_num_ops" : 4
-                },
-                "load" : {
-                  "load_fifteen" : 0.882305555556,
-                  "load_one" : 0.523944444444,
-                  "load_five" : 0.739694444444
-                },
-                "jvm" : {
-                  "memHeapCommittedM" : 30.375,
-                  "logFatal" : 0.0,
-                  "threadsBlocked" : 0.0,
-                  "threadsWaiting" : 14.5333333333,
-                  "gcCount" : 7.15827883321E7,
-                  "logWarn" : 0.0,
-                  "logError" : 0.0,
-                  "memNonHeapCommittedM" : 23.1875,
-                  "gcTimeMillis" : 7.15827883254E7,
-                  "memNonHeapUsedM" : 21.7573377917,
-                  "logInfo" : 0.0,
-                  "threadsNew" : 0.0,
-                  "memHeapUsedM" : 7.07001514861,
-                  "threadsTerminated" : 0.0,
-                  "threadsTimedWaiting" : 8.71666666667,
-                  "threadsRunnable" : 6.26666666667
-                },
-                "network" : {
-                  "pkts_out" : 0.453888888889,
-                  "bytes_in" : 50.5375,
-                  "bytes_out" : 119.456111111,
-                  "pkts_in" : 0.410277777778
-                },
-                "memory" : {
-                  "mem_total" : 2054932.0,
-                  "swap_free" : 4074707.96667,
-                  "mem_buffers" : 13563.6555556,
-                  "mem_shared" : 0.0,
-                  "mem_cached" : 175260.0,
-                  "mem_free" : 115051.811111,
-                  "swap_total" : 4128760.0
-                }
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "TASKTRACKER",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

+ 0 - 370
ambari-web/app/assets/data/dashboard/mapreduce/mapreduce_stop.json

@@ -1,370 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/clusters/mycluster/services?ServiceInfo/service_name=MAPREDUCE&fields=components/host_components/*",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "mycluster",
-        "service_name" : "MAPREDUCE"
-      },
-      "components" : [
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "MAPREDUCE_CLIENT",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : "{}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "dev.hortonworks.com"
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "MAPREDUCE_CLIENT",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "JOBTRACKER",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/host_components/JOBTRACKER",
-              "HostRoles" : {
-                "configs" : "{\"mapred-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "JOBTRACKER",
-                "host_name" : "dev.hortonworks.com"
-              },
-              "metrics" : {
-                "boottime" : 1.353113263E9,
-                "process" : {
-                  "proc_total" : 542.4,
-                  "proc_run" : 1.04722222222
-                },
-                "rpc" : {
-                  "rpcAuthorizationSuccesses" : 0.0,
-                  "SentBytes" : 355.647619048,
-                  "rpcAuthorizationFailures" : 0.0,
-                  "ReceivedBytes" : 1040.35238095,
-                  "NumOpenConnections" : 0.0,
-                  "callQueueLen" : 0.0,
-                  "rpcAuthenticationSuccesses" : 0.0,
-                  "RpcQueueTime_num_ops" : 3.32380952381,
-                  "RpcProcessingTime_num_ops" : 3.32380952381,
-                  "RpcProcessingTime_avg_time" : 0.142915649166,
-                  "rpcAuthenticationFailures" : 0.0,
-                  "RpcQueueTime_avg_time" : 0.0767488298738
-                },
-                "ugi" : {
-                  "loginSuccess_num_ops" : 0.0,
-                  "loginFailure_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,
-                    "reduces_failed" : 0.0,
-                    "reserved_map_slots" : 0.0,
-                    "jobs_completed" : 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,
-                    "maps_failed" : 0.0,
-                    "jobs_killed" : 0.0
-                  },
-                  "jobtracker" : {
-                    "blacklisted_maps" : 0.0,
-                    "running_maps" : 0.0,
-                    "jobs_failed" : 0.0,
-                    "waiting_maps" : 0.0,
-                    "maps_completed" : 0.0,
-                    "trackers" : 1.0,
-                    "jobs_submitted" : 0.0,
-                    "map_slots" : 4.0,
-                    "reserved_reduce_slots" : 0.0,
-                    "trackers_graylisted" : 0.0,
-                    "heartbeats" : 3.32380952381,
-                    "jobs_running" : 0.0,
-                    "blacklisted_reduces" : 0.0,
-                    "maps_launched" : 0.0,
-                    "occupied_map_slots" : 0.0,
-                    "reduces_launched" : 0.0,
-                    "jobs_killed" : 0.0,
-                    "maps_failed" : 0.0,
-                    "maps_killed" : 0.0,
-                    "reduce_slots" : 2.0,
-                    "reduces_killed" : 0.0,
-                    "reduces_completed" : 0.0,
-                    "jobs_completed" : 0.0,
-                    "reserved_map_slots" : 0.0,
-                    "trackers_decommissioned" : 0.0,
-                    "reduces_failed" : 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_total" : 101.515,
-                  "disk_free" : 93.4107777778,
-                  "part_max_used" : 12.8
-                },
-                "cpu" : {
-                  "cpu_speed" : 1986.0,
-                  "cpu_wio" : 0.510555555556,
-                  "cpu_num" : 1.0,
-                  "cpu_idle" : 45.9291666667,
-                  "cpu_nice" : 0.0,
-                  "cpu_aidle" : 0.0,
-                  "cpu_system" : 6.88277777778,
-                  "cpu_user" : 46.6838888889
-                },
-                "rpcdetailed" : {
-                  "getJobProfile_num_ops" : 0.0,
-                  "getStagingAreaDir_num_ops" : 0.0,
-                  "getProtocolVersion_avg_time" : 0.0,
-                  "getBuildVersion_avg_time" : 0.0,
-                  "getBuildVersion_num_ops" : 0.0,
-                  "getNewJobId_avg_time" : 0.0,
-                  "getQueueAdmins_num_ops" : 0.0,
-                  "getSystemDir_num_ops" : 0.0,
-                  "getTaskCompletionEvents_num_ops" : 0.0,
-                  "getJobProfile_avg_time" : 0.0,
-                  "submitJob_num_ops" : 0.0,
-                  "getStagingAreaDir_avg_time" : 2.0,
-                  "getNewJobId_num_ops" : 0.0,
-                  "getJobCounters_num_ops" : 0.0,
-                  "getTaskCompletionEvents_avg_time" : 0.111111111111,
-                  "getProtocolVersion_num_ops" : 0.0,
-                  "submitJob_avg_time" : 312.0,
-                  "getSystemDir_avg_time" : 0.0,
-                  "getJobStatus_num_ops" : 0.0,
-                  "getJobCounters_avg_time" : 0.0,
-                  "getQueueAdmins_avg_time" : 0.0,
-                  "heartbeat_num_ops" : 3.32380952381,
-                  "heartbeat_avg_time" : 0.142915649166,
-                  "getJobStatus_avg_time" : 0.0
-                },
-                "load" : {
-                  "load_fifteen" : 0.8845,
-                  "load_one" : 0.516833333333,
-                  "load_five" : 0.740888888889
-                },
-                "jvm" : {
-                  "memHeapCommittedM" : 185.1875,
-                  "logFatal" : 0.0,
-                  "threadsBlocked" : 0.0,
-                  "threadsWaiting" : 19.0,
-                  "gcCount" : 0.00277777777778,
-                  "logWarn" : 0.0,
-                  "logError" : 0.0,
-                  "memNonHeapCommittedM" : 23.75,
-                  "gcTimeMillis" : 0.641666666667,
-                  "memNonHeapUsedM" : 23.1303326472,
-                  "logInfo" : 0.0,
-                  "threadsNew" : 0.0,
-                  "memHeapUsedM" : 101.890453742,
-                  "threadsTerminated" : 0.0,
-                  "threadsTimedWaiting" : 10.0,
-                  "threadsRunnable" : 6.0
-                },
-                "network" : {
-                  "pkts_out" : 0.455111111111,
-                  "bytes_in" : 50.645,
-                  "bytes_out" : 119.762888889,
-                  "pkts_in" : 0.411222222222
-                },
-                "memory" : {
-                  "mem_total" : 2054932.0,
-                  "swap_free" : 4074713.26667,
-                  "mem_buffers" : 13563.6333333,
-                  "mem_shared" : 0.0,
-                  "mem_cached" : 175195.088889,
-                  "mem_free" : 117578.155556,
-                  "swap_total" : 4128760.0
-                }
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/JOBTRACKER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "JOBTRACKER",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "TASKTRACKER",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://localhost:8080/api/clusters/mycluster/hosts/dev.hortonworks.com/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : "{\"mapred-site\":\"version1\",\"global\":\"version1\",\"core-site\":\"version1\"}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "dev.hortonworks.com"
-              },
-              "metrics" : {
-                "boottime" : 1.353113263E9,
-                "process" : {
-                  "proc_total" : 542.625,
-                  "proc_run" : 1.81944444444
-                },
-                "rpc" : {
-                  "rpcAuthorizationSuccesses" : 7.15827882667E7,
-                  "SentBytes" : 7.15827882667E7,
-                  "rpcAuthorizationFailures" : 0.0,
-                  "ReceivedBytes" : 7.15827882667E7,
-                  "NumOpenConnections" : 0.0,
-                  "callQueueLen" : 0.0,
-                  "rpcAuthenticationSuccesses" : 0.0,
-                  "RpcQueueTime_num_ops" : 7.15827882667E7,
-                  "RpcProcessingTime_num_ops" : 7.15827882667E7,
-                  "RpcProcessingTime_avg_time" : 0.151111111111,
-                  "rpcAuthenticationFailures" : 0.0,
-                  "RpcQueueTime_avg_time" : 0.151111111111
-                },
-                "ugi" : {
-                  "loginSuccess_num_ops" : 0.0,
-                  "loginFailure_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_total" : 101.515,
-                  "disk_free" : 93.4107777778,
-                  "part_max_used" : 12.8
-                },
-                "cpu" : {
-                  "cpu_speed" : 1986.0,
-                  "cpu_wio" : 0.519444444444,
-                  "cpu_num" : 1.0,
-                  "cpu_idle" : 46.9705555556,
-                  "cpu_nice" : 0.0,
-                  "cpu_aidle" : 0.0,
-                  "cpu_system" : 6.75972222222,
-                  "cpu_user" : 45.7563888889
-                },
-                "rpcdetailed" : {
-                  "getProtocolVersion_avg_time" : 0.0,
-                  "getProtocolVersion_num_ops" : 4
-                },
-                "load" : {
-                  "load_fifteen" : 0.882305555556,
-                  "load_one" : 0.523944444444,
-                  "load_five" : 0.739694444444
-                },
-                "jvm" : {
-                  "memHeapCommittedM" : 30.375,
-                  "logFatal" : 0.0,
-                  "threadsBlocked" : 0.0,
-                  "threadsWaiting" : 14.5333333333,
-                  "gcCount" : 7.15827883321E7,
-                  "logWarn" : 0.0,
-                  "logError" : 0.0,
-                  "memNonHeapCommittedM" : 23.1875,
-                  "gcTimeMillis" : 7.15827883254E7,
-                  "memNonHeapUsedM" : 21.7573377917,
-                  "logInfo" : 0.0,
-                  "threadsNew" : 0.0,
-                  "memHeapUsedM" : 7.07001514861,
-                  "threadsTerminated" : 0.0,
-                  "threadsTimedWaiting" : 8.71666666667,
-                  "threadsRunnable" : 6.26666666667
-                },
-                "network" : {
-                  "pkts_out" : 0.453888888889,
-                  "bytes_in" : 50.5375,
-                  "bytes_out" : 119.456111111,
-                  "pkts_in" : 0.410277777778
-                },
-                "memory" : {
-                  "mem_total" : 2054932.0,
-                  "swap_free" : 4074707.96667,
-                  "mem_buffers" : 13563.6555556,
-                  "mem_shared" : 0.0,
-                  "mem_cached" : 175260.0,
-                  "mem_free" : 115051.811111,
-                  "swap_total" : 4128760.0
-                }
-              },
-              "component" : [
-                {
-                  "href" : "http://localhost:8080/api/clusters/mycluster/services/MAPREDUCE/components/TASKTRACKER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "TASKTRACKER",
-                    "service_name" : "MAPREDUCE"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

+ 0 - 46
ambari-web/app/assets/data/dashboard/serviceComponents.json

@@ -109,52 +109,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ambari/api/clusters/vmc/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "vmc",
-        "service_name" : "MAPREDUCE"
-      },
-      "components" : [
-        {
-          "href" : "http://ambari/api/clusters/vmc/services/MAPREDUCE/components/TASKTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "vmc",
-            "desired_configs" : "{}",
-            "state" : "STARTED",
-            "component_name" : "TASKTRACKER",
-            "service_name" : "MAPREDUCE"
-          }
-        },
-        {
-          "href" : "http://ambari/api/clusters/vmc/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "vmc",
-            "desired_configs" : "{}",
-            "state" : "INSTALLED",
-            "component_name" : "MAPREDUCE_CLIENT",
-            "service_name" : "MAPREDUCE"
-          }
-        },
-        {
-          "href" : "http://ambari/api/clusters/vmc/services/MAPREDUCE/components/JOBTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "vmc",
-            "desired_configs" : "{}",
-            "state" : "STARTED",
-            "component_name" : "JOBTRACKER",
-            "HeapMemoryUsed" : 144639872,
-            "BlackListedNodes" : "[]",
-            "StartTime" : 1352768002344,
-            "service_name" : "MAPREDUCE",
-            "AliveNodes" : "[{\"hostname\":\"hostname\",\"last_seen\":1352854673780,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0}]",
-            "HeapMemoryMax" : 1052770304,
-            "Version" : "1.1.0.1, r",
-            "GrayListedNodes" : "[]"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://ambari/clusters/vmc/services/HBASE",
       "ServiceInfo" : {

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

@@ -1,483 +1,6 @@
 {
   "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" : {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 18
ambari-web/app/assets/data/jobs/hive-queries.json


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 3
ambari-web/app/assets/data/jobs/hive-query-2.json


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 251
ambari-web/app/assets/data/jobs/tezDag-name-to-id.json


+ 0 - 21
ambari-web/app/assets/data/jobs/tezDag.json

@@ -1,21 +0,0 @@
-{
-  "starttime": 1394569228227,
-  "entity": "dag_1394502141829_0425_1",
-  "entitytype": "TEZ_DAG_ID",
-  "relatedentities": {
-    "TEZ_VERTEX_ID": [
-      "vertex_1394502141829_0425_1_00",
-      "vertex_1394502141829_0425_1_01",
-      "vertex_1394502141829_0425_1_02",
-      "vertex_1394502141829_0425_1_03",
-      "vertex_1394502141829_0425_1_04",
-      "vertex_1394502141829_0425_1_05",
-      "vertex_1394502141829_0425_1_06",
-      "vertex_1394502141829_0425_1_07",
-      "vertex_1394502141829_0425_1_08"
-    ]
-  },
-  "otherinfo": {
-    "applicationId": "application_1395263571423_0014"
-  }
-}

+ 0 - 221
ambari-web/app/assets/data/jobs/tezDagVertex.json

@@ -1,221 +0,0 @@
-{
-  "starttime": 1394569231815,
-  "otherinfo": {
-    "startTime": 1394569231819,
-    "status": "KILLED",
-    "numTasks": 6,
-    "initTime": 1394569231815,
-    "vertexName": "Map 2",
-    "timeTaken": 71735,
-    "processorClassName": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
-    "endTime": 1394569303554,
-    "initRequestedTime": 1394569230142,
-    "counters": {
-      "counterGroups": [
-        {
-          "counterGroupName": "org.apache.tez.common.counters.DAGCounter",
-          "counterGroupDisplayName": "org.apache.tez.common.counters.DAGCounter",
-          "counters": [
-            {
-              "counterName": "DATA_LOCAL_TASKS",
-              "counterDisplayName": "DATA_LOCAL_TASKS",
-              "counterValue": 4
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.tez.common.counters.FileSystemCounter",
-          "counterGroupDisplayName": "File System Counters",
-          "counters": [
-            {
-              "counterName": "FILE_BYTES_READ",
-              "counterDisplayName": "FILE: BYTES_READ",
-              "counterValue": 0
-            },
-            {
-              "counterName": "FILE_BYTES_WRITTEN",
-              "counterDisplayName": "FILE: BYTES_WRITTEN",
-              "counterValue": 337559
-            },
-            {
-              "counterName": "FILE_READ_OPS",
-              "counterDisplayName": "FILE: READ_OPS",
-              "counterValue": 0
-            },
-            {
-              "counterName": "FILE_LARGE_READ_OPS",
-              "counterDisplayName": "FILE: LARGE_READ_OPS",
-              "counterValue": 0
-            },
-            {
-              "counterName": "FILE_WRITE_OPS",
-              "counterDisplayName": "FILE: WRITE_OPS",
-              "counterValue": 0
-            },
-            {
-              "counterName": "HDFS_BYTES_READ",
-              "counterDisplayName": "HDFS: BYTES_READ",
-              "counterValue": 12854749
-            },
-            {
-              "counterName": "HDFS_BYTES_WRITTEN",
-              "counterDisplayName": "HDFS: BYTES_WRITTEN",
-              "counterValue": 0
-            },
-            {
-              "counterName": "HDFS_READ_OPS",
-              "counterDisplayName": "HDFS: READ_OPS",
-              "counterValue": 12
-            },
-            {
-              "counterName": "HDFS_LARGE_READ_OPS",
-              "counterDisplayName": "HDFS: LARGE_READ_OPS",
-              "counterValue": 0
-            },
-            {
-              "counterName": "HDFS_WRITE_OPS",
-              "counterDisplayName": "HDFS: WRITE_OPS",
-              "counterValue": 0
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.tez.common.counters.TaskCounter",
-          "counterGroupDisplayName": "org.apache.tez.common.counters.TaskCounter",
-          "counters": [
-            {
-              "counterName": "SPILLED_RECORDS",
-              "counterDisplayName": "SPILLED_RECORDS",
-              "counterValue": 7194
-            },
-            {
-              "counterName": "NUM_SHUFFLED_INPUTS",
-              "counterDisplayName": "NUM_SHUFFLED_INPUTS",
-              "counterValue": 16
-            },
-            {
-              "counterName": "NUM_FAILED_SHUFFLE_INPUTS",
-              "counterDisplayName": "NUM_FAILED_SHUFFLE_INPUTS",
-              "counterValue": 0
-            },
-            {
-              "counterName": "GC_TIME_MILLIS",
-              "counterDisplayName": "GC_TIME_MILLIS",
-              "counterValue": 2047
-            },
-            {
-              "counterName": "CPU_MILLISECONDS",
-              "counterDisplayName": "CPU_MILLISECONDS",
-              "counterValue": -11970
-            },
-            {
-              "counterName": "PHYSICAL_MEMORY_BYTES",
-              "counterDisplayName": "PHYSICAL_MEMORY_BYTES",
-              "counterValue": 1791279104
-            },
-            {
-              "counterName": "VIRTUAL_MEMORY_BYTES",
-              "counterDisplayName": "VIRTUAL_MEMORY_BYTES",
-              "counterValue": 7152783360
-            },
-            {
-              "counterName": "COMMITTED_HEAP_BYTES",
-              "counterDisplayName": "COMMITTED_HEAP_BYTES",
-              "counterValue": 1588592640
-            },
-            {
-              "counterName": "INPUT_RECORDS_PROCESSED",
-              "counterDisplayName": "INPUT_RECORDS_PROCESSED",
-              "counterValue": 1990495
-            },
-            {
-              "counterName": "OUTPUT_RECORDS",
-              "counterDisplayName": "OUTPUT_RECORDS",
-              "counterValue": 7194
-            },
-            {
-              "counterName": "OUTPUT_BYTES",
-              "counterDisplayName": "OUTPUT_BYTES",
-              "counterValue": 323019
-            },
-            {
-              "counterName": "OUTPUT_BYTES_WITH_OVERHEAD",
-              "counterDisplayName": "OUTPUT_BYTES_WITH_OVERHEAD",
-              "counterValue": 337415
-            },
-            {
-              "counterName": "OUTPUT_BYTES_PHYSICAL",
-              "counterDisplayName": "OUTPUT_BYTES_PHYSICAL",
-              "counterValue": 337431
-            },
-            {
-              "counterName": "ADDITIONAL_SPILLS_BYTES_WRITTEN",
-              "counterDisplayName": "ADDITIONAL_SPILLS_BYTES_WRITTEN",
-              "counterValue": 0
-            },
-            {
-              "counterName": "ADDITIONAL_SPILLS_BYTES_READ",
-              "counterDisplayName": "ADDITIONAL_SPILLS_BYTES_READ",
-              "counterValue": 0
-            },
-            {
-              "counterName": "ADDITIONAL_SPILL_COUNT",
-              "counterDisplayName": "ADDITIONAL_SPILL_COUNT",
-              "counterValue": 0
-            },
-            {
-              "counterName": "SHUFFLE_BYTES",
-              "counterDisplayName": "SHUFFLE_BYTES",
-              "counterValue": 6124044
-            },
-            {
-              "counterName": "SHUFFLE_BYTES_DECOMPRESSED",
-              "counterDisplayName": "SHUFFLE_BYTES_DECOMPRESSED",
-              "counterValue": 6123980
-            },
-            {
-              "counterName": "SHUFFLE_BYTES_TO_MEM",
-              "counterDisplayName": "SHUFFLE_BYTES_TO_MEM",
-              "counterValue": 6124044
-            },
-            {
-              "counterName": "SHUFFLE_BYTES_TO_DISK",
-              "counterDisplayName": "SHUFFLE_BYTES_TO_DISK",
-              "counterValue": 0
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.hadoop.hive.ql.exec.FilterOperator$Counter",
-          "counterGroupDisplayName": "org.apache.hadoop.hive.ql.exec.FilterOperator$Counter",
-          "counters": [
-            {
-              "counterName": "FILTERED",
-              "counterDisplayName": "FILTERED",
-              "counterValue": 0
-            },
-            {
-              "counterName": "PASSED",
-              "counterDisplayName": "PASSED",
-              "counterValue": 95911
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.hadoop.hive.ql.exec.MapOperator$Counter",
-          "counterGroupDisplayName": "org.apache.hadoop.hive.ql.exec.MapOperator$Counter",
-          "counters": [
-            {
-              "counterName": "DESERIALIZE_ERRORS",
-              "counterDisplayName": "DESERIALIZE_ERRORS",
-              "counterValue": 0
-            }
-          ]
-        }
-      ]
-    },
-    "startRequestedTime": 1394569231792
-  },
-  "entity": "vertex_1394502141829_0425_1_04",
-  "entitytype": "TEZ_VERTEX_ID"
-}

+ 0 - 234
ambari-web/app/assets/data/services/host_component_actual_configs.json

@@ -647,240 +647,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "MAPREDUCE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "INSTALLED",
-            "component_name" : "MAPREDUCE_CLIENT",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-16-48-4B.compute-1.internal/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "domU-12-31-39-16-48-4B.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-38-164.ec2.internal/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "ip-10-110-38-164.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-191-202-42.ec2.internal/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "ip-10-191-202-42.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-79-42.ec2.internal/host_components/MAPREDUCE_CLIENT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "MAPREDUCE_CLIENT",
-                "host_name" : "ip-10-110-79-42.ec2.internal"
-              }
-            }
-          ]
-        },
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/MAPREDUCE/components/TASKTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "TASKTRACKER",
-            "service_name" : "MAPREDUCE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-79-42.ec2.internal/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "ip-10-110-79-42.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-191-202-42.ec2.internal/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "ip-10-191-202-42.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-16-48-4B.compute-1.internal/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "domU-12-31-39-16-48-4B.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-38-164.ec2.internal/host_components/TASKTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "TASKTRACKER",
-                "host_name" : "ip-10-110-38-164.ec2.internal"
-              }
-            }
-          ]
-        },
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/MAPREDUCE/components/JOBTRACKER",
-          "ServiceComponentInfo" : {
-            "component_name" : "JOBTRACKER",
-            "state" : "STARTED",
-            "HeapMemoryUsed" : 129384032,
-            "service_name" : "MAPREDUCE",
-            "HeapMemoryMax" : 1052770304,
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "jobs_running" : 0,
-            "BlackListedNodes" : "[]",
-            "StartTime" : 1358245381436,
-            "AliveNodes" : "[{\"hostname\":\"domU-12-31-39-16-48-4B.compute-1.internal\",\"last_seen\":1358264806195,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0},{\"hostname\":\"ip-10-110-38-164.ec2.internal\",\"last_seen\":1358264806343,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0},{\"hostname\":\"domU-12-31-39-0E-E6-01.compute-1.internal\",\"last_seen\":1358264806332,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0},{\"hostname\":\"ip-10-191-202-42.ec2.internal\",\"last_seen\":1358264806381,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0},{\"hostname\":\"ip-10-110-79-42.ec2.internal\",\"last_seen\":1358264806352,\"health\":\"OK\",\"slots\":{\"map_slots\":4,\"map_slots_used\":0,\"reduce_slots\":2,\"reduce_slots_used\":0},\"failures\":0,\"dir_failures\":0}]",
-            "Version" : "1.1.2.21, r",
-            "GrayListedNodes" : "[]",
-            "Queue" : {
-              "reserved_reduce_slots" : 0,
-              "running_300" : 0,
-              "jobs_completed" : 4,
-              "reserved_map_slots" : 0,
-              "running_0" : 0,
-              "waiting_maps" : 0,
-              "running_1440" : 0,
-              "running_60" : 0,
-              "jobs_submitted" : 4,
-              "waiting_reduces" : 0
-            },
-            "jobtracker" : {
-              "reserved_reduce_slots" : 0,
-              "running_maps" : 0,
-              "jobs_running" : 0,
-              "running_reduces" : 0,
-              "occupied_map_slots" : 0,
-              "reserved_map_slots" : 0,
-              "jobs_completed" : 4,
-              "waiting_maps" : 0,
-              "jobs_submitted" : 4,
-              "occupied_reduce_slots" : 0,
-              "waiting_reduces" : 0
-            }
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/JOBTRACKER",
-              "HostRoles" : {
-                "configs" : {
-                  "mapred-site" : "version1",
-                  "global" : "version1",
-                  "core-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "JOBTRACKER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HIVE",
       "ServiceInfo" : {

+ 0 - 16
ambari-web/app/assets/data/services/metrics/mapreduce/gc.json

@@ -1,16 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[1351213550,1351217148,60]",
-  "HostRoles" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "host_name" : "hostname"
-  },
-  "host" : {
-    "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
-  },
-  "metrics" : {
-    "jvm" : {
-      "gcTimeMillis" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.011111111111,1351215720],[0.0,1351216080],[0.0,1351216440],[1.1930462189E7,1351216800],[0.069444444444,1351217160]]"
-    }
-  }
-}

+ 0 - 19
ambari-web/app/assets/data/services/metrics/mapreduce/jobs_status.json

@@ -1,19 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[1351213550,1351217148,60],metrics/mapred/jobtracker/jobs_preparing[1351213550,1351217148,60],metrics/mapred/jobtracker/jobs_failed[1351213550,1351217148,60],metrics/mapred/jobtracker/jobs_submitted[1351213550,1351217148,60],metrics/mapred/jobtracker/jobs_failed[1351213550,1351217148,60],metrics/mapred/jobtracker/jobs_running[1351213550,1351217148,60]",
-  "metrics" : {
-    "mapred" : {
-      "jobtracker" : {
-        "jobs_running" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.077777777778,1351217160]]",
-        "jobs_failed" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
-        "jobs_completed" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[1.19304647E7,1351216800],[0.0083333333333,1351217160]]",
-        "jobs_preparing" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.086111111111,1351217160]]",
-        "jobs_submitted" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[1.19304647E7,1351216800],[0.0083333333333,1351217160]]"
-      }
-    }
-  },
-  "ServiceComponentInfo" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "service_name" : "MAPREDUCE"
-  }
-}

+ 0 - 19
ambari-web/app/assets/data/services/metrics/mapreduce/jvm_heap.json

@@ -1,19 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/JOBTRACKER?fields=metrics/jvm/memNonHeapUsedM[1351213550,1351217148,60],metrics/jvm/memNonHeapCommittedM[1351213550,1351217148,60],metrics/jvm/memHeapUsedM[1351213550,1351217148,60],metrics/jvm/memHeapCommittedM[1351213550,1351217148,60]",
-  "HostRoles" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "host_name" : "hostname"
-  },
-  "host" : {
-    "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
-  },
-  "metrics" : {
-    "jvm" : {
-      "memHeapCommittedM" : "[[185.1875,1351213560],[185.1875,1351213920],[185.1875,1351214280],[185.1875,1351214640],[185.1875,1351215000],[185.1875,1351215360],[185.1875,1351215720],[185.1875,1351216080],[185.1875,1351216440],[185.1875,1351216800],[185.1875,1351217160]]",
-      "memNonHeapUsedM" : "[[24.856247,1351213560],[24.856247,1351213920],[24.856247,1351214280],[24.856247,1351214640],[24.856247,1351215000],[24.856247,1351215360],[24.856247,1351215720],[24.856247,1351216080],[24.856247,1351216440],[23.964379333,1351216800],[21.711374106,1351217160]]",
-      "memHeapUsedM" : "[[58.635102042,1351213560],[76.2040755,1351213920],[93.246927389,1351214280],[110.45160614,1351214640],[127.54546414,1351215000],[144.66363658,1351215360],[96.690545511,1351215720],[20.528702175,1351216080],[38.275298164,1351216440],[59.513269842,1351216800],[127.88187832,1351217160]]",
-      "memNonHeapCommittedM" : "[[39.08203,1351213560],[39.08203,1351213920],[39.08203,1351214280],[39.08203,1351214640],[39.08203,1351215000],[39.08203,1351215360],[39.08203,1351215720],[39.08203,1351216080],[39.08203,1351216440],[36.653699028,1351216800],[23.404166667,1351217160]]"
-    }
-  }
-}

+ 0 - 19
ambari-web/app/assets/data/services/metrics/mapreduce/jvm_threads.json

@@ -1,19 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/JOBTRACKER?fields=metrics/jvm/threadsRunnable[1351213550,1351217148,60],metrics/jvm/threadsBlocked[1351213550,1351217148,60],metrics/jvm/threadsWaiting[1351213550,1351217148,60],metrics/jvm/threadsTimedWaiting[1351213550,1351217148,60]",
-  "HostRoles" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "host_name" : "hostname"
-  },
-  "host" : {
-    "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
-  },
-  "metrics" : {
-    "jvm" : {
-      "threadsBlocked" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
-      "threadsWaiting" : "[[59.0,1351213560],[59.0,1351213920],[59.0,1351214280],[59.0,1351214640],[59.0,1351215000],[59.0,1351215360],[59.0,1351215720],[59.0,1351216080],[59.0,1351216440],[58.388888889,1351216800],[58.627777778,1351217160]]",
-      "threadsTimedWaiting" : "[[10.0,1351213560],[10.0,1351213920],[10.0,1351214280],[10.0,1351214640],[10.0,1351215000],[10.0,1351215360],[10.0,1351215720],[10.0,1351216080],[10.0,1351216440],[10.161111111,1351216800],[10.830555556,1351217160]]",
-      "threadsRunnable" : "[[6.0,1351213560],[6.0,1351213920],[6.0,1351214280],[6.0,1351214640],[6.0,1351215000],[6.0,1351215360],[6.0,1351215720],[6.0,1351216080],[6.0,1351216440],[6.0,1351216800],[6.0,1351217160]]"
-    }
-  }
-}

+ 0 - 16
ambari-web/app/assets/data/services/metrics/mapreduce/map_slots.json

@@ -1,16 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[1351213550,1351217148,60],metrics/mapred/jobtracker/reserved_map_slots[1351213550,1351217148,60]",
-  "metrics" : {
-    "mapred" : {
-      "jobtracker" : {
-        "reserved_map_slots" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
-        "occupied_map_slots" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.038888888889,1351217160]]"
-      }
-    }
-  },
-  "ServiceComponentInfo" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "service_name" : "MAPREDUCE"
-  }
-}

+ 0 - 16
ambari-web/app/assets/data/services/metrics/mapreduce/reduce_slots.json

@@ -1,16 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[1351213550,1351217148,60],metrics/mapred/jobtracker/reserved_reduce_slots[1351213550,1351217148,60]",
-  "metrics" : {
-    "mapred" : {
-      "jobtracker" : {
-        "reserved_reduce_slots" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
-        "occupied_reduce_slots" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.038888888889,1351217160]]"
-      }
-    }
-  },
-  "ServiceComponentInfo" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "service_name" : "MAPREDUCE"
-  }
-}

+ 0 - 16
ambari-web/app/assets/data/services/metrics/mapreduce/rpc.json

@@ -1,16 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[1351213550,1351217148,60]",
-  "HostRoles" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "host_name" : "hostname"
-  },
-  "host" : {
-    "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
-  },
-  "metrics" : {
-    "rpc" : {
-      "RpcQueueTime_avg_time" : "[[0.069553376906,1351213560],[0.08265993266,1351213920],[0.096717171717,1351214280],[0.07859724698,1351214640],[0.093248663102,1351215000],[0.084630619925,1351215360],[0.09087443058,1351215720],[0.075108932462,1351216080],[0.086007130125,1351216440],[0.42323904309,1351216800],[0.14756856477,1351217160]]"
-    }
-  }
-}

+ 0 - 18
ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json

@@ -1,18 +0,0 @@
-{
-  "href" : "http://ambari/clusters/SrimanthAmbari/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[1351213550,1351217148,60],metrics/mapred/jobtracker/running_reduces[1351213550,1351217148,60],metrics/mapred/jobtracker/waiting_maps[1351213550,1351217148,60],metrics/mapred/jobtracker/waiting_reduces[1351213550,1351217148,60]",
-  "metrics" : {
-    "mapred" : {
-      "jobtracker" : {
-        "running_maps" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.038888888889,1351217160]]",
-        "running_reduces" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.038888888889,1351217160]]",
-        "waiting_maps" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
-        "waiting_reduces" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]"
-      }
-    }
-  },
-  "ServiceComponentInfo" : {
-    "cluster_name" : "SrimanthAmbari",
-    "component_name" : "JOBTRACKER",
-    "service_name" : "MAPREDUCE"
-  }
-}

+ 0 - 35
ambari-web/app/assets/data/services/summary/mapreduce.json

@@ -1,35 +0,0 @@
-{
-  "mapreduce": {
-    "service_type": "MAPREDUCE",
-    "installed": true,
-    "jobtracker_addr": "jobtracker:50030",
-    "trackers_total": "1",
-    "jobhistory_addr": "jobtracker:51111",
-    "memory_heap_used": 94499048,
-    "memory_heap_max": 482344960,
-    "trackers_live": 1,
-    "trackers_graylisted": 0,
-    "trackers_blacklisted": 0,
-    "version": "1.0.3.15, r",
-    "queue_info": {
-      "type": ""
-    },
-    "waiting_jobs": 0,
-    "trackers_excluded": 0,
-    "map_task_capacity": 2,
-    "reduce_task_capacity": 2,
-    "job_total_submissions": 4,
-    "job_total_completions": 4,
-    "running_jobs": 0,
-    "running_map_tasks": 0,
-    "running_reduce_tasks": 0,
-    "occupied_map_slots": 0,
-    "occupied_reduce_slots": 0,
-    "reserved_map_slots": 0,
-    "reserved_reduce_slots": 0,
-    "waiting_maps": 0,
-    "waiting_reduces": 0,
-    "start_time": 1348935243,
-    "average_node_capacity": 4
-  }
-}

+ 0 - 289
ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json

@@ -1,289 +0,0 @@
-{
-  "name" : "HDP",
-  "version" : "0.1",
-  "repositories" : [ {
-    "baseUrl" : "http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6",
-    "osType" : "centos6",
-    "repoId" : "HDP-1.1.1.16",
-    "repoName" : "HDP",
-    "mirrorsList" : null
-  }, {
-    "baseUrl" : "http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6",
-    "osType" : "centos6",
-    "repoId" : "HDP-UTILS-1.1.0.15",
-    "repoName" : "HDP-UTILS",
-    "mirrorsList" : null
-  }, {
-    "baseUrl" : null,
-    "osType" : "centos6",
-    "repoId" : "epel",
-    "repoName" : "epel",
-    "mirrorsList" : "https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch"
-  }, {
-    "baseUrl" : "http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5",
-    "osType" : "centos5",
-    "repoId" : "HDP-1.1.1.16",
-    "repoName" : "HDP",
-    "mirrorsList" : null
-  }, {
-    "baseUrl" : "http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5",
-    "osType" : "centos5",
-    "repoId" : "HDP-UTILS-1.1.0.15",
-    "repoName" : "HDP-UTILS",
-    "mirrorsList" : null
-  }, {
-    "baseUrl" : null,
-    "osType" : "centos5",
-    "repoId" : "epel",
-    "repoName" : "epel",
-    "mirrorsList" : "https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch"
-  } ],
-  "services" : [ {
-    "name" : "WEBHCAT",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for WEBHCAT service",
-    "components" : [ {
-      "name" : "WEBHCAT_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    } ],
-    "clientComponent" : {
-      "name" : "WEBHCAT_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }
-  }, {
-    "name" : "SQOOP",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for SQOOP service",
-    "components" : [ {
-      "name" : "SQOOP",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientComponent" : {
-      "name" : "SQOOP",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
-    "name" : "NAGIOS",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for NAGIOS service",
-    "components" : [ {
-      "name" : "NAGIOS_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    } ],
-    "clientComponent" : {
-      "name" : "NAGIOS_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }
-  }, {
-    "name" : "HDFS",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for HDFS service",
-    "components" : [ {
-      "name" : "NAMENODE",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }, {
-      "name" : "DATANODE",
-      "category" : "SLAVE",
-      "client" : false,
-      "master" : false
-    }, {
-      "name" : "SECONDARY_NAMENODE",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }, {
-      "name" : "HDFS_CLIENT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientComponent" : {
-      "name" : "HDFS_CLIENT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
-    "name" : "PIG",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for PIG service",
-    "components" : [ {
-      "name" : "PIG",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientComponent" : {
-      "name" : "PIG",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
-    "name" : "HBASE",
-    "version" : "1.0",
-    "user" : "mapred",
-    "comment" : "This is comment for HBASE service",
-    "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" : "ZOOKEEPER",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for ZOOKEEPER service",
-    "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" : "GANGLIA",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for GANGLIA service",
-    "components" : [ {
-      "name" : "GANGLIA_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }, {
-      "name" : "GANGLIA_MONITOR",
-      "category" : "SLAVE",
-      "client" : false,
-      "master" : false
-    }, {
-      "name" : "MONITOR_WEBSERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    } ],
-    "clientComponent" : {
-      "name" : "GANGLIA_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }
-  }, {
-    "name" : "HIVE",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for HIVE service",
-    "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" : "OOZIE",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for OOZIE service",
-    "components" : [ {
-      "name" : "OOZIE_SERVER",
-      "category" : "MASTER",
-      "client" : false,
-      "master" : true
-    }, {
-      "name" : "OOZIE_CLIENT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientComponent" : {
-      "name" : "OOZIE_CLIENT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
-    "name" : "MAPREDUCE",
-    "version" : "1.0",
-    "user" : "mapred",
-    "comment" : "This is comment for MAPREDUCE service",
-    "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
-    }
-  } ]
-}

+ 0 - 1188
ambari-web/app/assets/data/wizard/stack/stacks.json

@@ -1,1194 +1,6 @@
 {
   "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions?fields=stackServices/StackServices,Versions",
   "items" : [
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3",
-      "Versions" : {
-        "active" : true,
-        "min_upgrade_version" : null,
-        "parent_stack_version" : "1.3.3",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3",
-        "config_types" : {
-          "cluster-env" : {
-            "supports" : {
-              "adding_forbidden" : "false",
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "stackServices" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/GANGLIA",
-          "StackServices" : {
-            "comments" : "Ganglia Metrics Collection system (<a href=\"http://oss.oetiker.ch/rrdtool/\" target=\"_blank\">RRDTool</a> will be installed too)",
-            "custom_commands" : [ ],
-            "display_name" : "Ganglia",
-            "required_services" : [ ],
-            "service_check_supported" : false,
-            "service_name" : "GANGLIA",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "ganglia-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/HBASE",
-          "StackServices" : {
-            "comments" : "Non-relational distributed database and centralized service for configuration management &\n        synchronization\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "HBase",
-            "required_services" : [
-              "HDFS",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HBASE",
-            "service_version" : "0.94.6.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "hbase-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hbase-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/HDFS",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed File System",
-            "custom_commands" : [ ],
-            "display_name" : "HDFS",
-            "required_services" : [ ],
-            "service_check_supported" : true,
-            "service_name" : "HDFS",
-            "service_version" : "1.2.0.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "core-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hadoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hadoop-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hdfs-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hdfs-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/HIVE",
-          "StackServices" : {
-            "comments" : "Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service",
-            "custom_commands" : [ ],
-            "display_name" : "Hive",
-            "required_services" : [
-              "MAPREDUCE",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HIVE",
-            "service_version" : "0.11.0.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "hcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-exec-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "webhcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "webhcat-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/MAPREDUCE",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed Processing Framework",
-            "custom_commands" : [ ],
-            "display_name" : "MapReduce",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "MAPREDUCE",
-            "service_version" : "1.2.0.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "capacity-scheduler" : {
-                "supports" : {
-                  "adding_forbidden" : "true",
-                  "final" : "false"
-                }
-              },
-              "mapred-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "mapred-queue-acls" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapred-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapreduce-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : [ ],
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/OOZIE",
-          "StackServices" : {
-            "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a> Library.\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Oozie",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "OOZIE",
-            "service_version" : "3.3.2.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "oozie-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/PIG",
-          "StackServices" : {
-            "comments" : "Scripting platform for analyzing large datasets",
-            "custom_commands" : [ ],
-            "display_name" : "Pig",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "PIG",
-            "service_version" : "0.11.1.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "pig-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-properties" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/SQOOP",
-          "StackServices" : {
-            "comments" : "Tool for transferring bulk data between Apache Hadoop and\n        structured data stores such as relational databases\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Sqoop",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "SQOOP",
-            "service_version" : "1.4.3.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "sqoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3/stackServices/ZOOKEEPER",
-          "StackServices" : {
-            "comments" : "Centralized service which provides highly reliable distributed coordination.",
-            "custom_commands" : [ ],
-            "display_name" : "ZooKeeper",
-            "required_services" : [ ],
-            "service_check_supported" : true,
-            "service_name" : "ZOOKEEPER",
-            "service_version" : "3.4.5.1.3",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3",
-            "user_name" : null,
-            "config_types" : {
-              "zookeeper-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "zookeeper-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2",
-      "Versions" : {
-        "active" : false,
-        "min_upgrade_version" : null,
-        "parent_stack_version" : null,
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.2",
-        "config_types" : {
-          "cluster-env" : {
-            "supports" : {
-              "adding_forbidden" : "false",
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "stackServices" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/GANGLIA",
-          "StackServices" : {
-            "comments" : "Ganglia Metrics Collection system (<a href=\"http://oss.oetiker.ch/rrdtool/\" target=\"_blank\">RRDTool</a> will be installed too)",
-            "custom_commands" : [ ],
-            "display_name" : "Ganglia",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "GANGLIA",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "ganglia-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/HBASE",
-          "StackServices" : {
-            "comments" : "Non-relational distributed database and centralized service for configuration management &\n        synchronization\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "HBase",
-            "required_services" : [
-              "HDFS",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HBASE",
-            "service_version" : "0.94.6.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "hbase-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hbase-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/HDFS",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed File System",
-            "custom_commands" : [ ],
-            "display_name" : "HDFS",
-            "required_services" : null,
-            "service_check_supported" : true,
-            "service_name" : "HDFS",
-            "service_version" : "1.2.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "core-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hadoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hadoop-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hdfs-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hdfs-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/HIVE",
-          "StackServices" : {
-            "comments" : "Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service",
-            "custom_commands" : [ ],
-            "display_name" : "Hive",
-            "required_services" : [
-              "MAPREDUCE",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HIVE",
-            "service_version" : "0.11.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "hcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-exec-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "webhcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "webhcat-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/MAPREDUCE",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed Processing Framework",
-            "custom_commands" : [ ],
-            "display_name" : "MapReduce",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "MAPREDUCE",
-            "service_version" : "1.2.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "capacity-scheduler" : {
-                "supports" : {
-                  "adding_forbidden" : "true",
-                  "final" : "false"
-                }
-              },
-              "mapred-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "mapred-queue-acls" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapred-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapreduce-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/OOZIE",
-          "StackServices" : {
-            "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a> Library.\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Oozie",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "OOZIE",
-            "service_version" : "3.3.2.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "oozie-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/PIG",
-          "StackServices" : {
-            "comments" : "Scripting platform for analyzing large datasets",
-            "custom_commands" : [ ],
-            "display_name" : "Pig",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "PIG",
-            "service_version" : "0.11.1.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "pig-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-properties" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/SQOOP",
-          "StackServices" : {
-            "comments" : "Tool for transferring bulk data between Apache Hadoop and\n        structured data stores such as relational databases\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Sqoop",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "SQOOP",
-            "service_version" : "1.4.3.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "sqoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.2/stackServices/ZOOKEEPER",
-          "StackServices" : {
-            "comments" : "Centralized service which provides highly reliable distributed coordination",
-            "custom_commands" : [ ],
-            "display_name" : "ZooKeeper",
-            "required_services" : null,
-            "service_check_supported" : true,
-            "service_name" : "ZOOKEEPER",
-            "service_version" : "3.4.5.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.2",
-            "user_name" : null,
-            "config_types" : {
-              "zookeeper-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "zookeeper-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3",
-      "Versions" : {
-        "active" : false,
-        "min_upgrade_version" : null,
-        "parent_stack_version" : "1.3.2",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.3",
-        "config_types" : {
-          "cluster-env" : {
-            "supports" : {
-              "adding_forbidden" : "false",
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "stackServices" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/GANGLIA",
-          "StackServices" : {
-            "comments" : "Ganglia Metrics Collection system (<a href=\"http://oss.oetiker.ch/rrdtool/\" target=\"_blank\">RRDTool</a> will be installed too)",
-            "custom_commands" : [ ],
-            "display_name" : "Ganglia",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "GANGLIA",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "ganglia-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/HBASE",
-          "StackServices" : {
-            "comments" : "Non-relational distributed database and centralized service for configuration management &\n        synchronization\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "HBase",
-            "required_services" : [
-              "HDFS",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HBASE",
-            "service_version" : "0.94.6.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "hbase-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hbase-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hbase-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/HDFS",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed File System",
-            "custom_commands" : [ ],
-            "display_name" : "HDFS",
-            "required_services" : null,
-            "service_check_supported" : true,
-            "service_name" : "HDFS",
-            "service_version" : "1.2.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "core-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hadoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hadoop-policy" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "hdfs-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hdfs-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/HIVE",
-          "StackServices" : {
-            "comments" : "Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service",
-            "custom_commands" : [ ],
-            "display_name" : "Hive",
-            "required_services" : [
-              "MAPREDUCE",
-              "ZOOKEEPER"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "HIVE",
-            "service_version" : "0.11.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "hcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-exec-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "hive-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "webhcat-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "webhcat-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/MAPREDUCE",
-          "StackServices" : {
-            "comments" : "Apache Hadoop Distributed Processing Framework",
-            "custom_commands" : [ ],
-            "display_name" : "MapReduce",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "MAPREDUCE",
-            "service_version" : "1.2.0.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "capacity-scheduler" : {
-                "supports" : {
-                  "adding_forbidden" : "true",
-                  "final" : "false"
-                }
-              },
-              "mapred-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "mapred-queue-acls" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapred-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              },
-              "mapreduce-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/OOZIE",
-          "StackServices" : {
-            "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a> Library.\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Oozie",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "OOZIE",
-            "service_version" : "3.3.2.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "oozie-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "oozie-site" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "true"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/PIG",
-          "StackServices" : {
-            "comments" : "Scripting platform for analyzing large datasets",
-            "custom_commands" : [ ],
-            "display_name" : "Pig",
-            "required_services" : [
-              "MAPREDUCE"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "PIG",
-            "service_version" : "0.11.1.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "pig-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "pig-properties" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/SQOOP",
-          "StackServices" : {
-            "comments" : "Tool for transferring bulk data between Apache Hadoop and\n        structured data stores such as relational databases\n      ",
-            "custom_commands" : [ ],
-            "display_name" : "Sqoop",
-            "required_services" : [
-              "HDFS"
-            ],
-            "service_check_supported" : true,
-            "service_name" : "SQOOP",
-            "service_version" : "1.4.3.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "sqoop-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.3/stackServices/ZOOKEEPER",
-          "StackServices" : {
-            "comments" : "Centralized service which provides highly reliable distributed coordination",
-            "custom_commands" : [ ],
-            "display_name" : "ZooKeeper",
-            "required_services" : null,
-            "service_check_supported" : true,
-            "service_name" : "ZOOKEEPER",
-            "service_version" : "3.4.5.1.3.3.0",
-            "stack_name" : "HDP",
-            "stack_version" : "1.3.3",
-            "user_name" : null,
-            "config_types" : {
-              "zookeeper-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              },
-              "zookeeper-log4j" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0",
       "Versions" : {

+ 0 - 82
ambari-web/app/assets/data/wizard/stack/versions.json

@@ -1,82 +0,0 @@
-{
-  "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2?fields=versions",
-  "items" : [
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP",
-      "Stacks" : {
-        "stack_name" : "HDP"
-      },
-      "versions" : [
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/0.1",
-          "Versions" : {
-            "stack_version" : "0.1",
-            "stack_name" : "HDP",
-            "active" : "false"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/2.0.1",
-          "Versions" : {
-            "stack_version" : "2.0.1",
-            "stack_name" : "HDP",
-            "active" : "false"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0",
-          "Versions" : {
-            "stack_version" : "1.3.0",
-            "stack_name" : "HDP",
-            "active" : "true"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.1",
-          "Versions" : {
-            "stack_version" : "1.2.1",
-            "stack_name" : "HDP",
-            "active" : "true"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.0",
-          "Versions" : {
-            "stack_version" : "1.2.0",
-            "stack_name" : "HDP",
-            "active" : "false"
-          }
-        }
-      ]
-    },
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDPLocal",
-      "Stacks" : {
-        "stack_name" : "HDPLocal"
-      },
-      "versions" : [
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDPLocal/versions/1.2.1",
-          "Versions" : {
-            "stack_version" : "1.2.1",
-            "stack_name" : "HDPLocal"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDPLocal/versions/1.3.0",
-          "Versions" : {
-            "stack_version" : "1.3.0",
-            "stack_name" : "HDPLocal"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDPLocal/versions/1.2.0",
-          "Versions" : {
-            "stack_version" : "1.2.0",
-            "stack_name" : "HDPLocal"
-          }
-        }
-      ]
-    }
-  ]
-}

+ 0 - 4
ambari-web/app/assets/test/tests.js

@@ -79,7 +79,6 @@ var files = ['test/init_model_test',
   'test/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused_test',
   'test/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed_test',
   'test/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun_test',
-  'test/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_test',
   'test/controllers/main/alerts/manage_alert_groups_controller_test',
   'test/controllers/main/host/add_controller_test',
   'test/controllers/main/host/configs_service_test',
@@ -179,13 +178,10 @@ var files = ['test/init_model_test',
   'test/views/main/dashboard/widgets/uptime_text_widget_test',
   'test/views/main/dashboard/widgets/node_managers_live_test',
   'test/views/main/dashboard/widgets/datanode_live_test',
-  'test/views/main/dashboard/widgets/tasktracker_live_test',
   'test/views/main/dashboard/widgets/hbase_average_load_test',
   'test/views/main/dashboard/widgets/hbase_regions_in_transition_test',
-  'test/views/main/dashboard/widgets/jobtracker_rpc_test',
   'test/views/main/dashboard/widgets/namenode_rpc_test',
   'test/views/main/dashboard/widgets/hbase_master_uptime_test',
-  'test/views/main/dashboard/widgets/jobtracker_uptime_test',
   'test/views/main/dashboard/widgets/namenode_uptime_test',
   'test/views/main/dashboard/widgets/resource_manager_uptime_test',
   'test/views/main/dashboard/widgets/links_widget_test',

+ 0 - 5
ambari-web/app/controllers.js

@@ -120,11 +120,6 @@ require('controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_yarn');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_gctime');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_memHeapUsed');

+ 0 - 45
ambari-web/app/controllers/global/cluster_controller.js

@@ -194,47 +194,6 @@ App.ClusterController = Em.Controller.extend({
     this.set('isGangliaUrlLoaded', true);
   },
 
-  setNagiosUrl: function () {
-    if (App.get('testMode')) {
-      this.set('nagiosUrl', 'http://nagiosserver/nagios');
-      this.set('isNagiosUrlLoaded', true);
-    } else {
-      // We want live data here
-      var nagiosServer = App.HostComponent.find().findProperty('componentName', 'NAGIOS_SERVER');
-      if (this.get('isLoaded') && nagiosServer) {
-        this.set('isNagiosUrlLoaded', false);
-        App.ajax.send({
-          name: 'hosts.for_quick_links',
-          sender: this,
-          data: {
-            clusterName: App.get('clusterName'),
-            masterHosts: nagiosServer.get('hostName'),
-            urlParams: ''
-          },
-          success: 'setNagiosUrlSuccessCallback'
-        });
-      }
-    }
-  }.observes('App.router.updateController.isUpdated', 'dataLoadList.serviceMetrics', 'dataLoadList.hosts', 'nagiosWebProtocol', 'isLoaded'),
-
-  setNagiosUrlSuccessCallback: function (response) {
-    var url = null;
-    if (response.items.length > 0) {
-      url = this.get('nagiosWebProtocol') + "://" + (App.singleNodeInstall ? App.singleNodeAlias + ":42080" : response.items[0].Hosts.public_host_name) + "/nagios";
-    }
-    this.set('nagiosUrl', url);
-    this.set('isNagiosUrlLoaded', true);
-  },
-
-  nagiosWebProtocol: function () {
-    var properties = this.get('ambariProperties');
-    if (properties && properties.hasOwnProperty('nagios.https') && properties['nagios.https']) {
-      return "https";
-    } else {
-      return "http";
-    }
-  }.property('ambariProperties'),
-
   gangliaWebProtocol: function () {
     var properties = this.get('ambariProperties');
     if (properties && properties.hasOwnProperty('ganglia.https') && properties['ganglia.https']) {
@@ -244,10 +203,6 @@ App.ClusterController = Em.Controller.extend({
     }
   }.property('ambariProperties'),
 
-  isNagiosInstalled: function () {
-    return !!App.Service.find().findProperty('serviceName', 'NAGIOS');
-  }.property('App.router.updateController.isUpdated', 'dataLoadList.serviceMetrics'),
-
   isGangliaInstalled: function () {
     return !!App.Service.find().findProperty('serviceName', 'GANGLIA');
   }.property('App.router.updateController.isUpdated', 'dataLoadList.serviceMetrics'),

+ 0 - 4
ambari-web/app/controllers/global/update_controller.js

@@ -413,10 +413,6 @@ App.UpdateController = Em.Controller.extend({
         "ServiceComponentInfo/AverageLoad," +
         "ServiceComponentInfo/Revision," +
         "ServiceComponentInfo/RegionsInTransition",
-      'MAPREDUCE': "ServiceComponentInfo/AliveNodes," +
-        "ServiceComponentInfo/GrayListedNodes," +
-        "ServiceComponentInfo/BlackListedNodes," +
-        "ServiceComponentInfo/jobtracker/*,",
       'STORM': /^2.1/.test(App.get('currentStackVersionNumber')) ? 'metrics/api/cluster/summary' : 'metrics/api/v1/cluster/summary,metrics/api/v1/topology/summary'
     };
     var services = App.cache['services'];

+ 0 - 1
ambari-web/app/controllers/main/admin/kerberos.js

@@ -52,7 +52,6 @@ App.MainAdminKerberosController = Em.Controller.extend({
         this.hide();
       },
       bodyClass: Ember.View.extend({
-        isMapReduceInstalled: App.Service.find().mapProperty('serviceName').contains('MAPREDUCE'),
         templateName: require('templates/main/admin/security/notify_security_off_popup')
       })
     })

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

@@ -89,7 +89,6 @@ App.MainAdminSecurityController = Em.Controller.extend({
   userNameMap: {
     'hdfs_user': {defaultValue: 'hdfs', siteName: 'hadoop-env', serviceName: 'HDFS'},
     'yarn_user': {defaultValue: 'yarn', siteName: 'yarn-env', serviceName: 'YARN'},
-    'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env', serviceName: 'MAPREDUCE'},
     'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env', serviceName: 'MAPREDUCE2'},
     'hbase_user': {defaultValue: 'hbase', siteName: 'hbase-env', serviceName: 'HBASE'},
     'hive_user': {defaultValue: 'hive', siteName: 'hive-env', serviceName: 'HIVE'},
@@ -244,7 +243,6 @@ App.MainAdminSecurityController = Em.Controller.extend({
           this.hide();
         },
         bodyClass: Ember.View.extend({
-          isMapReduceInstalled: App.Service.find().mapProperty('serviceName').contains('MAPREDUCE'),
           templateName: require('templates/main/admin/security/notify_security_off_popup')
         })
       })

+ 0 - 15
ambari-web/app/controllers/main/admin/security/add/step2.js

@@ -40,11 +40,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       configName: 'datanode_hosts',
       component: 'DATANODE'
     },
-    {
-      serviceName: 'MAPREDUCE',
-      configName: 'tasktracker_hosts',
-      component: 'TASKTRACKER'
-    },
     {
       serviceName: 'YARN',
       configName: 'nodemanager_host',
@@ -101,16 +96,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       configName: 'journalnode_hosts',
       components: ['JOURNALNODE']
     },
-    {
-      serviceName: 'MAPREDUCE',
-      configName: 'jobtracker_host',
-      components: ['JOBTRACKER']
-    },
-    {
-      serviceName: 'MAPREDUCE',
-      configName: 'jobhistoryserver_host',
-      components: ['HISTORYSERVER']
-    },
     {
       serviceName: 'MAPREDUCE2',
       configName: 'jobhistoryserver_host',

+ 0 - 15
ambari-web/app/controllers/main/charts/heatmap.js

@@ -66,21 +66,6 @@ App.MainChartsHeatmapController = Em.Controller.extend({
       );
     }
 
-    if (App.MapReduceService.find().get('length')) {
-      metrics.push(
-        Em.Object.create({
-          label: Em.I18n.t('charts.heatmap.category.mapreduce'),
-          category: 'mapreduce',
-          items: [
-            App.MainChartHeatmapMapreduceMapsRunningMetric.create(),
-            App.MainChartHeatmapMapreduceReducesRunningMetric.create(),
-            App.MainChartHeatmapMapreduceGCTimeMillisMetric.create(),
-            App.MainChartHeatmapMapreduceMemHeapUsedMetric.create()
-          ]
-        })
-      );
-    }
-
     if (App.YARNService.find().get('length')) {
       metrics.push(
         Em.Object.create({

+ 0 - 46
ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js

@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * Base class for any MapReduce metric.
- */
-App.MainChartHeatmapMapreduceMetrics = App.MainChartHeatmapMetric.extend({
-
-  ajaxIndex: 'hosts.metrics.host_component',
-
-  ajaxData: {
-    serviceName: 'MAPREDUCE',
-    componentName: 'TASKTRACKER'
-  },
-
-  /**
-   * Custom mapper for MapReduce metrics
-   */
-  metricMapper: function(json) {
-    return this.metricMapperWithTransform(json, this.get('defaultMetric'), this.get('transformValue'));
-  },
-
-  /**
-   * Utility function which allows extending classes to transform the value
-   * assigned to a host.
-   * 
-   * @Function
-   */
-  transformValue: null
-});

+ 0 - 29
ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js

@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * 
- */
-App.MainChartHeatmapMapreduceGCTimeMillisMetric = App.MainChartHeatmapMapreduceMetrics.extend({
-  name: Em.I18n.t('charts.heatmap.metrics.MapReduceGCTime'),
-  maximumValue: 10000,
-  defaultMetric: 'metrics.jvm.gcTimeMillis',
-  units: ' ms',
-  slotDefinitionLabelSuffix: ' ms'
-});

+ 0 - 29
ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js

@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * 
- */
-App.MainChartHeatmapMapreduceMapsRunningMetric = App.MainChartHeatmapMapreduceMetrics.extend({
-  name: Em.I18n.t('charts.heatmap.metrics.mapsRunning'),
-  maximumValue: 100,
-  defaultMetric: 'metrics.mapred.tasktracker.maps_running',
-  units: ' maps',
-  slotDefinitionLabelSuffix: ' Maps'
-});

+ 0 - 29
ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js

@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * 
- */
-App.MainChartHeatmapMapreduceMemHeapUsedMetric = App.MainChartHeatmapMapreduceMetrics.extend({
-  name: Em.I18n.t('charts.heatmap.metrics.MRMemHeapUsed'),
-  maximumValue: 512,
-  defaultMetric: 'metrics.jvm.memHeapUsedM',
-  units: 'MB',
-  slotDefinitionLabelSuffix: 'MB'
-});

+ 0 - 29
ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js

@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * 
- */
-App.MainChartHeatmapMapreduceReducesRunningMetric = App.MainChartHeatmapMapreduceMetrics.extend({
-  name: Em.I18n.t('charts.heatmap.metrics.reducesRunning'),
-  maximumValue: 100,
-  defaultMetric: 'metrics.mapred.tasktracker.reduces_running',
-  units: ' reduces',
-  slotDefinitionLabelSuffix: ' Reduces'
-});

+ 0 - 3
ambari-web/app/controllers/main/host.js

@@ -785,9 +785,6 @@ App.MainHostController = Em.ArrayController.extend(App.TableServerMixin, {
         if (svcName === "YARN" || svcName === "HBASE" || svcName === "HDFS") {
           App.router.get('mainHostDetailsController').doRecommissionAndStart(hostNames, svcName, masterName, slaveName);
         }
-        else if (svcName === "MAPREDUCE") {
-          App.router.get('mainHostDetailsController').doRecommissionAndRestart(hostNames, svcName, masterName, slaveName);
-        }
       } else {
         hostsWithComponentInProperState = components.filterProperty('workStatus', 'STARTED').mapProperty('hostName');
         //For decommession

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

@@ -950,9 +950,6 @@ App.MainHostDetailsController = Em.Controller.extend({
       case 'YARN':
         this.doDecommission(hostName, svcName, "RESOURCEMANAGER", "NODEMANAGER");
         break;
-      case 'MAPREDUCE':
-        this.doDecommission(hostName, svcName, "JOBTRACKER", "TASKTRACKER");
-        break;
       case 'HBASE':
         this.warnBeforeDecommission(hostName);
     }
@@ -983,9 +980,6 @@ App.MainHostDetailsController = Em.Controller.extend({
       case 'YARN':
         this.doRecommissionAndStart(hostName, svcName, "RESOURCEMANAGER", "NODEMANAGER");
         break;
-      case 'MAPREDUCE':
-        this.doRecommissionAndRestart(hostName, svcName, "JOBTRACKER", "TASKTRACKER");
-        break;
       case 'HBASE':
         this.doRecommissionAndStart(hostName, svcName, "HBASE_MASTER", "HBASE_REGIONSERVER");
     }
@@ -1313,73 +1307,6 @@ App.MainHostDetailsController = Em.Controller.extend({
     });
   },
 
-  /**
-   * Performs Recommission and Restart
-   * @param {string} hostNames
-   * @param {string} serviceName
-   * @param {string} componentName
-   * @param {string} slaveType
-   * @method doRecommissionAndStart
-   */
-  doRecommissionAndRestart: function (hostNames, serviceName, componentName, slaveType) {
-    var contextNameString_1 = 'hosts.host.' + slaveType.toLowerCase() + '.recommission';
-    var context_1 = Em.I18n.t(contextNameString_1);
-    var contextNameString_2 = 'hosts.host.' + slaveType.toLowerCase() + '.restart';
-    var context_2 = Em.I18n.t(contextNameString_2);
-    App.ajax.send({
-      name: 'host.host_component.recommission_and_restart',
-      sender: this,
-      data: {
-        intervalTimeSeconds: 1,
-        tolerateSize: 1,
-        batches: [
-          {
-            "order_id": 1,
-            "type": "POST",
-            "uri": App.apiPrefix + "/clusters/" + App.get('clusterName') + "/requests",
-            "RequestBodyInfo": {
-              "RequestInfo": {
-                "context": context_1,
-                "command": "DECOMMISSION",
-                "exclusive":"true",
-                "parameters": {
-                  "slave_type": slaveType,
-                  "included_hosts": hostNames
-                },
-                'operation_level': {
-                  level: "HOST_COMPONENT",
-                  cluster_name: App.get('clusterName'),
-                  host_name: hostNames,
-                  service_name: serviceName
-                }
-              },
-              "Requests/resource_filters": [
-                {"service_name": serviceName, "component_name": componentName}
-              ]
-            }
-          },
-          {
-            "order_id": 2,
-            "type": "POST",
-            "uri": App.apiPrefix + "/clusters/" + App.get('clusterName') + "/requests",
-            "RequestBodyInfo": {
-              "RequestInfo": {
-                "context": context_2,
-                "command": "RESTART",
-                "service_name": serviceName,
-                "component_name": slaveType,
-                "exclusive":"true",
-                "hosts": hostNames
-              }
-            }
-          }
-        ]
-      },
-      success: 'decommissionSuccessCallback',
-      error: 'decommissionErrorCallback'
-    });
-  },
-
   /**
    * Handler for host-menu items actions
    * @param {object} option

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

@@ -402,7 +402,7 @@ App.AddServiceController = App.WizardController.extend({
    */
   generateDataForInstallServices: function(selectedServices) {
     if (selectedServices.contains('OOZIE')) {
-      selectedServices = selectedServices.concat(['HDFS', 'YARN', 'MAPREDUCE', 'MAPREDUCE2']);
+      selectedServices = selectedServices.concat(['HDFS', 'YARN', 'MAPREDUCE2']);
     }
     return {
       "context": Em.I18n.t('requestInfo.installServices'),

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

@@ -1200,12 +1200,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
           (hdfsConfigs.findProperty('name', 'dfs.datanode.data.dir') && hdfsConfigs.findProperty('name', 'dfs.datanode.data.dir').get('isNotDefaultValue'))) {
           dirChanged = true;
       }
-    } else if (serviceName === 'MAPREDUCE') {
-      var mapredConfigs = this.get('stepConfigs').findProperty('serviceName', 'MAPREDUCE').get('configs');
-      if ((mapredConfigs.findProperty('name', 'mapred.local.dir') && mapredConfigs.findProperty('name', 'mapred.local.dir').get('isNotDefaultValue')) ||
-          (mapredConfigs.findProperty('name', 'mapred.system.dir') && mapredConfigs.findProperty('name', 'mapred.system.dir').get('isNotDefaultValue'))) {
-            dirChanged = true;
-      }
     }
     return dirChanged;
   },
@@ -1300,8 +1294,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       messageClass = 'alert alert-success';
       // warn the user if any of the components are in UNKNOWN state
       urlParams += ',ServiceComponentInfo/installed_count,ServiceComponentInfo/total_count';
-      if (this.get('content.serviceName') === 'HDFS' || App.Service.find().someProperty('id', 'MAPREDUCE')) {
-        urlParams += '&ServiceComponentInfo/service_name.in(HDFS,MAPREDUCE)'
+      if (this.get('content.serviceName') === 'HDFS') {
+        urlParams += '&ServiceComponentInfo/service_name.in(HDFS)'
       }
     } else {
       header = Em.I18n.t('common.failure');
@@ -2261,12 +2255,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       serviceName: 'HDFS',
       serviceUseThis: []
     },
-    {
-      hostProperty: 'jobtracker_host',
-      componentName: 'JOBTRACKER',
-      serviceName: 'MAPREDUCE',
-      serviceUseThis: []
-    },
     {
       hostProperty: 'jobtracker_host',
       componentName: 'JOBTRACKER',
@@ -2279,12 +2267,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       serviceName: 'MAPREDUCE2',
       serviceUseThis: ['YARN']
     },
-    {
-      hostProperty: 'hs_host',
-      componentName: 'HISTORYSERVER',
-      serviceName: 'MAPREDUCE',
-      serviceUseThis: []
-    },
     {
       hostProperty: 'ats_host',
       componentName: 'APP_TIMELINE_SERVER',

+ 0 - 4
ambari-web/app/controllers/main/service/info/summary.js

@@ -98,10 +98,6 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
     return App.router.get('clusterController.nagiosUrl');
   }.property('App.router.clusterController.nagiosUrl'),
 
-  isNagiosInstalled: function () {
-    return App.router.get('clusterController.isNagiosInstalled');
-  }.property('App.router.clusterController.isNagiosInstalled'),
-
   showServiceAlertsPopup: function (event) {
     var service = event.context;
     return App.ModalPopup.show({

+ 0 - 10
ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -188,16 +188,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
           principal: 'yarn.resourcemanager.webapp.spnego-principal'
         }
       ]
-    },
-    {
-      componentName: 'JOBTRACKER',
-      configs: [
-        {
-          site: 'mapred-site',
-          keytab: 'mapreduce.jobtracker.keytab.file',
-          principal: 'mapreduce.jobtracker.kerberos.principal'
-        }
-      ]
     }
   ],
 

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

@@ -92,9 +92,6 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
       case 'HDFS':
         componentName = 'DataNode';
         break;
-      case 'MAPREDUCE':
-        componentName = 'TaskTracker';
-        break;
       case 'HBASE':
         componentName = 'RegionServer';
     }
@@ -121,10 +118,6 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
       case 'HDFS':
         return { name: 'DATANODE',
           displayName: 'DataNode'};
-      case 'MAPREDUCE':
-        return { name: 'TASKTRACKER',
-          displayName: 'TaskTracker'};
-
       case 'HBASE':
         return { name: 'HBASE_REGIONSERVER',
           displayName: 'RegionServer'};

+ 1 - 3
ambari-web/app/controllers/wizard/step8_controller.js

@@ -1471,9 +1471,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
       Object.keys(service.get('configTypes')).forEach(function (type) {
         if (!this.get('serviceConfigTags').someProperty('type', type)) {
           var serviceVersionNotes = Em.I18n.t('dashboard.configHistory.table.notes.default').format(service.get('displayName'));
-          if (service.get('serviceName') === 'MAPREDUCE' && (type === 'capacity-scheduler' || type === 'mapred-queue-acls')) {
-            return;
-          } else if (type === 'core-site') {
+          if (type === 'core-site') {
             coreSiteObject.service_config_version_note = serviceVersionNotes;
             this.get('serviceConfigTags').pushObject(coreSiteObject);
           } else if (type === 'storm-site') {

+ 1 - 1
ambari-web/app/controllers/wizard/step9_controller.js

@@ -481,7 +481,7 @@ App.WizardStep9Controller = Em.Controller.extend({
       case 'addServiceController':
         var servicesList = this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled', false).mapProperty('serviceName');
         if (servicesList.contains('OOZIE')) {
-          servicesList = servicesList.concat(['HDFS', 'YARN', 'MAPREDUCE', 'MAPREDUCE2']);
+          servicesList = servicesList.concat(['HDFS', 'YARN', 'MAPREDUCE2']);
         }
         name = 'common.services.update';
         data = {

+ 0 - 11
ambari-web/app/data/service_graph_config.js

@@ -51,17 +51,6 @@ App.service_graph_config = {
 		'YARN_JVMHeap'
 	],
 
-	'mapreduce': [
-		'MapReduce_JobsStatus',
-		'MapReduce_TasksRunningWaiting',
-		'MapReduce_MapSlots',
-		'MapReduce_ReduceSlots',
-		'MapReduce_GC',
-		'MapReduce_RPC',
-		'MapReduce_JVMHeap',
-		'MapReduce_JVMThreads'
-	],
-
 	'hbase': [
 		'HBASE_ClusterRequests',
 		'HBASE_RegionServerReadWriteRequests',

+ 0 - 5
ambari-web/app/mappers/components_state_mapper.js

@@ -52,11 +52,6 @@ App.componentsStateMapper = App.QuickDataMapper.create({
       node_managers_installed: 'INSTALLED_PATH',
       node_managers_total: 'TOTAL_PATH'
     },
-    'TASKTRACKER': {
-      task_trackers_started: 'STARTED_PATH',
-      task_trackers_installed: 'INSTALLED_PATH',
-      task_trackers_total: 'TOTAL_PATH'
-    },
     'HBASE_REGIONSERVER': {
       region_servers_started: 'STARTED_PATH',
       region_servers_installed: 'INSTALLED_PATH',

+ 0 - 84
ambari-web/app/mappers/service_metrics_mapper.js

@@ -95,34 +95,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     version: 'jobHistoryServerComponent.ServiceComponentInfo.Version',
     map_reduce2_clients: 'map_reduce2_clients'
   },
-  mapReduceConfig: {
-    version: 'jobTrackerComponent.ServiceComponentInfo.Version',
-    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.ServiceComponentInfo.jobtracker.jobs_submitted',
-    jobs_completed: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_completed',
-    jobs_running: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_running',
-    map_slots_occupied: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_map_slots',
-    map_slots_reserved: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_map_slots',
-    reduce_slots_occupied: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_reduce_slots',
-    reduce_slots_reserved: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_reduce_slots',
-    maps_running: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_maps',
-    maps_waiting: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_maps',
-    reduces_running: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_reduces',
-    reduces_waiting: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_reduces',
-    trackers_decommissioned: 'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.trackers_decommissioned',
-    job_tracker_cpu: 'jobTrackerComponent.host_components[0].metrics.cpu.cpu_wio',
-    job_tracker_rpc: 'jobTrackerComponent.host_components[0].metrics.rpc.RpcQueueTime_avg_time',
-    task_trackers_started: 'task_trackers_started',
-    task_trackers_installed: 'task_trackers_installed',
-    task_trackers_total: 'task_trackers_total'
-  },
   hbaseConfig: {
     version: 'masterComponent.ServiceComponentInfo.Version',
     master_start_time: 'masterComponent.ServiceComponentInfo.MasterStartTime',
@@ -244,11 +216,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
           finalJson.rand = Math.random();
           result.push(finalJson);
           App.store.load(App.HDFSService, finalJson);
-        } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "MAPREDUCE") {
-          finalJson = this.mapreduceMapper(item);
-          finalJson.rand = Math.random();
-          result.push(finalJson);
-          App.store.load(App.MapReduceService, finalJson);
         } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "HBASE") {
           finalJson = this.hbaseMapper(item);
           finalJson.rand = Math.random();
@@ -545,57 +512,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
 
     return finalJson;
   },
-  mapreduceMapper: function (item) {
-    // Change the JSON so that it is easy to map
-    var result = [];
-    var finalConfig = jQuery.extend({}, this.config);
-    var mapReduceConfig = this.mapReduceConfig;
-    item.components.forEach(function (component) {
-      if (component.ServiceComponentInfo && component.ServiceComponentInfo.component_name == "JOBTRACKER") {
-        item.jobTrackerComponent = component;
-        finalConfig = jQuery.extend(finalConfig, mapReduceConfig);
-        // Get the live, gray & black nodes from string json
-        item.map_slots = 0;
-        item.reduce_slots = 0;
-        var liveNodesJson = App.parseJSON(component.ServiceComponentInfo.AliveNodes);
-        var grayNodesJson = App.parseJSON(component.ServiceComponentInfo.GrayListedNodes);
-        var blackNodesJson = App.parseJSON(component.ServiceComponentInfo.BlackListedNodes);
-        item.alive_trackers = [];
-        item.gray_list_trackers = [];
-        item.black_list_trackers = [];
-        if (liveNodesJson != null) {
-          liveNodesJson.forEach(function (nj) {
-            item.alive_trackers.push('TASKTRACKER' + '_' + nj.hostname);
-            if (nj.slots && nj.slots.map_slots)
-              item.map_slots += nj.slots.map_slots;
-            if (nj.slots && nj.slots.map_slots_used)
-              item.map_slots_used += nj.slots.map_slots_used;
-            if (nj.slots && nj.slots.reduce_slots)
-              item.reduce_slots += nj.slots.reduce_slots;
-            if (nj.slots && nj.slots.reduce_slots_used)
-              item.reduce_slots_used += nj.slots.reduce_slots_used;
-          });
-        }
-        if (grayNodesJson != null) {
-          grayNodesJson.forEach(function (nj) {
-            item.gray_list_trackers.push('TASKTRACKER' + '_' + nj.hostname);
-          });
-        }
-        if (blackNodesJson != null) {
-          blackNodesJson.forEach(function (nj) {
-            item.black_list_trackers.push('TASKTRACKER' + '_' + nj.hostname);
-          });
-        }
-      } else if (component.ServiceComponentInfo && component.ServiceComponentInfo.component_name == "HISTORYSERVER") {
-        item.jobHistoryServerComponent = component;
-        finalConfig = jQuery.extend(finalConfig, mapReduceConfig);
-      }
-    });
-    // Map
-    var finalJson = this.parseIt(item, finalConfig);
-    finalJson.quick_links = [5, 6, 7, 8, 9, 10, 11, 12];
-    return finalJson;
-  },
   hbaseMapper: function (item) {
     // Change the JSON so that it is easy to map
     var finalConfig = jQuery.extend({}, this.config);

+ 12 - 100
ambari-web/app/messages.js

@@ -342,7 +342,6 @@ Em.I18n.translations = {
   'services.ganglia.description':'Ganglia Metrics Collection system',
   'services.hdfs.description':'Apache Hadoop Distributed File System',
   'services.glusterfs.description':'Apache Hadoop Compatible File System (must be installed manually)',
-  'services.mapreduce.description':'Apache Hadoop Distributed Processing Framework',
   'services.sqoop.description':'Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases',
   'services.pig.description':'Scripting platform for analyzing large datasets',
   'services.hive.description':'Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service',
@@ -1180,7 +1179,6 @@ Em.I18n.translations = {
   'admin.security.enable.popup.header': 'Add security',
   'admin.security.disable.popup.header': 'Remove security',
   'admin.security.disable.popup.body': 'Kerberos security will be disabled on the cluster',
-  'admin.security.disable.popup.body.warning' : 'Note: Before proceeding, you need to manually remove all directories listed in the mapred.local.dir property in mapred-site.xml on all TaskTracker hosts; otherwise, MapReduce will not run properly after disabling security.',
   'admin.addSecurity.header': 'Enable Security Wizard',
   'admin.security.step1.header': 'Get Started',
   'admin.security.step2.header': 'Configure Services',
@@ -1520,38 +1518,18 @@ Em.I18n.translations = {
   'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotal':'Capacity Total',
   'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityNonDFSUsed':'Non DFS Capacity Used',
 
-  'services.service.info.metrics.mapreduce.gc':'Garbage Collection',
-  'services.service.info.metrics.mapreduce.gc.displayNames.gcTimeMillis':'Time',
-  'services.service.info.metrics.mapreduce.jobsStatus':'Jobs Status',
-  'services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsRunning':'Running',
-  'services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsFailed':'Failed',
-  'services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsCompleted':'Succeeded',
-  'services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsPreparing':'Preparing',
-  'services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsSubmitted':'Submitted',
-  'services.service.info.metrics.mapreduce.jvmHeap':'JVM Memory Status',
-  'services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapCommittedM':'Heap Memory Committed',
-  'services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapUsedM':'Non Heap Memory Used',
-  'services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapUsedM':'Heap Memory Used',
-  'services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapCommittedM':'Non Heap Memory Committed',
-  'services.service.info.metrics.mapreduce.jvmThreads':'JVM Thread Status',
-  'services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsBlocked':'Threads Blocked',
-  'services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsWaiting':'Threads Waiting',
-  'services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsTimedWaiting':'Threads Timed Waiting',
-  'services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsRunnable':'Threads Runnable',
-  'services.service.info.metrics.mapreduce.mapSlots':'Map Slots Utilization',
-  'services.service.info.metrics.mapreduce.mapSlots.displayNames.reservedMapSlots':'Map Slots Reserved',
-  'services.service.info.metrics.mapreduce.mapSlots.displayNames.occupiedMapSlots':'Map Slots Occupied',
-  'services.service.info.metrics.mapreduce.reduceSlots':'Reduce Slots Utilization',
-  'services.service.info.metrics.mapreduce.reduceSlots.displayNames.reservedReduceSlots':'Reduce Slots Reserved',
-  'services.service.info.metrics.mapreduce.reduceSlots.displayNames.occupiedReduceSlots':'Reduce Slots Occupied',
-  'services.service.info.metrics.mapreduce.rpc':'RPC',
-  'services.service.info.metrics.mapreduce.rpc.displayNames.RpcQueueTimeAvgTime':'Queue Average Wait Time',
-  'services.service.info.metrics.mapreduce.tasksRunningWaiting':'Tasks (Running/Waiting)',
-  'services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningMaps':'Running Map Tasks',
-  'services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningReduces':'Running Reduce Tasks',
-  'services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingMaps':'Waiting Map Tasks',
-  'services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingReduces':'Waiting Reduce Tasks',
-
+  'services.service.info.metrics.yarn.jvmHeap':'JVM Memory Status',
+  'services.service.info.metrics.yarn.jvmHeap.displayNames.memHeapCommittedM':'Heap Memory Committed',
+  'services.service.info.metrics.yarn.jvmHeap.displayNames.memNonHeapUsedM':'Non Heap Memory Used',
+  'services.service.info.metrics.yarn.jvmHeap.displayNames.memHeapUsedM':'Heap Memory Used',
+  'services.service.info.metrics.yarn.jvmHeap.displayNames.memNonHeapCommittedM':'Non Heap Memory Committed',
+  'services.service.info.metrics.yarn.jvmThreads':'JVM Thread Status',
+  'services.service.info.metrics.yarn.jvmThreads.displayNames.threadsBlocked':'Threads Blocked',
+  'services.service.info.metrics.yarn.jvmThreads.displayNames.threadsWaiting':'Threads Waiting',
+  'services.service.info.metrics.yarn.jvmThreads.displayNames.threadsTimedWaiting':'Threads Timed Waiting',
+  'services.service.info.metrics.yarn.jvmThreads.displayNames.threadsRunnable':'Threads Runnable',
+  'services.service.info.metrics.yarn.rpc':'RPC',
+  'services.service.info.metrics.yarn.rpc.displayNames.RpcQueueTimeAvgTime':'Queue Average Wait Time',
   'services.service.info.metrics.yarn.gc': 'Garbage Collection',
   'services.service.info.metrics.yarn.gc.displayNames.gcTimeMillis':'Time',
   'services.service.info.metrics.yarn.allocated.memory': 'Cluster Memory',
@@ -1617,7 +1595,6 @@ Em.I18n.translations = {
   'services.service.config.saved.message':'Service configuration changes saved successfully.',
   'services.service.config.saving.message':'Configuration changes are being saved...',
   'services.service.config.msgServiceStop':'Could not save configuration changes.  Please stop the service first. You will be able to save configuration changes after all of its components are stopped.',
-  'services.service.config.msgHDFSMapRServiceStop':'Could not save configuration changes.  Please stop both HDFS and MapReduce first.  You will be able to save configuration changes after all HDFS and MapReduce components are stopped.',
   'services.service.config.failCreateConfig' : 'Failure in creating service configuration',
   'services.service.config.failSaveConfig':'Failure in saving service configuration',
   'services.service.config.failSaveConfigHostOverrides':'Failure in saving service configuration overrides',
@@ -1854,33 +1831,6 @@ Em.I18n.translations = {
   'services.mapreduce2.history.unknown': 'History server status is unknown',
   'services.mapreduce2.smokeTest.requirement': 'MapReduce2 smoke test requires YARN service be started',
 
-  'services.mapReduce.config.addQueue':'Add Queue',
-  'services.mapReduce.config.editQueue':'Edit Queue',
-  'services.mapReduce.config.capacitySchedulerXml':'Custom capacity-scheduler.xml',
-  'services.mapReduce.config.queue.header':'Queues',
-  'services.mapReduce.config.queue.name':'Queue Name',
-  'services.mapReduce.config.queue.groups':'Groups',
-  'services.mapReduce.config.queue.capacity':'Capacity',
-  'services.mapReduce.config.queue.maxCapacity':'Max Capacity',
-  'services.mapReduce.config.queue.minUserLimit':'Min User Limit',
-  'services.mapReduce.config.queue.userLimitFactor':'User Limit Factor',
-  'services.mapReduce.config.queue.supportsPriority': 'Supports priority',
-  'services.mapReduce.config.queue.adminUsers':'Admin Users',
-  'services.mapReduce.config.queue.adminGroups':'Admin Groups',
-  'services.mapReduce.config.queue.maxActiveTasks':'Max active initialized tasks',
-  'services.mapReduce.config.queue.maxActiveTasksPerUser':'Max active initialized tasks per user',
-  'services.mapReduce.config.queue.initAcceptJobsFactor':'Init accept jobs factor',
-  'services.mapReduce.extraConfig.queue.name':'Queue name',
-  'services.mapReduce.description.queue.name':'Name of the queue',
-  'services.mapReduce.description.queue.submit.user':"Comma separated list of usernames that are allowed to submit jobs to the queue. " +
-    "If set to the special value '*', it means all users are allowed to submit jobs.",
-  'services.mapReduce.description.queue.admin.user':"Comma separated list of usernames that are allowed to delete jobs or modify job's priority for " +
-    "jobs not owned by the current user in the queue.  If set to the special value '*', it means all users are " +
-    "allowed to do this operation.",
-  'services.mapReduce.description.queue.submit.group':'Comma separated list of group names that are allowed to submit jobs to the queue.',
-  'services.mapReduce.description.queue.admin.group':"Comma separated list of group names that are allowed to delete jobs or modify job's priority " +
-    "for jobs not owned by the current user in the queue.",
-
   'services.tez.client': 'Tez client',
   'services.tez.clients': 'Tez clients',
   'services.pig.client': 'Pig client',
@@ -2139,7 +2089,6 @@ Em.I18n.translations = {
   'charts.heatmap.item.host.disk':'Disk Space Used',
   'charts.heatmap.item.host.process':'Total Running Processes',
   'charts.heatmap.category.hdfs':'HDFS',
-  'charts.heatmap.category.mapreduce': 'MapReduce',
   'charts.heatmap.category.yarn': 'YARN',
   'charts.heatmap.category.hbase': 'HBase',
   'charts.heatmap.unknown': 'Unknown',
@@ -2150,12 +2099,8 @@ Em.I18n.translations = {
   'charts.heatmap.metrics.DFSGarbageCollection' :'HDFS Garbage Collection Time',
   'charts.heatmap.metrics.DFSMemHeapUsed' :'HDFS JVM Heap Memory Used',
   'charts.heatmap.metrics.diskSpaceUsed' :'Host Disk Space Used %',
-  'charts.heatmap.metrics.MapReduceGCTime' :'MapReduce Garbage Collection Time',
   'charts.heatmap.metrics.YarnGCTime' :'YARN Garbage Collection Time',
-  'charts.heatmap.metrics.mapsRunning' :'MapReduce Maps Running',
-  'charts.heatmap.metrics.MRMemHeapUsed' :'MapReduce JVM Heap Memory Used',
   'charts.heatmap.metrics.YarnMemHeapUsed' :'YARN JVM Heap Memory Used',
-  'charts.heatmap.metrics.reducesRunning' :'MapReduce Reduces Running',
 
   'charts.heatmap.metrics.memoryUsed' :'Host Memory Used %',
   'charts.heatmap.metrics.processRun' :'Total Running Processes',
@@ -2202,26 +2147,16 @@ Em.I18n.translations = {
   'dashboard.widgets.HDFSDiskUsage.nonDFSused': 'non DFS used',
   'dashboard.widgets.HDFSDiskUsage.remaining': 'remaining',
   'dashboard.widgets.HDFSDiskUsage.info': '{0} ({1}%)',
-  'dashboard.widgets.JobTrackerHeap': 'JobTracker Heap',
-  'dashboard.widgets.JobTrackerCpu': 'JobTracker CPU WIO',
-  'dashboard.widgets.JobTrackerCapacity': 'JobTracker Capacity',
   'dashboard.widgets.DataNodeUp': 'DataNodes Live',
-  'dashboard.widgets.TaskTrackerUp': 'TaskTrackers Live',
   'dashboard.widgets.SuperVisorUp': 'Supervisors Live',
   'dashboard.widgets.FlumeAgentUp': 'Flume Live',
   'dashboard.widgets.NameNodeRpc': 'NameNode RPC',
-  'dashboard.widgets.JobTrackerRpc': 'JobTracker RPC',
-  'dashboard.widgets.MapReduceSlots': 'MapReduce Slots',
-  'dashboard.widgets.mapSlots': 'Map Slots',
-  'dashboard.widgets.reduceSlots': 'Reduce Slots',
   'dashboard.widgets.nothing': 'No Widget to Add',
   'dashboard.widgets.NameNodeUptime': 'NameNode Uptime',
-  'dashboard.widgets.JobTrackerUptime': 'JobTracker Uptime',
   'dashboard.widgets.HDFSLinks': 'HDFS Links',
   'dashboard.widgets.HDFSLinks.activeNameNode': 'Active NameNode',
   'dashboard.widgets.HDFSLinks.standbyNameNode': 'Standby NameNode',
   'dashboard.widgets.HDFSLinks.standbyNameNodes': '2 Standby NameNodes',
-  'dashboard.widgets.MapReduceLinks': 'MapReduce Links',
   'dashboard.widgets.HBaseLinks': 'HBase Links',
   'dashboard.widgets.HBaseAverageLoad': 'HBase Ave Load',
   'dashboard.widgets.HBaseMasterHeap': 'HBase Master Heap',
@@ -2295,29 +2230,6 @@ Em.I18n.translations = {
   'dashboard.services.yarn.queues': 'Queues',
   'dashboard.services.yarn.queues.msg': '{0} Queues',
 
-  'dashboard.services.mapreduce.summary':'{0} of {1} trackers live, {2} jobs running',
-  'dashboard.services.mapreduce.taskTrackers':'TaskTrackers',
-  'dashboard.services.mapreduce.taskTrackerCounts':'TaskTrackers Status',
-  'dashboard.services.mapreduce.trackers':'Trackers',
-  'dashboard.services.mapreduce.nodes.blacklist':'blacklist',
-  'dashboard.services.mapreduce.nodes.graylist':'graylist',
-  'dashboard.services.mapreduce.slotCapacity':'Total Slots Capacity',
-  'dashboard.services.mapreduce.trackersSummary':'{0}/{1}',
-  'dashboard.services.mapreduce.jobs':'Total Jobs',
-  'dashboard.services.mapreduce.jobsSummary':'{0} submitted / {1} completed',
-  'dashboard.services.mapreduce.mapSlots':'Map Slots',
-  'dashboard.services.mapreduce.mapSlotsSummary':'{0} occupied / {1} reserved',
-  'dashboard.services.mapreduce.reduceSlots':'Reduce Slots',
-  'dashboard.services.mapreduce.tasks.maps':'Tasks: Maps',
-  'dashboard.services.mapreduce.tasks.reduces':'Tasks: Reduces',
-  'dashboard.services.mapreduce.reduceSlotsSummary':'{0} occupied / {1} reserved',
-  'dashboard.services.mapreduce.tasksSummary':'{0} running / {1} waiting',
-  'dashboard.services.mapreduce.slotCapacitySummary':'{0} maps / {1} reduces / {2} avg per node',
-  'dashboard.services.mapreduce.jobTrackerHeap':'JobTracker Heap',
-  'dashboard.services.mapreduce.jobTrackerHeapSummary':'{0} of {1} ({2}% used)',
-  'dashboard.services.mapreduce.jobTrackerUptime':'Job Trackers Uptime',
-  'dashboard.services.mapreduce.chart.label':'Jobs Running',
-
   'dashboard.services.flume.summary.title':'Flume installed on {0} host{1} ({2} agent{3})',
   'dashboard.services.flume.summary.configure':'Configure Agents',
   'dashboard.services.flume.agentsLabel': 'Flume',

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

@@ -39,7 +39,6 @@ require('models/service_config');
 require('models/service_audit');
 require('models/service/hdfs');
 require('models/service/yarn');
-require('models/service/mapreduce');
 require('models/service/mapreduce2');
 require('models/service/hbase');
 require('models/service/flume');

+ 0 - 4
ambari-web/app/models/alert.js

@@ -166,8 +166,6 @@ App.Alert = Em.Object.extend({
     if (this.get('serviceType')) {
       var type = this.get('serviceType').toLowerCase();
       switch (type) {
-        case 'mapreduce':
-          return 'MapReduce';
         case 'hdfs':
           return 'HDFS';
         case 'hbase':
@@ -190,8 +188,6 @@ App.Alert = Em.Object.extend({
     if (this.get('serviceType')) {
       var type = this.get('serviceType').toLowerCase();
       switch (type) {
-        case 'mapreduce':
-          return '#/main/services/MAPREDUCE/summary';
         case 'hdfs':
           return '#/main/services/HDFS/summary';
         case 'hbase':

+ 0 - 103
ambari-web/app/models/quick_links.js

@@ -86,109 +86,6 @@ App.QuickLinks.FIXTURES = [
     default_http_port: 50070,
     default_https_port: 50470
   },
-  {
-    id:5,
-    label:'JobTracker UI',
-    url:'%@://%@:%@/jobtracker.jsp',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/jobtracker.jsp',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:6,
-    label:'Scheduling Info',
-    url:'%@://%@:%@/scheduler',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/scheduler',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:7,
-    label:'Running Jobs',
-    url:'%@://%@:%@/jobtracker.jsp#running_jobs',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/jobtracker.jsp#running_jobs',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:8,
-    label:'Retired Jobs',
-    url:'%@://%@:%@/jobtracker.jsp#retired_jobs',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/jobtracker.jsp#retired_jobs',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:9,
-    label:'JobHistory Server',
-    url:'%@://%@:%@/jobhistoryhome.jsp',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/jobhistoryhome.jsp',
-    http_config: 'mapreduce.history.server.http.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 51111
-  },
-
-  {
-    id:10,
-    label:'JobTracker Logs',
-    url:'%@://%@:%@/logs',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/logs',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:11,
-    label:'JobTracker JMX',
-    url:'%@://%@:%@/jmx',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/jmx',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
-  {
-    id:12,
-    label:'Thread Stacks',
-    url:'%@://%@:%@/stacks',
-    service_id: 'MAPREDUCE',
-    template:'%@://%@:%@/stacks',
-    http_config: 'mapred.job.tracker.http.address',
-    https_config: 'mapred.job.tracker.https.address',
-    site: 'mapred-site',
-    regex: portRegex,
-    default_http_port: 50030,
-    default_https_port: 50035
-  },
   {
     id:13,
     label:'HBase Master UI',

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

@@ -178,7 +178,6 @@ App.Service.Health = {
  */
   App.Service.extendedModel = {
   'HDFS': 'HDFSService',
-  'MAPREDUCE': 'MapReduceService',
   'HBASE': 'HBaseService',
   'YARN': 'YARNService',
   'MAPREDUCE2': 'MapReduce2Service',

+ 0 - 55
ambari-web/app/models/service/mapreduce.js

@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-App.MapReduceService = App.Service.extend({
-  version: DS.attr('string'),
-  jobHistoryServer: function () {
-    return this.get('hostComponents').findProperty('componentName', 'HISTORYSERVER');
-  }.property('hostComponents'),
-  jobTracker: function () {
-    return this.get('hostComponents').findProperty('componentName', 'JOBTRACKER');
-  }.property('hostComponents'),
-  taskTrackersStarted: DS.attr('number'),
-  taskTrackersInstalled: DS.attr('number'),
-  taskTrackersTotal: DS.attr('number'),
-  jobTrackerStartTime: DS.attr('number'),
-  jobTrackerHeapUsed: DS.attr('number'),
-  jobTrackerHeapMax: DS.attr('number'),
-  aliveTrackers: DS.hasMany('App.HostComponent'),
-  blackListTrackers: DS.hasMany('App.HostComponent'),
-  grayListTrackers: DS.hasMany('App.HostComponent'),
-  mapSlots: DS.attr('number'),
-  reduceSlots: DS.attr('number'),
-  jobsSubmitted: DS.attr('number'),
-  jobsCompleted: DS.attr('number'),
-  jobsRunning: DS.attr('number'),
-  mapSlotsOccupied: DS.attr('number'),
-  mapSlotsReserved: DS.attr('number'),
-  reduceSlotsOccupied: DS.attr('number'),
-  reduceSlotsReserved: DS.attr('number'),
-  mapsRunning: DS.attr('number'),
-  mapsWaiting: DS.attr('number'),
-  reducesRunning: DS.attr('number'),
-  reducesWaiting: DS.attr('number'),
-  trackersDecommissioned: DS.attr('number'),
-  jobTrackerCpu: DS.attr('number'),
-  jobTrackerRpc: DS.attr('number')
-});
-
-App.MapReduceService.FIXTURES = [];

+ 0 - 9
ambari-web/app/models/stack_service.js

@@ -175,7 +175,6 @@ App.StackService.FIXTURES = [];
 App.StackService.displayOrder = [
   'HDFS',
   'GLUSTERFS',
-  'MAPREDUCE',
   'MAPREDUCE2',
   'YARN',
   'TEZ',
@@ -246,14 +245,6 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);
       break;
-    case 'MAPREDUCE':
-      serviceConfigCategories.pushObjects([
-        App.ServiceConfigCategory.create({ name: 'HISTORYSERVER', displayName: 'History Server'}),
-        App.ServiceConfigCategory.create({ name: 'JOBTRACKER', displayName: 'JobTracker'}),
-        App.ServiceConfigCategory.create({ name: 'TASKTRACKER', displayName: 'TaskTracker'}),
-        App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
-      ]);
-      break;
     case 'YARN':
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'RESOURCEMANAGER', displayName: 'Resource Manager'}),

+ 0 - 4
ambari-web/app/templates/main/admin/security/notify_security_off_popup.hbs

@@ -18,8 +18,4 @@
 
 <div class="alert">
   {{t admin.security.disable.popup.body}}
-  {{#if view.isMapReduceInstalled}}
-    <br />
-    {{t admin.security.disable.popup.body.warning}}
-  {{/if}}
 </div>

+ 0 - 67
ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs

@@ -1,67 +0,0 @@
-{{!
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-}}
-
-<div class="links">
-  <ul>
-    <li class="thumbnail row">
-      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
-        <i class="icon-remove-sign icon-large"></i>
-      </a>
-      <div class="caption span10"> {{view.title}}</div>
-
-      <div class="widget-content" >
-        <table>
-          <!--jobTracker-->
-          <tr>
-            <td><a href="#" {{action showDetails view.model.jobTracker.host}}>{{t services.service.summary.jobTracker}}</a></td>
-          </tr>
-          <!--taskTrackers-->
-          <tr>
-            <td><a href="#" {{action filterHosts view.component}}>{{view.model.taskTrackersTotal}} {{t dashboard.services.mapreduce.taskTrackers}}</a></td>
-          </tr>
-          <!--jobTracker Web UI-->
-          <tr>
-            <td><a {{bindAttr href="view.webUrl"}} target="_blank">{{t services.service.summary.jobTrackerWebUI}}</a></td>
-          </tr>
-        </table>
-      </div>
-
-      <div class="link-button">
-          {{#if view.model.quickLinks.length}}
-            {{#view App.QuickViewLinks contentBinding="view.model"}}
-              {{#if view.isLoaded}}
-                <div class="btn-group">
-                  <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-                    {{t common.more}}
-                    <span class="caret"></span>
-                  </a>
-                  <ul class="dropdown-menu">
-                    {{#each view.quickLinks}}
-                      <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
-                    {{/each}}
-                  </ul>
-                </div>
-              {{else}}
-                <div class="spinner"></div>
-              {{/if}}
-            {{/view}}
-          {{/if}}
-      </div>
-    </li>
-  </ul>
-</div>

+ 0 - 56
ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs

@@ -1,56 +0,0 @@
-{{!
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-}}
-
-<div class="has-hidden-info">
-  <ul>
-    <li class="thumbnail row" >
-      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
-      <div class="caption span10 slots-caption"> {{view.title}}</div>
-
-      <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
-        <table align="center">
-          {{#each line in view.hiddenInfo}}
-            <tr><td>{{line}}</td></tr>{{/each}}
-        </table>
-      </div>
-
-      {{#if view.isViewExist}}
-        <div class="widget-content row-fluid" id="map-reduce-slots-text" >
-          <ul class="span12">
-            <div class="span3"> {{t dashboard.widgets.mapSlots}}</div>
-            <div class="progress span5" id="map-reduce-slots-bar1">
-              <div class="bar bar-success" {{bindAttr style="view.map_occupied"}}></div>
-              <div class="bar bar-warning" {{bindAttr style="view.map_reserved"}}></div>
-              </div>
-            <div class="span3" id="map-reduce-slots-num1"> {{view.map_display_text}}</div>
-          </ul>
-          <ul class="span12">
-            <div class="span3"> {{t dashboard.widgets.reduceSlots}}</div>
-            <div class="progress span5" id="map-reduce-slots-bar2">
-              <div class="bar bar-success" {{bindAttr style="view.reduce_occupied"}}></div>
-              <div class="bar bar-warning" {{bindAttr style="view.reduce_reserved"}}></div>
-              </div>
-            <div class="span3" id="map-reduce-slots-num2"> {{view.reduce_display_text}}</div>
-          </ul>
-        </div>
-      {{else}}
-        <div class="widget-content-isNA slots-content-isNA" >{{t services.service.summary.notAvailable}}</div>
-      {{/if}}
-    </li>
-  </ul>
-</div>

+ 0 - 81
ambari-web/app/templates/main/service/services/mapreduce.hbs

@@ -1,81 +0,0 @@
-{{!
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-}}
-
-{{view view.dashboardMasterComponentView}}
-
-<!-- TaskTrackers -->
-<tr>
-  <td><a href="#" {{action filterHosts view.taskTrackerComponent}}>{{t dashboard.services.mapreduce.taskTrackers}}</a>
-  </td>
-  <td>
-    <span>
-      {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.taskTrackersStarted" totalComponentsBinding="view.service.taskTrackersTotal"}}
-        {{view.liveComponents}}/{{view.totalComponents}}
-      {{/view}}
-    </span> {{t services.service.summary.TrackersLive}}
-  </td>
-</tr>
-<!-- Job Tracker Uptime -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.jobTrackerUptime}}</td>
-  <td>{{view.jobTrackerUptime}}</td>
-</tr>
-<!-- TaskTracker Counts -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.taskTrackerCounts}}</td>
-  <td>
-    {{view.service.grayListTrackers.length}} {{t dashboard.services.mapreduce.nodes.blacklist}} /
-    {{view.service.blackListTrackers.length}} {{t dashboard.services.mapreduce.nodes.graylist}} /
-    {{view.service.trackersDecommissioned}} {{t dashboard.services.hdfs.nodes.decom}}
-  </td>
-</tr>
-<!-- JobTracker Heap -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.jobTrackerHeap}}</td>
-  <td>{{view.trackersHeapSummary}}</td>
-</tr>
-<!-- Total slots capacity -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.slotCapacity}}</td>
-  <td>{{view.slotsCapacitySummary}}</td>
-</tr>
-<!-- Jobs -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.jobs}}</td>
-  <td>{{view.jobsSummary}}</td>
-</tr>
-<!-- Map Slots -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.mapSlots}}</td>
-  <td>{{view.mapSlotsSummary}}</td>
-</tr>
-<!-- Reduce Slots -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.reduceSlots}}</td>
-  <td>{{view.reduceSlotsSummary}}</td>
-</tr>
-<!-- Tasks:Maps -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.tasks.maps}}</td>
-  <td>{{view.mapTasksSummary}}</td>
-</tr>
-<!-- Tasks:Reduces -->
-<tr>
-  <td>{{t dashboard.services.mapreduce.tasks.reduces}}</td>
-  <td>{{view.reduceTasksSummary}}</td>
-</tr>

+ 0 - 40
ambari-web/app/utils/ajax/ajax.js

@@ -877,46 +877,6 @@ var urls = {
     'mock': '/data/services/metrics/hbase/regionserver_rw_requests.json',
     'testInProduction': true
   },
-  'service.metrics.mapreduce.gc': {
-    'real': '/clusters/{clusterName}/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]',
-    'mock': '/data/services/metrics/mapreduce/gc.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.jobs_status': {
-    'real': '/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}]',
-    'mock': '/data/services/metrics/mapreduce/jobs_status.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.jobs_heap': {
-    'real': '/clusters/{clusterName}/hosts/{jobTrackerNode}/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}]',
-    'mock': '/data/services/metrics/mapreduce/jvm_heap.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.jobs_threads': {
-    'real': '/clusters/{clusterName}/hosts/{jobTrackerNode}/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}]',
-    'mock': '/data/services/metrics/mapreduce/jvm_threads.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.map_slots': {
-    'real': '/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}]',
-    'mock': '/data/services/metrics/mapreduce/map_slots.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.reduce_slots': {
-    'real': '/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}]',
-    'mock': '/data/services/metrics/mapreduce/reduce_slots.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.rpc': {
-    'real': '/clusters/{clusterName}/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]',
-    'mock': '/data/services/metrics/mapreduce/rpc.json',
-    'testInProduction': true
-  },
-  'service.metrics.mapreduce.tasks_running_waiting': {
-    'real': '/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}]',
-    'mock': '/data/services/metrics/mapreduce/tasks_running_waiting.json',
-    'testInProduction': true
-  },
   'service.metrics.hdfs.block_status': {
     'real': '/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/hdfs/block_status.json',

+ 0 - 1
ambari-web/app/utils/batch_scheduled_requests.js

@@ -57,7 +57,6 @@ module.exports = {
     var rollingRestartComponents = {
       HDFS: 'DATANODE',
       YARN: 'NODEMANAGER',
-      MAPREDUCE: 'TASKTRACKER',
       HBASE: 'HBASE_REGIONSERVER',
       STORM: 'SUPERVISOR'
     };

+ 0 - 1
ambari-web/app/utils/helper.js

@@ -366,7 +366,6 @@ App.format = {
     'HISTORYSERVER': 'History Server',
     'HIVE_SERVER': 'HiveServer2',
     'JCE': 'JCE',
-    'MAPREDUCE': 'MapReduce',
     'MAPREDUCE2': 'MapReduce2',
     'MYSQL': 'MySQL',
     'REST': 'REST',

+ 0 - 16
ambari-web/app/views.js

@@ -164,22 +164,15 @@ require('views/main/dashboard/widgets/cluster_metrics_widget');
 require('views/main/dashboard/widgets/namenode_heap');
 require('views/main/dashboard/widgets/namenode_cpu');
 require('views/main/dashboard/widgets/hdfs_capacity');
-require('views/main/dashboard/widgets/jobtracker_heap');
-require('views/main/dashboard/widgets/jobtracker_cpu');
 require('views/main/dashboard/widgets/datanode_live');
-require('views/main/dashboard/widgets/tasktracker_live');
 require('views/main/dashboard/widgets/namenode_rpc');
-require('views/main/dashboard/widgets/jobtracker_rpc');
-require('views/main/dashboard/widgets/mapreduce_slots');
 require('views/main/dashboard/widgets/metrics_memory');
 require('views/main/dashboard/widgets/metrics_network');
 require('views/main/dashboard/widgets/metrics_cpu');
 require('views/main/dashboard/widgets/metrics_load');
 require('views/main/dashboard/widgets/namenode_uptime');
-require('views/main/dashboard/widgets/jobtracker_uptime');
 require('views/main/dashboard/widgets/hdfs_links');
 require('views/main/dashboard/widgets/yarn_links');
-require('views/main/dashboard/widgets/mapreduce_links');
 require('views/main/dashboard/widgets/hbase_links');
 require('views/main/dashboard/widgets/hbase_master_heap');
 require('views/main/dashboard/widgets/hbase_average_load');
@@ -198,7 +191,6 @@ require('views/main/service');
 require('views/main/service/service');
 require('views/main/service/services/hdfs');
 require('views/main/service/services/yarn');
-require('views/main/service/services/mapreduce');
 require('views/main/service/services/mapreduce2');
 require('views/main/service/services/hbase');
 require('views/main/service/services/hive');
@@ -233,14 +225,6 @@ require('views/main/service/info/metrics/yarn/apps_current_states');
 require('views/main/service/info/metrics/yarn/apps_finished_states');
 require('views/main/service/info/metrics/yarn/nms');
 require('views/main/service/info/metrics/yarn/qmr');
-require('views/main/service/info/metrics/mapreduce/gc');
-require('views/main/service/info/metrics/mapreduce/jvm_threads');
-require('views/main/service/info/metrics/mapreduce/jvm_heap');
-require('views/main/service/info/metrics/mapreduce/rpc');
-require('views/main/service/info/metrics/mapreduce/tasks_running_waiting');
-require('views/main/service/info/metrics/mapreduce/jobs_status');
-require('views/main/service/info/metrics/mapreduce/map_slots');
-require('views/main/service/info/metrics/mapreduce/reduce_slots');
 require('views/main/service/info/metrics/hbase/cluster_requests');
 require('views/main/service/info/metrics/hbase/regionserver_rw_requests');
 require('views/main/service/info/metrics/hbase/regionserver_regions');

+ 0 - 3
ambari-web/app/views/common/chart/linear_time.js

@@ -167,8 +167,6 @@ App.ChartLinearTimeView = Ember.View.extend({
 
     var HDFSService = App.HDFSService.find().objectAt(0);
     var nameNodeName = "";
-    var MapReduceService = App.MapReduceService.find().objectAt(0);
-    var jobTrackerNode = MapReduceService ? MapReduceService.get('jobTracker.hostName') : "";
     var YARNService = App.YARNService.find().objectAt(0);
     var resourceManager = YARNService ? YARNService.get('resourceManager.hostName') : "";
     var timeUnit = this.get('timeUnitSeconds');
@@ -181,7 +179,6 @@ App.ChartLinearTimeView = Ember.View.extend({
       stepSeconds: 15,
       hostName: hostName,
       nameNodeName: nameNodeName,
-      jobTrackerNode: jobTrackerNode,
       resourceManager: resourceManager
     };
   },

+ 1 - 28
ambari-web/app/views/common/configs/service_configs_by_category_view.js

@@ -162,36 +162,9 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, {
         }
       }
       else if (changedProperty.get("name") == "user_group") {
-        if (!((this.get("controller.selectedServiceNames").indexOf("MAPREDUCE") >= 0) || (this.get("controller.selectedServiceNames").indexOf("YARN") >= 0))) {
+        if (!(this.get("controller.selectedServiceNames").indexOf("YARN") >= 0)) {
           return;
         }
-        if (this.get("controller.selectedServiceNames").indexOf("MAPREDUCE") >= 0) {
-          curConfigs = stepConfigs.findProperty("serviceName", "MAPREDUCE").get("configs");
-          if (newValue != curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value")) {
-            this.affectedProperties.push(
-              {
-                serviceName: "MAPREDUCE",
-                propertyName: "mapreduce.tasktracker.group",
-                propertyDisplayName: "mapreduce.tasktracker.group",
-                newValue: newValue,
-                curValue: curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value"),
-                changedPropertyName: "user_group"
-              }
-            )
-          }
-          if ($.trim(newValue) != $.trim(curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"))) {
-            this.affectedProperties.push(
-              {
-                serviceName: "MAPREDUCE",
-                propertyName: "mapreduce.cluster.administrators",
-                propertyDisplayName: "mapreduce.cluster.administrators",
-                newValue: " " + $.trim(newValue),
-                curValue: curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"),
-                changedPropertyName: "user_group"
-              }
-            );
-          }
-        }
         if (this.get("controller.selectedServiceNames").indexOf("MAPREDUCE2") >= 0) {
           curConfigs = stepConfigs.findProperty("serviceName", "MAPREDUCE2").get("configs");
           if ($.trim(newValue) != $.trim(curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"))) {

+ 3 - 20
ambari-web/app/views/common/quick_view_link_view.js

@@ -131,25 +131,13 @@ App.QuickViewLinks = Em.View.extend({
       }];
       this.set('quickLinks', quickLinks);
       this.set('isLoaded', true);
-      /**
-       * MAPREDUCE is only service that use 2 different masters in quick links
-       * so we must work with this service as with one-master-service but set up
-       * two hosts for two components. (JOBTRACKER and HISTORYSERVER)
-       */
-    } else if (hosts.length == 1 || this.get('content.serviceName') == "MAPREDUCE") {
+    } else if (hosts.length == 1) {
 
       quickLinks = this.get('content.quickLinks').map(function (item) {
         var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties());
         if (item.get('template')) {
           var port = item.get('http_config') && self.setPort(item, protocol);
-          /**
-           * setting other host for mapreduce (only for MAPREDUCE and JobHistory Server)!!!
-           */
-          if (self.get('content.serviceName') == "MAPREDUCE" && item.get('label') == "JobHistory Server") {
-            item.set('url', item.get('template').fmt(protocol, hosts[1], port));
-          } else {
-            item.set('url', item.get('template').fmt(protocol, hosts[0], port));
-          }
+          item.set('url', item.get('template').fmt(protocol, hosts[0], port));
         }
         return item;
       });
@@ -273,10 +261,6 @@ App.QuickViewLinks = Em.View.extend({
           hosts[0] = this.findComponentHost(response.items, 'RESOURCEMANAGER');
         }
         break;
-      case "MAPREDUCE":
-        hosts[0] = this.findComponentHost(response.items, "JOBTRACKER");
-        hosts[1] = this.findComponentHost(response.items, "HISTORYSERVER");
-        break;
       case "STORM":
         hosts[0] = this.findComponentHost(response.items, "STORM_UI_SERVER");
         break;
@@ -295,7 +279,7 @@ App.QuickViewLinks = Em.View.extend({
    * becides GANGLIA, NAGIOS, YARN, MAPREDUCE2. These properties use
    * their properties to know protocol
    */
-  servicesSupportsHttps: ["HDFS", "HBASE", "MAPREDUCE"],
+  servicesSupportsHttps: ["HDFS", "HBASE"],
 
   /**
    * setProtocol - if cluster is secure for some services (GANGLIA, NAGIOS, MAPREDUCE2, YARN and servicesSupportsHttps)
@@ -380,7 +364,6 @@ App.QuickViewLinks = Em.View.extend({
       case "hdfs":
       case "yarn":
       case "mapreduce2":
-      case "mapreduce":
       case "hbase":
       case "oozie":
       case "ganglia":

+ 40 - 68
ambari-web/app/views/main/dashboard/widgets.js

@@ -118,60 +118,53 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
   setInitPrefObject: function () {
     //in case of some service not installed
     var visibleFull = [
-      '2', '4', '8', '10',
-      '17', '11', '12', '13', '14',
-      '18', '1', '6', '5', '9',
-      '3', '7', '15', '16', '20',
-      '19', '21', '23',
-      '24', '25', '26', '27', '30', // all yarn
-      '28', // storm
-      '29' // flume
+      '2', '4', '11', //hdfs
+      '6', '7', '8', '9', //host metrics
+      '1', '5', '3',  '10', //hdfs
+      '13', '12', '14', '16', //hbase
+      '17', '18', '19', '20', '23', // all yarn
+      '21', // storm
+      '22' // flume
     ]; // all in order
     var hiddenFull = [
-      ['22', 'Region In Transition']
+      ['15', 'Region In Transition']
     ];
 
     // Display widgets for host metrics if the stack definition has a host metrics service to display it.
     if (this.get('host_metrics_model') == null) {
-      var hostMetrics = ['11', '12', '13', '14'];
+      var hostMetrics = ['6', '7', '8', '9'];
       hostMetrics.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
     }
 
     if (this.get('hdfs_model') == null) {
-      var hdfs = ['1', '2', '3', '4', '5', '15', '17'];
+      var hdfs = ['1', '2', '3', '4', '5', '10', '11'];
       hdfs.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
     }
-    if (this.get('mapreduce_model') == null) {
-      var map = ['6', '7', '8', '9', '10', '16', '18'];
-      map.forEach(function (item) {
-        visibleFull = visibleFull.without(item);
-      }, this);
-    }
     if (this.get('hbase_model') == null) {
-      var hbase = ['19', '20', '21', '23'];
+      var hbase = ['12', '13', '14', '16'];
       hbase.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
       hiddenFull = [];
     }
     if (this.get('yarn_model') == null) {
-      var yarn = ['24', '25', '26', '27', '30'];
+      var yarn = ['17', '18', '19', '20', '23'];
       yarn.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
     }
     if (this.get('storm_model') == null) {
-      var storm = ['28'];
+      var storm = ['21'];
       storm.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
     }
     if (this.get('flume_model') == null) {
-      var flume = ['29'];
+      var flume = ['22'];
       flume.forEach(function (item) {
         visibleFull = visibleFull.without(item);
       }, this);
@@ -185,8 +178,6 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
 
   hdfs_model: null,
 
-  mapreduce_model: null,
-
   mapreduce2_model: null,
 
   yarn_model: null,
@@ -386,7 +377,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
 
     // check each service, find out the newly added service and already deleted service
     if (this.get('hdfs_model') != null) {
-      var hdfs = ['1', '2', '3', '4', '5', '15', '17'];
+      var hdfs = ['1', '2', '3', '4', '5', '10', '11'];
       hdfs.forEach(function (item) {
         toDelete = self.removeWidget(toDelete, item);
       }, this);
@@ -394,7 +385,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
 
     // Display widgets for host metrics if the stack definition has a host metrics service to display it.
     if (this.get('host_metrics_model') != null) {
-      var hostMetrics = ['11', '12', '13', '14'];
+      var hostMetrics = ['6', '7', '8', '9'];
       var flag = self.containsWidget(toDelete, hostMetrics[0]);
       if (flag) {
         hostMetrics.forEach(function (item) {
@@ -405,19 +396,8 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       }
     }
 
-    if (this.get('mapreduce_model') != null) {
-      var map = ['6', '7', '8', '9', '10', '16', '18'];
-      var flag = self.containsWidget(toDelete, map[0]);
-      if (flag) {
-        map.forEach(function (item) {
-          toDelete = self.removeWidget(toDelete, item);
-        }, this);
-      } else {
-        toAdd = toAdd.concat(map);
-      }
-    }
     if (this.get('hbase_model') != null) {
-      var hbase = ['19', '20', '21', '22', '23'];
+      var hbase = ['12', '13', '14', '15', '16'];
       var flag = self.containsWidget(toDelete, hbase[0]);
       if (flag) {
         hbase.forEach(function (item) {
@@ -428,7 +408,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       }
     }
     if (this.get('yarn_model') != null) {
-      var yarn = ['24', '25', '26', '27', '30'];
+      var yarn = ['17', '18', '19', '20', '23'];
       var flag = self.containsWidget(toDelete, yarn[0]);
       if (flag) {
         yarn.forEach(function (item) {
@@ -439,7 +419,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       }
     }
     if (this.get('storm_model') != null) {
-      var storm = ['28'];
+      var storm = ['21'];
       var flag = self.containsWidget(toDelete, storm[0]);
       if (flag) {
         storm.forEach(function (item) {
@@ -450,7 +430,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       }
     }
     if (this.get('flume_model') != null) {
-      var flume = ['29'];
+      var flume = ['22'];
       var flag = self.containsWidget(toDelete, flume[0]);
       if (flag) {
         flume.forEach(function (item) {
@@ -492,31 +472,24 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       '3': App.NameNodeCpuPieChartView,
       '4': App.DataNodeUpView,
       '5': App.NameNodeRpcView,
-      '6': App.JobTrackerHeapPieChartView,
-      '7': App.JobTrackerCpuPieChartView,
-      '8': App.TaskTrackerUpView,
-      '9': App.JobTrackerRpcView,
-      '10': App.MapReduceSlotsView,
-      '11': App.ChartClusterMetricsMemoryWidgetView,
-      '12': App.ChartClusterMetricsNetworkWidgetView,
-      '13': App.ChartClusterMetricsCPUWidgetView,
-      '14': App.ChartClusterMetricsLoadWidgetView,
-      '15': App.NameNodeUptimeView,
-      '16': App.JobTrackerUptimeView,
-      '17': App.HDFSLinksView,
-      '18': App.MapReduceLinksView,
-      '19': App.HBaseLinksView,
-      '20': App.HBaseMasterHeapPieChartView,
-      '21': App.HBaseAverageLoadView,
-      '22': App.HBaseRegionsInTransitionView,
-      '23': App.HBaseMasterUptimeView,
-      '24': App.ResourceManagerHeapPieChartView,
-      '25': App.ResourceManagerUptimeView,
-      '26': App.NodeManagersLiveView,
-      '27': App.YARNMemoryPieChartView,
-      '28': App.SuperVisorUpView,
-      '29': App.FlumeAgentUpView,
-      '30': App.YARNLinksView
+      '6': App.ChartClusterMetricsMemoryWidgetView,
+      '7': App.ChartClusterMetricsNetworkWidgetView,
+      '8': App.ChartClusterMetricsCPUWidgetView,
+      '9': App.ChartClusterMetricsLoadWidgetView,
+      '10': App.NameNodeUptimeView,
+      '11': App.HDFSLinksView,
+      '12': App.HBaseLinksView,
+      '13': App.HBaseMasterHeapPieChartView,
+      '14': App.HBaseAverageLoadView,
+      '15': App.HBaseRegionsInTransitionView,
+      '16': App.HBaseMasterUptimeView,
+      '17': App.ResourceManagerHeapPieChartView,
+      '18': App.ResourceManagerUptimeView,
+      '19': App.NodeManagersLiveView,
+      '20': App.YARNMemoryPieChartView,
+      '21': App.SuperVisorUpView,
+      '22': App.FlumeAgentUpView,
+      '23': App.YARNLinksView
     }, id);
   },
 
@@ -532,9 +505,8 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
     dashboardVersion: 'new',
     visible: [],
     hidden: [],
-    threshold: {1: [80, 90], 2: [85, 95], 3: [90, 95], 4: [80, 90], 5: [1000, 3000], 6: [70, 90], 7: [90, 95], 8: [50, 75], 9: [30000, 120000],
-      10: [], 11: [], 12: [], 13: [], 14: [], 15: [], 16: [], 17: [], 18: [], 19: [], 20: [70, 90], 21: [10, 19.2], 22: [3, 10], 23: [],
-      24: [70, 90], 25: [], 26: [50, 75], 27: [50, 75], 28: [85, 95], 29: [85, 95], 30: []} // id:[thresh1, thresh2]
+    threshold: {1: [80, 90], 2: [85, 95], 3: [90, 95], 4: [80, 90], 5: [1000, 3000], 6: [], 7: [], 8: [], 9: [], 10: [], 11: [], 12: [], 13: [70, 90], 14: [10, 19.2], 15: [3, 10], 16: [],
+      17: [70, 90], 18: [], 19: [50, 75], 20: [50, 75], 21: [85, 95], 22: [85, 95], 23: []} // id:[thresh1, thresh2]
   }),
 
   /**

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.HBaseAverageLoadView = App.TextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.HBaseAverageLoad'),
-  id: '21',
+  id: '14',
 
   model_type: 'hbase',
   hiddenInfo: function () {

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_links.js

@@ -22,7 +22,7 @@ App.HBaseLinksView = App.LinkDashboardWidgetView.extend({
 
   templateName: require('templates/main/dashboard/widgets/hbase_links'),
   title: Em.I18n.t('dashboard.widgets.HBaseLinks'),
-  id: '19',
+  id: '12',
 
   model_type: 'hbase',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js

@@ -22,7 +22,7 @@ var numberUtils = require('utils/number_utils');
 App.HBaseMasterHeapPieChartView = App.PieChartDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.HBaseMasterHeap'),
-  id: '20',
+  id: '13',
 
   model_type: 'hbase',
   modelFieldMax: 'heapMemoryMax',

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.HBaseMasterUptimeView = App.UptimeTextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.HBaseMasterUptime'),
-  id: '23',
+  id: '16',
 
   model_type: 'hbase',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_regions_in_transition.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.HBaseRegionsInTransitionView = App.TextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.HBaseRegionsInTransition'),
-  id: '22',
+  id: '15',
 
   model_type: 'hbase',
   hiddenInfo: function () {

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hdfs_links.js

@@ -22,7 +22,7 @@ App.HDFSLinksView = App.LinkDashboardWidgetView.extend({
 
   templateName: require('templates/main/dashboard/widgets/hdfs_links'),
   title: Em.I18n.t('dashboard.widgets.HDFSLinks'),
-  id: '17',
+  id: '11',
 
   model_type: 'hdfs',
 

+ 0 - 65
ambari-web/app/views/main/dashboard/widgets/jobtracker_cpu.js

@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.JobTrackerCpuPieChartView = App.PieChartDashboardWidgetView.extend({
-
-  title: Em.I18n.t('dashboard.widgets.JobTrackerCpu'),
-  id: '7',
-
-  model_type: 'mapreduce',
-
-  widgetHtmlId: 'widget-jt-cpu',
-
-  modelFieldUsed: 'jobTrackerCpu',
-
-  didInsertElement: function() {
-    this._super();
-    this.calc();
-  },
-
-  calcHiddenInfo: function() {
-    var value = this.get('model').get(this.get('modelFieldUsed'));
-    var obj1;
-    if( value == null) {
-      obj1 = Em.I18n.t('services.service.summary.notAvailable');
-    }
-    else {
-      value = value >= 100 ? 100: value;
-      obj1 = (value + 0).toFixed(2) + '%';
-    }
-    var result = [];
-    result.pushObject(obj1);
-    result.pushObject('CPU wait I/O');
-    return result;
-  },
-
-  calcIsPieExists: function() {
-    return (this.get('model').get(this.get('modelFieldUsed')) != null);
-  },
-
-  calcDataForPieChart: function() {
-    var value = this.get('model').get(this.get('modelFieldUsed'));
-    value = value >= 100 ? 100: value;
-    var percent = (value + 0).toFixed(1);
-    var percent_precise = (value + 0).toFixed(2);
-    return [ percent, percent_precise];
-  }
-
-});

+ 0 - 45
ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js

@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-var numberUtils = require('utils/number_utils');
-
-App.JobTrackerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
-
-  title: Em.I18n.t('dashboard.widgets.JobTrackerHeap'),
-  id: '6',
-
-  model_type: 'mapreduce',
-  modelFieldMax: 'jobTrackerHeapMax',
-  modelFieldUsed: 'jobTrackerHeapUsed',
-
-  widgetHtmlId: 'widget-jt-heap',
-
-  getUsed: function() {
-    return (this.get('model').get(this.get('modelFieldUsed')) / (1024 * 1024)) || 0;
-  },
-
-  getMax: function() {
-    return (this.get('model').get(this.get('modelFieldMax')) / (1024 * 1024)) || 0;
-  },
-
-  didInsertElement: function() {
-    this._super();
-    this.calc();
-  }
-});

+ 0 - 163
ambari-web/app/views/main/dashboard/widgets/jobtracker_rpc.js

@@ -1,163 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.JobTrackerRpcView = App.TextDashboardWidgetView.extend({
-
-  title: Em.I18n.t('dashboard.widgets.JobTrackerRpc'),
-  id:'9',
-
-  model_type: 'mapreduce',
-  hiddenInfo: function (){
-    var result = [];
-    result.pushObject(this.get('content') + ' average RPC');
-    result.pushObject('queue wait time');
-    return result;
-  }.property('model.jobTrackerRpc'),
-
-  thresh1: 0.5,
-  thresh2: 2,
-  maxValue: 'infinity',
-
-  isGreen: function () {
-    return (this.get('data') <= this.get('thresh1'));
-  }.property('data','thresh1'),
-
-  isRed: function () {
-    return (this.get('data') > this.get('thresh2'));
-  }.property('data','thresh2'),
-
-  data: function (){
-    if (this.get('model.jobTrackerRpc')) {
-      return (this.get('model.jobTrackerRpc')).toFixed(2);
-    } else {
-      if (this.get('model.jobTrackerRpc') == 0) {
-        return 0;
-      } else {
-        return null;
-      }
-    }
-  }.property('model.jobTrackerRpc'),
-
-  content: function () {
-    if (this.get('data') || this.get('data') == 0) {
-      return this.get('data') + " ms";
-    } else {
-      return Em.I18n.t('services.service.summary.notAvailable');
-    }
-  }.property('model.jobTrackerRpc'),
-
-  editWidget: function (event) {
-    var parent = this;
-    var configObj = Ember.Object.create({
-      thresh1: parent.get('thresh1') + '',
-      thresh2: parent.get('thresh2') + '',
-      hintInfo: Em.I18n.t('dashboard.widgets.hintInfo.hint3'),
-      isThresh1Error: false,
-      isThresh2Error: false,
-      errorMessage1: "",
-      errorMessage2: "",
-      maxValue: 'infinity',
-      observeNewThresholdValue: function () {
-        var thresh1 = this.get('thresh1');
-        var thresh2 = this.get('thresh2');
-        if (thresh1.trim() != "") {
-          if (isNaN(thresh1) || thresh1 < 0) {
-            this.set('isThresh1Error', true);
-            this.set('errorMessage1', 'Invalid! Enter a number larger than 0');
-          } else if (this.get('isThresh2Error') === false && parseFloat(thresh2)<= parseFloat(thresh1)) {
-            this.set('isThresh1Error', true);
-            this.set('errorMessage1', 'Threshold 1 should be smaller than threshold 2 !');
-          } else {
-            this.set('isThresh1Error', false);
-            this.set('errorMessage1', '');
-          }
-        } else {
-          this.set('isThresh1Error', true);
-          this.set('errorMessage1', 'This is required');
-        }
-
-        if (thresh2.trim() != "") {
-          if (isNaN(thresh2) || thresh2 < 0) {
-            this.set('isThresh2Error', true);
-            this.set('errorMessage2', 'Invalid! Enter a number larger than 0');
-          } else {
-            this.set('isThresh2Error', false);
-            this.set('errorMessage2', '');
-          }
-        } else{
-          this.set('isThresh2Error', true);
-          this.set('errorMessage2', 'This is required');
-        }
-      }.observes('thresh1', 'thresh2')
-    });
-
-    var browserVerion = this.getInternetExplorerVersion();
-    App.ModalPopup.show({
-      header: Em.I18n.t('dashboard.widgets.popupHeader'),
-      classNames: [ 'sixty-percent-width-modal-edit-widget'],
-      bodyClass: Ember.View.extend({
-        templateName: require('templates/main/dashboard/edit_widget_popup'),
-        configPropertyObj: configObj
-      }),
-      primary: Em.I18n.t('common.apply'),
-      onPrimary: function () {
-        configObj.observeNewThresholdValue();
-        if (!configObj.isThresh1Error && !configObj.isThresh2Error) {
-          parent.set('thresh1', parseFloat(configObj.get('thresh1')) );
-          parent.set('thresh2', parseFloat(configObj.get('thresh2')) );
-          if (!App.get('testMode')) {
-            // save to persist
-            var big_parent = parent.get('parentView');
-            big_parent.getUserPref(big_parent.get('persistKey'));
-            var oldValue = big_parent.get('currentPrefObject');
-            oldValue.threshold[parseInt(parent.id)] = [configObj.get('thresh1'), configObj.get('thresh2')];
-            big_parent.postUserPref(big_parent.get('persistKey'),oldValue);
-          }
-
-          this.hide();
-        }
-      },
-
-      didInsertElement: function () {
-        var colors = ['#95A800', '#FF8E00', '#B80000']; //color green, orange ,red
-        var handlers = [33, 66]; //fixed value
-
-        if (browserVerion == -1 || browserVerion > 9) {
-          configObj.set('isIE9', false);
-          configObj.set('isGreenOrangeRed', true);
-          $("#slider-range").slider({
-            range:true,
-            disabled:true,
-            min: 0,
-            max: 100,
-            values: handlers,
-            create: function (event, ui) {
-              parent.updateColors(handlers, colors);
-            }
-          });
-        } else {
-          configObj.set('isIE9', true);
-          configObj.set('isGreenOrangeRed', true);
-        }
-      }
-    });
-  }
-
-});

+ 0 - 36
ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js

@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.JobTrackerUptimeView = App.UptimeTextDashboardWidgetView.extend({
-
-  title: Em.I18n.t('dashboard.widgets.JobTrackerUptime'),
-  id: '16',
-
-  model_type: 'mapreduce',
-
-  component: 'JobTracker',
-  modelField: 'jobTrackerStartTime',
-
-  didInsertElement: function() {
-    this._super();
-    this.calc();
-  }
-
-});

+ 0 - 40
ambari-web/app/views/main/dashboard/widgets/mapreduce_links.js

@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.MapReduceLinksView = App.LinkDashboardWidgetView.extend({
-
-  templateName: require('templates/main/dashboard/widgets/mapreduce_links'),
-  title: Em.I18n.t('dashboard.widgets.MapReduceLinks'),
-  id: '18',
-
-  model_type: 'mapreduce',
-
-  port: '50030',
-
-  componentName: 'TASKTRACKER',
-
-  modelField: 'jobTracker',
-
-  didInsertElement: function() {
-    this._super();
-    this.calc();
-  }
-
-});

+ 0 - 87
ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js

@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.MapReduceSlotsView = App.DashboardWidgetView.extend({
-
-  templateName: require('templates/main/dashboard/widgets/mapreduce_slots'),
-  title: Em.I18n.t('dashboard.widgets.MapReduceSlots'),
-  id:'10',
-
-  isProgressBar: true,
-  model_type: 'mapreduce',
-  hiddenInfo: function () {
-    var result = [];
-    if(this.get('isViewExist')) {
-      var line1 = "Map: " + this.get('model.mapSlotsOccupied') + " Occupied / " + this.get('model.mapSlotsReserved') + " Reserved / " + this.get('model.mapSlots') + " Total";
-      result.pushObject(line1);
-      var line2 = "Reduce: " + this.get('model.reduceSlotsOccupied') + " Occupied / " + this.get('model.reduceSlotsReserved') + " Reserved / " + this.get('model.reduceSlots') + " Total";
-      result.pushObject(line2);
-    }
-    else {
-      result.pushObject('MapReduce Not Started');
-    }
-    return result;
-  }.property('isViewExist', 'map_display_text', 'reduce_display_text'),
-  isViewExist: function () {
-    return this.get('model.mapSlotsOccupied') != null && this.get('model.mapSlotsReserved') != null && this.get('model.reduceSlotsOccupied') != null && this.get('model.reduceSlotsReserved') != null;
-  }.property('model.mapSlotsReserved', 'model.mapSlotsOccupied', 'model.reduceSlotsReserved', 'model.reduceSlotsOccupied'),
-
-  map_occupied: function () {
-    if (this.get('model.mapSlotsOccupied')) {
-      return "width: " + ((this.get('model.mapSlotsOccupied'))*100/(this.get('model.mapSlots'))).toString() + "%";
-    } else {
-      return "width: 0%";
-    }
-  }.property('model.mapSlotsOccupied','model.mapSlots'),
-  map_reserved: function () {
-    if (this.get('model.mapSlotsReserved')) {
-      return "width: " + ((this.get('model.mapSlotsReserved'))*100/(this.get('model.mapSlots'))).toString() + "%";
-    } else {
-      return "width: 0%";
-    }
-  }.property('model.mapSlotsReserved','model.mapSlots'),
-  map_display_text: function () {
-    return this.get('model.mapSlotsOccupied') + "/" + this.get('model.mapSlotsReserved') + "/" + this.get('model.mapSlots');
-  }.property('model.mapSlotsReserved','model.mapSlotsOccupied','model.mapSlots'),
-
-
-  reduce_occupied: function () {
-    if (this.get('model.reduceSlotsOccupied')) {
-      return "width: " + ((this.get('model.reduceSlotsOccupied'))*100/(this.get('model.reduceSlots'))).toString() + "%";
-    } else {
-      return "width: 0%";
-    }
-  }.property('model.reduceSlotsOccupied','model.reduceSlots'),
-  reduce_reserved: function () {
-    if (this.get('model.reduceSlotsReserved')) {
-      return "width: " + ((this.get('model.reduceSlotsReserved'))*100/(this.get('model.reduceSlots'))).toString() + "%";
-    } else {
-      return "width: 0%";
-    }
-  }.property('model.reduceSlotsReserved','model.reduceSlots'),
-  reduce_display_text: function () {
-    return this.get('model.reduceSlotsOccupied') + "/" + this.get('model.reduceSlotsReserved') + "/" + this.get('model.reduceSlots');
-  }.property('model.reduceSlotsReserved','model.reduceSlotsOccupied','model.reduceSlots')
-
-});
-
-App.MapReduceSlotsView.reopenClass({
-  class: 'span4p8'
-});

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/metrics_cpu.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.ChartClusterMetricsCPUWidgetView = App.ClusterMetricsDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.clusterMetrics.cpu'),
-  id: '13',
+  id: '8',
 
   content: App.ChartClusterMetricsCPU.extend({
     noTitleUnderGraph: true,

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/metrics_load.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.ChartClusterMetricsLoadWidgetView = App.ClusterMetricsDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.clusterMetrics.load'),
-  id: '14',
+  id: '9',
 
   content: App.ChartClusterMetricsLoad.extend({
     noTitleUnderGraph: true,

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/metrics_memory.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.ChartClusterMetricsMemoryWidgetView = App.ClusterMetricsDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.clusterMetrics.memory'),
-  id: '11',
+  id: '6',
 
   content: App.ChartClusterMetricsMemory.extend({
     noTitleUnderGraph: true,

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/metrics_network.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.ChartClusterMetricsNetworkWidgetView = App.ClusterMetricsDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.clusterMetrics.network'),
-  id: '12',
+  id: '7',
 
   content: App.ChartClusterMetricsNetwork.extend({
     noTitleUnderGraph: true,

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.NameNodeUptimeView = App.UptimeTextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.NameNodeUptime'),
-  id: '15',
+  id: '10',
 
   model_type: 'hdfs',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/node_managers_live.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.NodeManagersLiveView = App.TextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.NodeManagersLive'),
-  id: '26',
+  id: '19',
 
   model_type: 'yarn',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js

@@ -22,7 +22,7 @@ var numberUtils = require('utils/number_utils');
 App.ResourceManagerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.ResourceManagerHeap'),
-  id: '24',
+  id: '17',
 
   model_type: 'yarn',
   modelFieldMax: 'jvmMemoryHeapMax',

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/resource_manager_uptime.js

@@ -22,7 +22,7 @@ var date = require('utils/date');
 App.ResourceManagerUptimeView = App.UptimeTextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.ResourceManagerUptime'),
-  id: '25',
+  id: '18',
 
   model_type: 'yarn',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/supervisor_live.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.SuperVisorUpView = App.TextDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.SuperVisorUp'),
-  id: '28',
+  id: '21',
 
   isPieChart: false,
   isText: true,

+ 0 - 166
ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js

@@ -1,166 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-App.TaskTrackerUpView = App.TextDashboardWidgetView.extend({
-
-  title: Em.I18n.t('dashboard.widgets.TaskTrackerUp'),
-  id: '8',
-
-  model_type: 'mapreduce',
-
-  hiddenInfo: function () {
-    var svc = this.get('model');
-    var liveCount = svc.get('taskTrackersStarted');
-    var totalCount = svc.get('taskTrackersTotal');
-    var result = [];
-    result.pushObject(liveCount + " live");
-    result.pushObject(totalCount + " total");
-    return result;
-  }.property('model.taskTrackersTotal', 'model.taskTrackersStarted'),
-
-  thresh1: 40,
-  thresh2: 70,
-  maxValue: 100,
-
-  data: function () {
-    if (!this.get('model.taskTrackersTotal')) {
-      return -1;
-    } else {
-      return (this.get('model.taskTrackersStarted') / this.get('model.taskTrackersTotal')).toFixed(2) * 100;
-    }
-  }.property('model.taskTrackersTotal', 'model.taskTrackersStarted'),
-
-  content: function () {
-    return this.get('model.taskTrackersStarted') + "/" + this.get('model.taskTrackersTotal');
-  }.property('model.taskTrackersTotal', 'model.taskTrackersStarted'),
-
-  editWidget: function (event) {
-    var parent = this;
-    var max_tmp =  parseFloat(parent.get('maxValue'));
-    var configObj = Ember.Object.create({
-      thresh1: parent.get('thresh1') + '',
-      thresh2: parent.get('thresh2') + '',
-      hintInfo: Em.I18n.t('dashboard.widgets.hintInfo.hint1').format(max_tmp),
-      isThresh1Error: false,
-      isThresh2Error: false,
-      errorMessage1: "",
-      errorMessage2: "",
-      maxValue: max_tmp,
-      observeNewThresholdValue: function () {
-        var thresh1 = this.get('thresh1');
-        var thresh2 = this.get('thresh2');
-        if (thresh1.trim() != "") {
-          if (isNaN(thresh1) || thresh1 > max_tmp || thresh1 < 0) {
-            this.set('isThresh1Error', true);
-            this.set('errorMessage1', 'Invalid! Enter a number between 0 - ' + max_tmp);
-          } else if (this.get('isThresh2Error') === false && parseFloat(thresh2)<= parseFloat(thresh1)){
-            this.set('isThresh1Error', true);
-            this.set('errorMessage1', 'Threshold 1 should be smaller than threshold 2 !');
-          } else {
-            this.set('isThresh1Error', false);
-            this.set('errorMessage1', '');
-          }
-        } else {
-          this.set('isThresh1Error', true);
-          this.set('errorMessage1', 'This is required');
-        }
-
-        if (thresh2.trim() != "") {
-          if (isNaN(thresh2) || thresh2 > max_tmp || thresh2 < 0) {
-            this.set('isThresh2Error', true);
-            this.set('errorMessage2', 'Invalid! Enter a number between 0 - ' + max_tmp);
-          } else {
-            this.set('isThresh2Error', false);
-            this.set('errorMessage2', '');
-          }
-        } else {
-          this.set('isThresh2Error', true);
-          this.set('errorMessage2', 'This is required');
-        }
-
-        // update the slider handles and color
-        if (this.get('isThresh1Error') === false && this.get('isThresh2Error') === false) {
-          $("#slider-range").slider('values', 0 , parseFloat(thresh1));
-          $("#slider-range").slider('values', 1 , parseFloat(thresh2));
-        }
-      }.observes('thresh1', 'thresh2')
-    });
-
-    var browserVerion = this.getInternetExplorerVersion();
-    App.ModalPopup.show({
-      header: Em.I18n.t('dashboard.widgets.popupHeader'),
-      classNames: [ 'sixty-percent-width-modal-edit-widget'],
-      bodyClass: Ember.View.extend({
-        templateName: require('templates/main/dashboard/edit_widget_popup'),
-        configPropertyObj: configObj
-      }),
-      primary: Em.I18n.t('common.apply'),
-      onPrimary: function() {
-        configObj.observeNewThresholdValue();
-        if (!configObj.isThresh1Error && !configObj.isThresh2Error) {
-          parent.set('thresh1', parseFloat(configObj.get('thresh1')) );
-          parent.set('thresh2', parseFloat(configObj.get('thresh2')) );
-          if (!App.get('testMode')) {
-            //save to persit
-            var big_parent = parent.get('parentView');
-            big_parent.getUserPref(big_parent.get('persistKey'));
-            var oldValue = big_parent.get('currentPrefObject');
-            oldValue.threshold[parseInt(parent.id)] = [configObj.get('thresh1'), configObj.get('thresh2')];
-            big_parent.postUserPref(big_parent.get('persistKey'),oldValue);
-          }
-          this.hide();
-        }
-      },
-
-      didInsertElement: function () {
-        var handlers = [configObj.get('thresh1'), configObj.get('thresh2')];
-        var colors = ['#B80000', '#FF8E00', '#95A800']; //color red, orange, green
-
-        if (browserVerion == -1 || browserVerion > 9) {
-          configObj.set('isIE9', false);
-          configObj.set('isGreenOrangeRed', false);
-          $("#slider-range").slider({
-            range: true,
-            min: 0,
-            max: max_tmp,
-            values: handlers,
-            create: function (event, ui) {
-              parent.updateColors(handlers, colors);
-            },
-            slide: function (event, ui) {
-              parent.updateColors(ui.values, colors);
-              configObj.set('thresh1', ui.values[0] + '');
-              configObj.set('thresh2', ui.values[1] + '');
-            },
-            change: function (event, ui) {
-              parent.updateColors(ui.values, colors);
-            }
-          });
-
-
-        } else {
-          configObj.set('isIE9', true);
-          configObj.set('isGreenOrangeRed', false);
-        }
-      }
-    });
-  }
-
-});

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/yarn_links.js

@@ -21,7 +21,7 @@ var App = require('app');
 App.YARNLinksView = App.LinkDashboardWidgetView.extend({
   templateName: require('templates/main/dashboard/widgets/yarn_links'),
   title: Em.I18n.t('dashboard.widgets.YARNLinks'),
-  id: '30',
+  id: '23',
 
   model_type: 'yarn',
 

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/yarn_memory.js

@@ -22,7 +22,7 @@ var numberUtils = require('utils/number_utils');
 App.YARNMemoryPieChartView = App.PieChartDashboardWidgetView.extend({
 
   title: Em.I18n.t('dashboard.widgets.YARNMemory'),
-  id: '27',
+  id: '20',
 
   widgetHtmlId: 'widget-yarn-memory',
   model_type: 'yarn',

+ 0 - 6
ambari-web/app/views/main/host/hosts_table_menu_view.js

@@ -50,12 +50,6 @@ App.HostTableMenuView = Em.View.extend({
       masterComponentName: 'HBASE_MASTER',
       componentNameFormatted: Em.I18n.t('dashboard.services.hbase.regionServers')
     }),
-    Em.Object.create({
-      serviceName: 'MAPREDUCE',
-      componentName: 'TASKTRACKER',
-      masterComponentName: 'JOBTRACKER',
-      componentNameFormatted: Em.I18n.t('dashboard.services.mapreduce.taskTrackers')
-    }),
     Em.Object.create({
       serviceName: 'STORM',
       componentName: 'SUPERVISOR',

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

@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_GC = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-gc",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.gc'),
-  yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
-
-  ajaxIndex: 'service.metrics.mapreduce.gc',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.jvm) {
-      for ( var name in jsonData.metrics.jvm) {
-        var displayName;
-        var seriesData = jsonData.metrics.jvm[name];
-        switch (name) {
-          case "gcTimeMillis":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.gc.displayNames.gcTimeMillis');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_JobsStatus = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-jobs-status",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus'),
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.jobs_status',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.mapred && jsonData.metrics.mapred.jobtracker) {
-      for ( var name in jsonData.metrics.mapred.jobtracker) {
-        var displayName;
-        var seriesData = jsonData.metrics.mapred.jobtracker[name];
-        switch (name) {
-          case "jobs_running":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsRunning');
-            break;
-          case "jobs_failed":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsFailed');
-            break;
-          case "jobs_completed":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsCompleted');
-            break;
-          case "jobs_preparing":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsPreparing');
-            break;
-          case "jobs_submitted":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsSubmitted');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_JVMHeap = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-jvm-heap",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap'),
-  yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.jobs_heap',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    var MB = Math.pow(2, 20);
-    if (jsonData && jsonData.metrics && jsonData.metrics.jvm) {
-      for ( var name in jsonData.metrics.jvm) {
-        var displayName;
-        var seriesData = jsonData.metrics.jvm[name];
-        switch (name) {
-          case "memHeapCommittedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapCommittedM');
-            break;
-          case "memNonHeapUsedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapUsedM');
-            break;
-          case "memHeapUsedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapUsedM');
-            break;
-          case "memNonHeapCommittedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapCommittedM');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          var s = this.transformData(seriesData, displayName);
-          for (var i = 0; i < s.data.length; i++) {
-            s.data[i].y *= MB;
-          }
-          seriesArray.push(s);
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_JVMThreads = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-jvm-threads",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads'),
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.jobs_threads',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.jvm) {
-      for ( var name in jsonData.metrics.jvm) {
-        var displayName;
-        var seriesData = jsonData.metrics.jvm[name];
-        switch (name) {
-          case "threadsBlocked":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsBlocked');
-            break;
-          case "threadsWaiting":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsWaiting');
-            break;
-          case "threadsTimedWaiting":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsTimedWaiting');
-            break;
-          case "threadsRunnable":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsRunnable');
-            break;
-          default:
-            break;
-        }
-
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_MapSlots = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-map-slots",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots'),
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.map_slots',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.mapred && jsonData.metrics.mapred.jobtracker) {
-      for ( var name in jsonData.metrics.mapred.jobtracker) {
-        var displayName;
-        var seriesData = jsonData.metrics.mapred.jobtracker[name];
-        switch (name) {
-          case "reserved_map_slots":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots.displayNames.reservedMapSlots');
-            break;
-          case "occupied_map_slots":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots.displayNames.occupiedMapSlots');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_ReduceSlots = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-reduce-slots",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots'),
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.reduce_slots',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.mapred && jsonData.metrics.mapred.jobtracker) {
-      for ( var name in jsonData.metrics.mapred.jobtracker) {
-        var displayName;
-        var seriesData = jsonData.metrics.mapred.jobtracker[name];
-        switch (name) {
-          case "reserved_reduce_slots":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots.displayNames.reservedReduceSlots');
-            break;
-          case "occupied_reduce_slots":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots.displayNames.occupiedReduceSlots');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

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

@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_RPC = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-rpc",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.rpc'),
-  yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
-
-  ajaxIndex: 'service.metrics.mapreduce.rpc',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.rpc) {
-      for ( var name in jsonData.metrics.rpc) {
-        var displayName;
-        var seriesData = jsonData.metrics.rpc[name];
-        switch (name) {
-          case "RpcQueueTime_avg_time":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.rpc.displayNames.RpcQueueTimeAvgTime');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

+ 0 - 65
ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js

@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-var App = require('app');
-
-/**
- * @class
- * 
- * This is a view for showing cluster CPU metrics
- * 
- * @extends App.ChartLinearTimeView
- * @extends Ember.Object
- * @extends Ember.View
- */
-App.ChartServiceMetricsMapReduce_TasksRunningWaiting = App.ChartLinearTimeView.extend({
-  id: "service-metrics-mapreduce-tasks-running-waiting",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting'),
-  renderer: 'line',
-
-  ajaxIndex: 'service.metrics.mapreduce.tasks_running_waiting',
-
-  transformToSeries: function (jsonData) {
-    var seriesArray = [];
-    if (jsonData && jsonData.metrics && jsonData.metrics.mapred && jsonData.metrics.mapred.jobtracker) {
-      for ( var name in jsonData.metrics.mapred.jobtracker) {
-        var displayName;
-        var seriesData = jsonData.metrics.mapred.jobtracker[name];
-        switch (name) {
-          case "running_maps":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningMaps');
-            break;
-          case "running_reduces":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningReduces');
-            break;
-          case "waiting_maps":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingMaps');
-            break;
-          case "waiting_reduces":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingReduces');
-            break;
-          default:
-            break;
-        }
-        if (seriesData) {
-          seriesArray.push(this.transformData(seriesData, displayName));
-        }
-      }
-    }
-    return seriesArray;
-  }
-});

+ 5 - 5
ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js

@@ -28,7 +28,7 @@ var App = require('app');
  */
 App.ChartServiceMetricsYARN_JVMHeap = App.ChartLinearTimeView.extend({
   id: "service-metrics-yarn-jvm-heap",
-  title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap'),
+  title: Em.I18n.t('services.service.info.metrics.yarn.jvmHeap'),
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',
 
@@ -43,16 +43,16 @@ App.ChartServiceMetricsYARN_JVMHeap = App.ChartLinearTimeView.extend({
         var seriesData = jsonData.metrics.jvm[name];
         switch (name) {
           case "memHeapCommittedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapCommittedM');
+            displayName = Em.I18n.t('services.service.info.metrics.yarn.jvmHeap.displayNames.memHeapCommittedM');
             break;
           case "memNonHeapUsedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapUsedM');
+            displayName = Em.I18n.t('services.service.info.metrics.yarn.jvmHeap.displayNames.memNonHeapUsedM');
             break;
           case "memHeapUsedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapUsedM');
+            displayName = Em.I18n.t('services.service.info.metrics.yarn.jvmHeap.displayNames.memHeapUsedM');
             break;
           case "memNonHeapCommittedM":
-            displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapCommittedM');
+            displayName = Em.I18n.t('services.service.info.metrics.yarn.jvmHeap.displayNames.memNonHeapCommittedM');
             break;
           default:
             break;

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio