http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json b/ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json deleted file mode 100644 index f79810f..0000000 --- a/ambari-web/app/assets/data/services/metrics/mapreduce/tasks_running_waiting.json +++ /dev/null @@ -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" - } -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/data/services/summary/mapreduce.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/services/summary/mapreduce.json b/ambari-web/app/assets/data/services/summary/mapreduce.json deleted file mode 100644 index 4e904a3..0000000 --- a/ambari-web/app/assets/data/services/summary/mapreduce.json +++ /dev/null @@ -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 - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json deleted file mode 100644 index 4c5ba7f..0000000 --- a/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json +++ /dev/null @@ -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 - } - } ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/data/wizard/stack/stacks.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/stacks.json b/ambari-web/app/assets/data/wizard/stack/stacks.json index 36d6c39..7cb9d9e 100644 --- a/ambari-web/app/assets/data/wizard/stack/stacks.json +++ b/ambari-web/app/assets/data/wizard/stack/stacks.json @@ -2,1194 +2,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" : { "active" : true, http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/data/wizard/stack/versions.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/versions.json b/ambari-web/app/assets/data/wizard/stack/versions.json deleted file mode 100644 index b54c84b..0000000 --- a/ambari-web/app/assets/data/wizard/stack/versions.json +++ /dev/null @@ -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" - } - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/assets/test/tests.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js index 60a25cf..0ec35c5 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js index af61afd..9f4b409 100644 --- a/ambari-web/app/controllers.js +++ b/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'); http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/global/cluster_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index 58ce41a..0227f39 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index f1ef341..b8db91e 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/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']; http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/admin/kerberos.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js index 701e6db..69a28ab 100644 --- a/ambari-web/app/controllers/main/admin/kerberos.js +++ b/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') }) }) http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/admin/security.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security.js b/ambari-web/app/controllers/main/admin/security.js index 98db521..968469e 100644 --- a/ambari-web/app/controllers/main/admin/security.js +++ b/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') }) }) http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/admin/security/add/step2.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/add/step2.js b/ambari-web/app/controllers/main/admin/security/add/step2.js index 42598b3..95a422d 100644 --- a/ambari-web/app/controllers/main/admin/security/add/step2.js +++ b/ambari-web/app/controllers/main/admin/security/add/step2.js @@ -41,11 +41,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({ component: 'DATANODE' }, { - serviceName: 'MAPREDUCE', - configName: 'tasktracker_hosts', - component: 'TASKTRACKER' - }, - { serviceName: 'YARN', configName: 'nodemanager_host', component: 'NODEMANAGER' @@ -102,16 +97,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({ components: ['JOURNALNODE'] }, { - serviceName: 'MAPREDUCE', - configName: 'jobtracker_host', - components: ['JOBTRACKER'] - }, - { - serviceName: 'MAPREDUCE', - configName: 'jobhistoryserver_host', - components: ['HISTORYSERVER'] - }, - { serviceName: 'MAPREDUCE2', configName: 'jobhistoryserver_host', components: ['HISTORYSERVER'] http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap.js b/ambari-web/app/controllers/main/charts/heatmap.js index 324be13..cf5319e 100644 --- a/ambari-web/app/controllers/main/charts/heatmap.js +++ b/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({ http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js deleted file mode 100644 index 1f45b8a..0000000 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce.js +++ /dev/null @@ -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 -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js deleted file mode 100644 index 04fa2bd..0000000 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js +++ /dev/null @@ -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' -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js deleted file mode 100644 index 6ae50f3..0000000 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js +++ /dev/null @@ -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' -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js deleted file mode 100644 index 2829c86..0000000 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js +++ /dev/null @@ -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' -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js deleted file mode 100644 index f7f4a8b..0000000 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js +++ /dev/null @@ -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' -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/host.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host.js b/ambari-web/app/controllers/main/host.js index 019ef65..de9bf61 100644 --- a/ambari-web/app/controllers/main/host.js +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 0a099ed..2abd50b 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/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"); } @@ -1314,73 +1308,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 * @method doAction http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/service/add_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js index dc7bbdd..e97ab09 100644 --- a/ambari-web/app/controllers/main/service/add_controller.js +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index dcbce69..f3026fa 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/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'); @@ -2264,12 +2258,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM { hostProperty: 'jobtracker_host', componentName: 'JOBTRACKER', - serviceName: 'MAPREDUCE', - serviceUseThis: [] - }, - { - hostProperty: 'jobtracker_host', - componentName: 'JOBTRACKER', serviceName: 'MAPREDUCE2', serviceUseThis: [] }, @@ -2280,12 +2268,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM serviceUseThis: ['YARN'] }, { - hostProperty: 'hs_host', - componentName: 'HISTORYSERVER', - serviceName: 'MAPREDUCE', - serviceUseThis: [] - }, - { hostProperty: 'ats_host', componentName: 'APP_TIMELINE_SERVER', serviceName: 'YARN', http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/service/info/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 8800e62..d3c68f5 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/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({ http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/main/service/reassign/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js index 90389d3..dc11af6 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/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' - } - ] } ], http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3a0bb7/ambari-web/app/controllers/wizard/slave_component_groups_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/slave_component_groups_controller.js b/ambari-web/app/controllers/wizard/slave_component_groups_controller.js index c821f08..d113eb9 100644 --- a/ambari-web/app/controllers/wizard/slave_component_groups_controller.js +++ b/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'};
