http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json deleted file mode 100644 index e208129..0000000 --- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json +++ /dev/null @@ -1,353 +0,0 @@ -{ - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations?fields=*";, - "items" : [ - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command";, - "StackConfigurations" : { - "property_description" : "Define and configure a new shell type pig.", - "property_value" : "/usr/bin/pig -l /dev/null", - "stack_version" : "1.3.0", - "property_name" : "pig_shell_command", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "sandbox", - "stack_version" : "1.3.0", - "property_name" : "db_name", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "sandbox", - "stack_version" : "1.3.0", - "property_name" : "db_user", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "localhost", - "stack_version" : "1.3.0", - "property_name" : "db_host", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "1111", - "stack_version" : "1.3.0", - "property_name" : "db_password", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone";, - "StackConfigurations" : { - "property_description" : "Time zone name", - "property_value" : "America/Los_Angeles", - "stack_version" : "1.3.0", - "property_name" : "time_zone", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host";, - "StackConfigurations" : { - "property_description" : "Webserver listens on this address and port", - "property_value" : "0.0.0.0", - "stack_version" : "1.3.0", - "property_name" : "http_host", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_pid_dir";, - "StackConfigurations" : { - "property_description" : "Hue Pid Dir.", - "property_value" : "/var/run/hue", - "stack_version" : "1.3.0", - "property_name" : "hue_pid_dir", - "service_name" : "HUE", - "type" : "global.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls";, - "StackConfigurations" : { - "property_description" : "Whether to use a TLS (secure) connection when talking to the SMTP server.", - "property_value" : "no", - "stack_version" : "1.3.0", - "property_name" : "tls", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home";, - "StackConfigurations" : { - "property_description" : "The SMTP server information for email notification delivery.", - "property_value" : "/usr/lib/hadoop/lib", - "stack_version" : "1.3.0", - "property_name" : "hadoop_mapred_home", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email";, - "StackConfigurations" : { - "property_description" : "The SMTP server information for email notification delivery.", - "property_value" : "[email protected]", - "stack_version" : "1.3.0", - "property_name" : "default_from_email", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy";, - "StackConfigurations" : { - "property_description" : "Authentication backend.", - "property_value" : "desktop.auth.backend.AllowAllBackend", - "stack_version" : "1.3.0", - "property_name" : "backend_auth_policy", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_log_dir";, - "StackConfigurations" : { - "property_description" : "Hue Log Dir.", - "property_value" : "/var/log/hue", - "stack_version" : "1.3.0", - "property_name" : "hue_log_dir", - "service_name" : "HUE", - "type" : "global.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist";, - "StackConfigurations" : { - "property_description" : "proxy settings", - "property_value" : "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)", - "stack_version" : "1.3.0", - "property_name" : "whitelist", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port";, - "StackConfigurations" : { - "property_description" : "The port where the JobTracker IPC listens on.", - "property_value" : "50030", - "stack_version" : "1.3.0", - "property_name" : "jobtracker_port", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "3306", - "stack_version" : "1.3.0", - "property_name" : "db_port", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port";, - "StackConfigurations" : { - "property_description" : "The SMTP server information for email notification delivery.", - "property_value" : "25", - "stack_version" : "1.3.0", - "property_name" : "smtp_port", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging";, - "StackConfigurations" : { - "property_description" : "To show database transactions, set database_logging to 1.\n default, database_logging=0", - "property_value" : "0", - "stack_version" : "1.3.0", - "property_name" : "database_logging", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages";, - "StackConfigurations" : { - "property_description" : null, - "property_value" : "1", - "stack_version" : "1.3.0", - "property_name" : "send_debug_messages", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password";, - "StackConfigurations" : { - "property_description" : "The SMTP server information for email notification delivery.", - "property_value" : "25", - "stack_version" : "1.3.0", - "property_name" : "smtp_password", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode";, - "StackConfigurations" : { - "property_description" : "Turn off debug", - "property_value" : "1", - "stack_version" : "1.3.0", - "property_name" : "django_debug_mode", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server";, - "StackConfigurations" : { - "property_description" : "Set to true to use CherryPy as the webserver, set to false\n to use Spawning as the webserver. Defaults to Spawning if\n key is not specified.", - "property_value" : "false", - "stack_version" : "1.3.0", - "property_name" : "use_cherrypy_server", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command";, - "StackConfigurations" : { - "property_description" : "Define and configure a new shell type hbase.", - "property_value" : "/usr/bin/hbase shell", - "stack_version" : "1.3.0", - "property_name" : "hbase_shell_command", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command";, - "StackConfigurations" : { - "property_description" : "Define and configure a new shell type bash for testing only\n .", - "property_value" : "/bin/bash", - "stack_version" : "1.3.0", - "property_name" : "bash_shell_command", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name";, - "StackConfigurations" : { - "property_description" : "Define and configure a new shell type hbase", - "property_value" : "HBase Shell", - "stack_version" : "1.3.0", - "property_name" : "hbase_nice_name", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port";, - "StackConfigurations" : { - "property_description" : "Webserver listens on this address and port", - "property_value" : "8000", - "stack_version" : "1.3.0", - "property_name" : "http_port", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host";, - "StackConfigurations" : { - "property_description" : "The SMTP server information for email notification delivery.", - "property_value" : "localhost", - "stack_version" : "1.3.0", - "property_name" : "smtp_host", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine";, - "StackConfigurations" : { - "property_description" : "Configuration options for specifying the Desktop Database.", - "property_value" : "mysql", - "stack_version" : "1.3.0", - "property_name" : "db_engine", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - }, - { - "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode";, - "StackConfigurations" : { - "property_description" : "Turn off backtrace for server error", - "property_value" : "1", - "stack_version" : "1.3.0", - "property_name" : "http_500_debug_mode", - "service_name" : "HUE", - "type" : "hue-site.xml", - "stack_name" : "HDP" - } - } - ] -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json index 04379e1..36fb2e8 100644 --- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json +++ b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json @@ -2187,286 +2187,6 @@ ] }, { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE";, - "StackServices" : { - "stack_version" : "1.3.0", - "service_name" : "HUE", - "stack_name" : "HDP" - }, - "configurations" : [ - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "jobtracker_port", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_user", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "http_host", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_port", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "whitelist", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "django_debug_mode", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "smtp_host", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "smtp_password", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_engine", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "send_debug_messages", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "tls", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "bash_shell_command", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "pig_shell_command", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "http_500_debug_mode", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "hadoop_mapred_home", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "time_zone", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_host", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_password", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "database_logging", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "db_name", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "hbase_shell_command", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "default_from_email", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "use_cherrypy_server", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "http_port", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "hbase_nice_name", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "backend_auth_policy", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - }, - { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port";, - "StackConfigurations" : { - "stack_version" : "1.3.0", - "property_name" : "smtp_port", - "filename" : "hue-site.xml", - "service_name" : "HUE", - "stack_name" : "HDP" - } - } - ] - }, - { "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/GANGLIA";, "StackServices" : { "stack_version" : "1.3.0", http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 4f51def..c516190 100644 --- a/ambari-web/app/assets/data/wizard/stack/stacks.json +++ b/ambari-web/app/assets/data/wizard/stack/stacks.json @@ -54,17 +54,6 @@ } }, { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE";, - "StackServices" : { - "user_name" : "root", - "stack_version" : "1.3.0", - "service_name" : "HUE", - "stack_name" : "HDP", - "service_version" : "2.2.0", - "comments" : "Hue is a graphical user interface to operate and develop\n applications for Apache Hadoop." - } - }, - { "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS";, "StackServices" : { "user_name" : "root", @@ -589,17 +578,6 @@ } }, { - "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE";, - "StackServices" : { - "user_name" : "root", - "stack_version" : "1.3.0", - "service_name" : "HUE", - "stack_name" : "HDP", - "service_version" : "2.2.0", - "comments" : "Hue is a graphical user interface to operate and develop\n applications for Apache Hadoop." - } - }, - { "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS";, "StackServices" : { "user_name" : "root", http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 cd78e01..ed515cb 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/ambari-web/app/assets/test/tests.js @@ -170,7 +170,6 @@ var files = ['test/init_model_test', 'test/views/main/service/item_test', 'test/views/main/service/info/config_test', 'test/views/main/service/info/summary_test', - 'test/views/main/mirroring/edit_dataset_view_test', 'test/views/common/configs/services_config_test', 'test/views/wizard/step3/hostLogPopupBody_view_test', 'test/views/wizard/step3/hostWarningPopupBody_view_test', @@ -196,8 +195,6 @@ var files = ['test/init_model_test', 'test/models/authentication_test', 'test/models/cluster_states_test', 'test/models/config_group_test', - 'test/models/dataset_test', - 'test/models/dataset_job_test', 'test/models/form_test', 'test/models/host_test', 'test/models/host_component_test', http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 563e547..f7171bf 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -50,38 +50,8 @@ App.healthIconClassYellow = 'icon-question-sign'; // bootstrap icon class for he App.enableExperimental = false; App.supports = { - addServices: true, - hostOverrides: true, - hostOverridesInstaller: true, - hostOverridesHost: true, - mirroring: false, - secureCluster: true, - secureClusterProceedPopup: false, - reassignMaster: true, stackUpgrade: false, - capacitySchedulerUi: false, - startStopAllServices: true, - hiveOozieExtraDatabases: true, - multipleHBaseMasters: true, - addMasters: false, - customizeSmokeTestUser: true, - hue: false, - falcon: true, - ldapGroupMapping: false, - localRepositories: true, - highAvailability: true, - resourceManagerHighAvailability: true, - deleteHost: true, - autoRollbackHA: false, - appTimelineServer: true, - ubuntu: true, - views: true, - flume: true, - databaseConnection: true, - configHistory: true, - serverRecommendValidate: true, - downloadClientConfigs: true, - abortRequests: true + autoRollbackHA: false }; if (App.enableExperimental) { http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js index c4a1001..aeec3ee 100644 --- a/ambari-web/app/controllers.js +++ b/ambari-web/app/controllers.js @@ -114,11 +114,6 @@ require('controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresi require('controllers/main/charts/heatmap'); require('controllers/main/apps_controller'); require('controllers/main/apps/item_controller'); -require('controllers/main/mirroring_controller'); -require('controllers/main/mirroring/edit_dataset_controller'); -require('controllers/main/mirroring/datasets_controller'); -require('controllers/main/mirroring/jobs_controller'); -require('controllers/main/mirroring/manage_clusters_controller'); require('controllers/main/views_controller'); require('controllers/main/views/details_controller'); require('controllers/wizard/slave_component_groups_controller'); http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 e6e4b03..826c944 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -321,13 +321,9 @@ App.ClusterController = Em.Controller.extend({ updater.updateServiceMetric(function () { - if (App.supports.hostOverrides) { - updater.updateComponentConfig(function () { - self.updateLoadStatus('componentConfigs'); - }); - } else { + updater.updateComponentConfig(function () { self.updateLoadStatus('componentConfigs'); - } + }); updater.updateComponentsState(function () { self.updateLoadStatus('componentsState'); http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 125f592..750db76 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -127,9 +127,7 @@ App.UpdateController = Em.Controller.extend({ App.updater.run(this, 'updateServiceMetricConditionally', 'isWorking', App.componentsUpdateInterval); App.updater.run(this, 'updateComponentsState', 'isWorking', App.componentsUpdateInterval); App.updater.run(this, 'graphsUpdate', 'isWorking'); - if (App.supports.hostOverrides) { - App.updater.run(this, 'updateComponentConfig', 'isWorking'); - } + App.updater.run(this, 'updateComponentConfig', 'isWorking'); } }.observes('isWorking'), /** http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/main/admin/repositories.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/repositories.js b/ambari-web/app/controllers/main/admin/repositories.js index 65e3f96..dcfc63b 100644 --- a/ambari-web/app/controllers/main/admin/repositories.js +++ b/ambari-web/app/controllers/main/admin/repositories.js @@ -96,7 +96,6 @@ App.MainAdminRepositoriesController = Em.Controller.extend({ loadRepositoriesSuccessCallback: function (data) { var allRepos = []; data.items.forEach(function (os) { - if (!App.get('supports.ubuntu') && os.OperatingSystems.os_type == 'ubuntu12') return; // @todo: remove after Ubuntu support confirmation os.repositories.forEach(function (repository) { var osType = repository.Repositories.os_type; var repo = Em.Object.create({ http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 647fa44..1fbecf6 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -1498,9 +1498,6 @@ App.MainHostDetailsController = Em.Controller.extend({ * @method validateAndDeleteHost */ validateAndDeleteHost: function () { - if (!App.supports.deleteHost) { - return false; - } var container = this.getHostComponentsInfo(); if (container.masterComponents.length > 0) { http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/main/service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service.js b/ambari-web/app/controllers/main/service.js index 0566612..a6d5983 100644 --- a/ambari-web/app/controllers/main/service.js +++ b/ambari-web/app/controllers/main/service.js @@ -51,9 +51,6 @@ App.MainServiceController = Em.ArrayController.extend({ isAllServicesInstalled: function () { if (!this.get('content.content')) return false; var availableServices = App.StackService.find().mapProperty('serviceName'); - if (!App.get('supports.hue')) { - availableServices = availableServices.without('HUE'); - } return this.get('content.content').length == availableServices.length; }.property('content.content.@each', 'content.content.length'), http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/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 afd263f..00f152c 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -81,9 +81,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM } }.property('App.isHadoop2Stack'), - showConfigHistoryFeature: function() { - return App.get('supports.configHistory'); - }.property('App.supports.configHistory'), + showConfigHistoryFeature: true, /** * Map, which contains relation between group and site * to upload overridden properties @@ -280,11 +278,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM App.config.loadAdvancedConfig(serviceName, function (properties) { advancedConfigs.pushObjects(properties); self.set('advancedConfigs', advancedConfigs); - if (App.get('supports.configHistory')) { - self.loadServiceConfigVersions(); - } else { - self.loadServiceTagsAndGroups(); - } + self.loadServiceConfigVersions(); }); }, @@ -413,20 +407,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM }, loadServiceConfigsSuccess: function (data, opt, params) { - if (App.get('supports.configHistory')) { - this.setConfigGroups(data, opt, params); - return; - } - if (data) { - this.setConfigGroups(data, opt, params); - } else { - App.ajax.send({ - name: 'config.tags', - sender: this, - data: App.permit(params, ['clusterName', 'serviceConfigsDef', 'serviceName']), - success: 'setConfigGroups' - }); - } + this.setConfigGroups(data, opt, params); }, setConfigTags: function (data, opt, params) { @@ -444,51 +425,46 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM }, setConfigGroups: function (data, opt, params) { - if (!App.get('supports.configHistory')) { - this.setConfigTags(data, opt, params); - } var serviceName = this.get('content.serviceName'); var displayName = this.get('content.displayName'); var selectedConfigGroup; var defaultHosts = App.get('allHostNames'); //parse loaded config groups - if (App.get('supports.hostOverrides')) { - var configGroups = []; - if (data && data.config_groups && data.config_groups.length) { - data.config_groups.forEach(function (item) { - item = item.ConfigGroup; - if (item.tag === this.get('content.serviceName')) { - var groupHosts = item.hosts.mapProperty('host_name'); - var newConfigGroup = App.ConfigGroup.create({ - id: item.id, - name: item.group_name, - description: item.description, - isDefault: false, - parentConfigGroup: null, - service: App.Service.find().findProperty('serviceName', item.tag), - hosts: groupHosts, - configSiteTags: [] - }); - for (var i = 0; i< groupHosts.length ; i++) { - defaultHosts = defaultHosts.without(groupHosts[i]); - } - item.desired_configs.forEach(function (config) { - newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({ - site: config.type, - tag: config.tag - })); - }, this); - // select default selected group for hosts page - if (!selectedConfigGroup && this.get('isHostsConfigsPage') && newConfigGroup.get('hosts').contains(this.get('host.hostName')) && this.get('content.serviceName') === item.tag) { - selectedConfigGroup = newConfigGroup; - } - configGroups.push(newConfigGroup); + var configGroups = []; + if (data && data.config_groups && data.config_groups.length) { + data.config_groups.forEach(function (item) { + item = item.ConfigGroup; + if (item.tag === this.get('content.serviceName')) { + var groupHosts = item.hosts.mapProperty('host_name'); + var newConfigGroup = App.ConfigGroup.create({ + id: item.id, + name: item.group_name, + description: item.description, + isDefault: false, + parentConfigGroup: null, + service: App.Service.find().findProperty('serviceName', item.tag), + hosts: groupHosts, + configSiteTags: [] + }); + for (var i = 0; i < groupHosts.length; i++) { + defaultHosts = defaultHosts.without(groupHosts[i]); } - }, this); - } - this.set('configGroups', configGroups); + item.desired_configs.forEach(function (config) { + newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({ + site: config.type, + tag: config.tag + })); + }, this); + // select default selected group for hosts page + if (!selectedConfigGroup && this.get('isHostsConfigsPage') && newConfigGroup.get('hosts').contains(this.get('host.hostName')) && this.get('content.serviceName') === item.tag) { + selectedConfigGroup = newConfigGroup; + } + configGroups.push(newConfigGroup); + } + }, this); } + this.set('configGroups', configGroups); var defaultConfigGroup = App.ConfigGroup.create({ name: displayName + " Default", description: "Default cluster level " + serviceName + " configuration", @@ -517,10 +493,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM var selectedConfigGroup = this.get('selectedConfigGroup'); var serviceName = this.get('content.serviceName'); //STEP 1: handle tags from JSON data for host overrides - if (!App.get('supports.configHistory')) { - //if config history enabled then loadedGroupToOverrideSiteToTagMap already has content set in loadSelectedVersionSuccess() - this.loadedGroupToOverrideSiteToTagMap = {}; - } var configGroupsWithOverrides = selectedConfigGroup.get('isDefault') && !this.get('isHostsConfigsPage') ? this.get('configGroups') : [selectedConfigGroup]; configGroupsWithOverrides.forEach(function (item) { var groupName = item.get('name'); @@ -546,7 +518,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM //add custom configs App.config.addCustomConfigs(configs); //put properties from capacity-scheduler.xml into one config with textarea view - if (self.get('content.serviceName') === 'YARN' && !App.get('supports.capacitySchedulerUi')) { + if (self.get('content.serviceName') === 'YARN') { configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml'); } self.set('allConfigs', configs); @@ -846,30 +818,17 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM App.config.OnNnHAHideSnn(serviceConfig); } - if (serviceName && !App.get('supports.serverRecommendValidate')) { - // set recommended Defaults first then load the configs (including set validator) - var s = App.StackService.find().findProperty('serviceName', this.get('content.serviceName')); - var defaultsProvider = s.get('defaultsProviders'); - if (defaultsProvider) { - this.getInfoForDefaults(defaultsProvider); - } else { - Em.run(this, 'setDefaults'); - } - } else { - if (App.get('supports.serverRecommendValidate')) { - serviceConfig = App.config.createServiceConfig(this.get('content.serviceName')); - this.loadConfigs(this.get('allConfigs'), serviceConfig); - this.checkOverrideProperty(serviceConfig); - this.checkDatabaseProperties(serviceConfig); - this.get('stepConfigs').pushObject(serviceConfig); - } - this.set('selectedService', this.get('stepConfigs').objectAt(0)); - this.checkForSecureConfig(this.get('selectedService')); - this.set('dataIsLoaded', true); - this.set('versionLoaded', true); - this.set('hash', this.getHash()); - this.set('isInit', false); - } + serviceConfig = App.config.createServiceConfig(this.get('content.serviceName')); + this.loadConfigs(this.get('allConfigs'), serviceConfig); + this.checkOverrideProperty(serviceConfig); + this.checkDatabaseProperties(serviceConfig); + this.get('stepConfigs').pushObject(serviceConfig); + this.set('selectedService', this.get('stepConfigs').objectAt(0)); + this.checkForSecureConfig(this.get('selectedService')); + this.set('dataIsLoaded', true); + this.set('versionLoaded', true); + this.set('hash', this.getHash()); + this.set('isInit', false); }, //TODO after moving validation/recommendation to BE getInfoForDefaults must be deleted @@ -1229,7 +1188,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM newSCP.set('supportsFinal', serviceConfigProperty.get('supportsFinal')); newSCP.set('isOriginalSCP', false); // indicated this is overridden value, newSCP.set('parentSCP', serviceConfigProperty); - if (App.get('supports.hostOverrides') && defaultGroupSelected) { + if (defaultGroupSelected) { newSCP.set('group', override.group); newSCP.set('isEditable', false); } @@ -1268,37 +1227,19 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM var serviceName = this.get('content.serviceName'), displayName = this.get('content.displayName'), urlParams = ''; - - if (App.get('supports.hostOverrides') || - (serviceName !== 'HDFS' && this.get('content.isStopped') === true) || - ((serviceName === 'HDFS') && this.get('content.isStopped') === true && (!App.Service.find().someProperty('id', 'MAPREDUCE') || App.Service.find('MAPREDUCE').get('isStopped')))) { - - this.serverSideValidation().done(function() { - if (self.isDirChanged()) { - App.showConfirmationPopup(function () { - self.saveConfigs(); - }, Em.I18n.t('services.service.config.confirmDirectoryChange').format(displayName), function () { - self.set('isApplyingChanges', false); - }); - } else { + this.serverSideValidation().done(function () { + if (self.isDirChanged()) { + App.showConfirmationPopup(function () { self.saveConfigs(); - } - }).fail(function() { - self.set('isApplyingChanges', false); - }); - } else { - status = 'started'; - if (this.get('content.serviceName') !== 'HDFS' || (this.get('content.serviceName') === 'HDFS' && !App.Service.find().someProperty('id', 'MAPREDUCE'))) { - header = Em.I18n.t('services.service.config.notSaved'); - message = Em.I18n.t('services.service.config.msgServiceStop'); + }, Em.I18n.t('services.service.config.confirmDirectoryChange').format(displayName), function () { + self.set('isApplyingChanges', false); + }); } else { - header = Em.I18n.t('services.service.config.notSaved'); - message = Em.I18n.t('services.service.config.msgHDFSMapRServiceStop'); - urlParams += '&ServiceComponentInfo/service_name.in(HDFS,MAPREDUCE)'; + self.saveConfigs(); } - messageClass = 'alert alert-error'; - this.showSaveConfigsPopup(header, false, message, messageClass, null, status, urlParams); - } + }).fail(function () { + self.set('isApplyingChanges', false); + }); }, /** @@ -1343,7 +1284,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM var self = this; if (selectedConfigGroup.get('isDefault')) { - if (this.get('content.serviceName') === 'YARN' && !App.get('supports.capacitySchedulerUi')) { + if (this.get('content.serviceName') === 'YARN') { configs = App.config.textareaIntoFileConfigs(configs, 'capacity-scheduler.xml'); } var modifiedConfigs = configs @@ -1957,7 +1898,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM break; default: var filename = (App.config.get('filenameExceptions').contains(siteName)) ? siteName : siteName + '.xml'; - if (filename === 'mapred-queue-acls.xml' && !App.get('supports.capacitySchedulerUi')) { + if (filename === 'mapred-queue-acls.xml') { return null; } configObject = this.createSiteObj(siteName, tagName, this.get('uiConfigs').filterProperty('filename', filename)); @@ -2286,12 +2227,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM m: true }, { - hostProperty: 'hueserver_host', - componentName: 'HUE_SERVER', - serviceName: 'HUE', - serviceUseThis: [] - }, - { hostProperty: 'webhcatserver_host', componentName: 'WEBHCAT_SERVER', serviceName: 'HIVE', @@ -2699,16 +2634,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM } //clean when switch config group this.loadedGroupToOverrideSiteToTagMap = {}; - if (App.get('supports.configHistory')) { - var configGroupVersions = App.ServiceConfigVersion.find().filterProperty('groupId', event.context.get('id')); - //check whether config group has config versions - if (configGroupVersions.length > 0) { - this.loadSelectedVersion(configGroupVersions.findProperty('isCurrent').get('version'), event.context); - } else { - this.loadSelectedVersion(null, event.context); - } + var configGroupVersions = App.ServiceConfigVersion.find().filterProperty('groupId', event.context.get('id')); + //check whether config group has config versions + if (configGroupVersions.length > 0) { + this.loadSelectedVersion(configGroupVersions.findProperty('isCurrent').get('version'), event.context); } else { - this.set('selectedConfigGroup', event.context); + this.loadSelectedVersion(null, event.context); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/wizard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js index 01f3ea2..f29e8fa 100644 --- a/ambari-web/app/controllers/wizard.js +++ b/ambari-web/app/controllers/wizard.js @@ -829,7 +829,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, { var fileNamesToUpdate = []; stepController.get('stepConfigs').forEach(function (_content) { - if (_content.serviceName === 'YARN' && !App.supports.capacitySchedulerUi) { + if (_content.serviceName === 'YARN') { _content.set('configs', App.config.textareaIntoFileConfigs(_content.get('configs'), 'capacity-scheduler.xml')); } http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/wizard/step5_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js index 6fb9ab1..186d8f8 100644 --- a/ambari-web/app/controllers/wizard/step5_controller.js +++ b/ambari-web/app/controllers/wizard/step5_controller.js @@ -249,7 +249,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, { return false; } - if (App.get('supports.serverRecommendValidate') && this.get('useServerValidation')) { + if (this.get('useServerValidation')) { self.set('submitDisabled', true); // reset previous recommendations @@ -419,11 +419,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, { console.log("WizardStep5Controller: Loading step5: Assign Masters"); this.clearStep(); this.renderHostInfo(); - if (App.get('supports.serverRecommendValidate')) { - this.loadComponentsRecommendationsFromServer(this.loadStepCallback); - } else { - this.loadComponentsRecommendationsLocally(this.loadStepCallback); - } + this.loadComponentsRecommendationsFromServer(this.loadStepCallback); }, /** @@ -672,84 +668,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, { }, /** - * Load services info to appropriate variable and return masterComponentHosts - * @return {Object[]} - */ - loadComponentsRecommendationsLocally: function (callback) { - var selectedServices = App.StackService.find().filterProperty('isSelected').mapProperty('serviceName'); - var installedServices = App.StackService.find().filterProperty('isInstalled').mapProperty('serviceName'); - var services = installedServices.concat(selectedServices).uniq(); - var selectedNotInstalledServices = this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled', false).mapProperty('serviceName'); - - var masterComponents = []; - //get full list from mock data - if (this.get('isAddServiceWizard')) { - masterComponents = App.StackServiceComponent.find().filterProperty('isShownOnAddServiceAssignMasterPage'); - } else { - masterComponents = App.StackServiceComponent.find().filterProperty('isShownOnInstallerAssignMasterPage'); - } - var masterHosts = this.get('content.masterComponentHosts'); //saved to local storage info - - var resultComponents = []; - - for (var index = 0; index < services.length; index++) { - var componentInfo = masterComponents.filterProperty('serviceName', services[index]); - // If service is already installed and not being added as a new service then render on UI only those master components - // that have already installed hostComponents. - // NOTE: On upgrade there might be a prior installed service with non-installed newly introduced serviceComponent - var isNotSelectedService = !selectedNotInstalledServices.contains(services[index]); - if (isNotSelectedService) { - componentInfo = componentInfo.filter(function (_component) { - return App.HostComponent.find().someProperty('componentName',_component.get('componentName')); - }); - } - - componentInfo.forEach(function (_componentInfo) { - if (this.get('multipleComponents').contains(_componentInfo.get('componentName'))) { - var savedComponents = masterHosts.filterProperty('component', _componentInfo.get('componentName')); - if (savedComponents.length) { - savedComponents.forEach(function (item) { - var multipleMasterHost = {}; - multipleMasterHost.component_name = _componentInfo.get('componentName'); - multipleMasterHost.display_name = _componentInfo.get('displayName'); - multipleMasterHost.selectedHost = item.hostName; - multipleMasterHost.serviceId = services[index]; - multipleMasterHost.isInstalled = item.isInstalled; - multipleMasterHost.isServiceCoHost = false; - resultComponents.push(multipleMasterHost); - }) - } else { - var multipleMasterHosts = this.selectHostLocally(_componentInfo.get('componentName')); - multipleMasterHosts.forEach(function (_host) { - var multipleMasterHost = {}; - multipleMasterHost.component_name = _componentInfo.get('componentName'); - multipleMasterHost.display_name = _componentInfo.get('displayName'); - multipleMasterHost.selectedHost = _host; - multipleMasterHost.serviceId = services[index]; - multipleMasterHost.isInstalled = false; - multipleMasterHost.isServiceCoHost = false; - resultComponents.push(multipleMasterHost); - }); - - } - } else { - var savedComponent = masterHosts.findProperty('component', _componentInfo.get('componentName')); - var componentObj = {}; - componentObj.component_name = _componentInfo.get('componentName'); - componentObj.display_name = _componentInfo.get('displayName'); - componentObj.selectedHost = savedComponent ? savedComponent.hostName : this.selectHostLocally(_componentInfo.get('componentName')); // call the method that plays selectNode algorithm or fetches from server - componentObj.isInstalled = savedComponent ? savedComponent.isInstalled : false; - componentObj.serviceId = services[index]; - componentObj.isServiceCoHost = App.StackServiceComponent.find().findProperty('componentName', _componentInfo.get('componentName')).get('isCoHostedComponent') && !this.get('isReassignWizard'); - resultComponents.push(componentObj); - } - }, this); - } - - callback(resultComponents, this); - }, - - /** * @param {string} componentName * @returns {bool} * @private @@ -822,82 +740,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, { }, this); }.observes('[email protected]'), - /** - * select and return host for component by scheme - * Scheme is an object that has keys which compared to number of hosts, - * if key more that number of hosts, then return value of that key. - * Value is index of host in hosts array. - * - * @param {object} componentName - * @param {object} hosts - * @return {string} - * @method getHostForComponent - */ - getHostForComponent: function (componentName, hosts) { - var component = App.StackServiceComponent.find().findProperty('componentName', componentName); - if (component) { - var selectionScheme = App.StackServiceComponent.find().findProperty('componentName', componentName).get('selectionSchemeForMasterComponent'); - } else { - return hosts[0]; - } - - if (hosts.length === 1 || $.isEmptyObject(selectionScheme)) { - return hosts[0]; - } else { - for (var i in selectionScheme) { - if (window.isFinite(i)) { - if (hosts.length < window.parseInt(i)) { - return hosts[selectionScheme[i]]; - } - } - } - return hosts[selectionScheme['else']] - } - }, - - /** - * Get list of host names for master component with multiple instances - * @param {Object} component - * @param {Object} hosts - * @returns {string[]} - * @method getHostsForComponent - */ - getHostsForComponent: function (component, hosts) { - var defaultNoOfMasterHosts = component.get('defaultNoOfMasterHosts'); - var masterHosts = []; - if (hosts.length < defaultNoOfMasterHosts) { - defaultNoOfMasterHosts = hosts.length; - } - for (var index = 0; index < defaultNoOfMasterHosts; index++) { - masterHosts.push(hosts[index]); - } - return masterHosts; - }, - - /** - * Return hostName of masterNode for specified service - * @param componentName - * @return {string|string[]} - * @method selectHostLocally - */ - selectHostLocally: function (componentName) { - var component = App.StackServiceComponent.find().findProperty('componentName', componentName); - var hostNames = this.get('hosts').mapProperty('host_name'); - if (hostNames.length > 1 && App.StackServiceComponent.find().filterProperty('isNotPreferableOnAmbariServerHost').mapProperty('componentName').contains(componentName)) { - hostNames = this.get('hosts').mapProperty('host_name').filter(function (item) { - return item !== location.hostname; - }, this); - } - if (this.get('multipleComponents').contains(componentName)) { - if (component.get('defaultNoOfMasterHosts') > 1) { - return this.getHostsForComponent(component, hostNames); - } else { - return [this.getHostForComponent(componentName, hostNames)]; - } - } else { - return this.getHostForComponent(componentName, hostNames); - } - }, /** * On change callback for inputs @@ -1101,7 +943,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, { self.set('submitButtonClicked', false); }; - if (App.get('supports.serverRecommendValidate') && this.get('useServerValidation')) { + if (this.get('useServerValidation')) { self.recommendAndValidate(function () { self.showValidationIssuesAcceptBox(goNextStepIfValid); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/wizard/step6_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index 1142c8a..3aaf956 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -409,52 +409,35 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, { var clientHeaders = headers.findProperty('name', 'CLIENT'); var slaveComponents = this.get('content.slaveComponentHosts'); if (!slaveComponents) { // we are at this page for the first time - if (!App.get('supports.serverRecommendValidate')) { - hostsObj.forEach(function (host) { - var checkboxes = host.get('checkboxes'); - checkboxes.setEach('checked', !host.hasMaster); - checkboxes.setEach('isInstalled', false); - if (clientHeaders) { - checkboxes.findProperty('title', clientHeaders.get('label')).set('checked', false); - } - }); - this.selectClientHost(hostsObj); - - if (this.get('isInstallerWizard') && hostsObj.everyProperty('hasMaster', true)) { - var lastHost = hostsObj[hostsObj.length - 1]; - lastHost.get('checkboxes').setEach('checked', true); - } - } else { - var recommendations = this.get('content.recommendations'); - // Get all host-component pairs from recommendations - var componentHostPairs = recommendations.blueprint.host_groups.map(function (group) { - return group.components.map(function (component) { - return recommendations.blueprint_cluster_binding.host_groups.findProperty('name', group.name).hosts.map(function (host) { - return { component: component.name, host: host.fqdn}; - }); + var recommendations = this.get('content.recommendations'); + // Get all host-component pairs from recommendations + var componentHostPairs = recommendations.blueprint.host_groups.map(function (group) { + return group.components.map(function (component) { + return recommendations.blueprint_cluster_binding.host_groups.findProperty('name', group.name).hosts.map(function (host) { + return { component: component.name, host: host.fqdn}; }); }); + }); - // Flatten results twice because of two map() call before - componentHostPairs = [].concat.apply([], componentHostPairs); - componentHostPairs = [].concat.apply([], componentHostPairs); - - var clientComponents = App.get('components.clients'); - - hostsObj.forEach(function (host) { - var checkboxes = host.get('checkboxes'); - checkboxes.forEach(function (checkbox) { - var recommended = componentHostPairs.some(function (pair) { - var componentMatch = pair.component === checkbox.component; - if (checkbox.component === 'CLIENT' && !componentMatch) { - componentMatch = clientComponents.contains(pair.component); - } - return pair.host === host.hostName && componentMatch; - }); - checkbox.checked = recommended; + // Flatten results twice because of two map() call before + componentHostPairs = [].concat.apply([], componentHostPairs); + componentHostPairs = [].concat.apply([], componentHostPairs); + + var clientComponents = App.get('components.clients'); + + hostsObj.forEach(function (host) { + var checkboxes = host.get('checkboxes'); + checkboxes.forEach(function (checkbox) { + var recommended = componentHostPairs.some(function (pair) { + var componentMatch = pair.component === checkbox.component; + if (checkbox.component === 'CLIENT' && !componentMatch) { + componentMatch = clientComponents.contains(pair.component); + } + return pair.host === host.hostName && componentMatch; }); + checkbox.checked = recommended; }); - } + }); } else { this.get('headers').forEach(function (header) { var nodes = slaveComponents.findProperty('componentName', header.get('name')); @@ -526,16 +509,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, { }, callValidation: function (successCallback) { - var self = this; - if (App.get('supports.serverRecommendValidate')) { - self.callServerSideValidation(successCallback); - } else { - var res = self.callClientSideValidation(); - self.set('submitDisabled', !res); - if (res && successCallback) { - successCallback(); - } - } + this.callServerSideValidation(successCallback); }, /** @@ -789,110 +763,13 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, { }, /** - * callClientSideValidation form. Return do we have errors or not - * @return {bool} - * @method callClientSideValidation - */ - callClientSideValidation: function () { - if (this.get('isAddHostWizard')) { - return this.validateEachHost(Em.I18n.t('installer.step6.error.mustSelectOneForHost')); - } - else { - if (this.get('isInstallerWizard')) { - return this.validateEachComponent() && this.validateEachHost(Em.I18n.t('installer.step6.error.mustSelectOneForSlaveHost')); - } - else { - if (this.get('isAddServiceWizard')) { - return this.validateEachComponent(); - } - return true; - } - } - }, - - /** - * Validate all components for each host. Return do we have errors or not - * @return {bool} - * @method validateEachHost - */ - validateEachHost: function (errorMsg) { - - var isError = false; - var hosts = this.get('hosts'); - var headers = this.get('headers'); - for (var i = 0; i < hosts.length; i++) { - if (this.get('isInstallerWizard') && this.get('content.masterComponentHosts').someProperty('hostName', hosts[i].hostName)) { - continue; - } - var checkboxes = hosts[i].get('checkboxes'); - isError = false; - headers.forEach(function (header) { - isError = isError || checkboxes.findProperty('title', header.get('label')).checked; - }); - isError = !isError; - if (isError) { - this.set('errorMessage', errorMsg); - break; - } - } - return !isError; - }, - - /** - * Check for minimum required count of components to install. - * - * @return {bool} - * @method validateEachComponent - */ - validateEachComponent: function () { - var isError = false; - var hosts = this.get('hosts'); - var headers = this.get('headers'); - var componentsToInstall = []; - headers.forEach(function (header) { - var checkboxes = hosts.mapProperty('checkboxes').reduce(function (cItem, pItem) { - return cItem.concat(pItem); - }); - var selectedCount = checkboxes.filterProperty('component', header.get('name')).filterProperty('checked').length; - if (header.get('name') == 'CLIENT') { - var clientsMinCount = 0; - var serviceNames = this.get('installedServiceNames').concat(this.get('content.selectedServiceNames')); - // find max value for `minToInstall` property - serviceNames.forEach(function (serviceName) { - App.StackServiceComponent.find().filterProperty('stackService.serviceName', serviceName).filterProperty('isClient') - .mapProperty('minToInstall').forEach(function (ctMinCount) { - clientsMinCount = ctMinCount > clientsMinCount ? ctMinCount : clientsMinCount; - }); - }); - if (selectedCount < clientsMinCount) { - isError = true; - var requiredQuantity = (clientsMinCount > hosts.length ? hosts.length : clientsMinCount) - selectedCount; - componentsToInstall.push(requiredQuantity + ' ' + stringUtils.pluralize(requiredQuantity, Em.I18n.t('common.client'))); - } - } else { - var stackComponent = App.StackServiceComponent.find().findProperty('componentName', header.get('name')); - if (selectedCount < stackComponent.get('minToInstall')) { - isError = true; - var requiredQuantity = (stackComponent.get('minToInstall') > hosts.length ? hosts.length : stackComponent.get('minToInstall')) - selectedCount; - componentsToInstall.push(requiredQuantity + ' ' + stringUtils.pluralize(requiredQuantity, stackComponent.get('displayName'))); - } - } - }, this); - if (componentsToInstall.length) { - this.set('errorMessage', Em.I18n.t('installer.step6.error.mustSelectComponents').format(componentsToInstall.join(', '))); - } - - return !isError; - }, - - /** * In case of any validation issues shows accept dialog box for user which allow cancel and fix issues or continue anyway * @metohd submit */ showValidationIssuesAcceptBox: function(callback) { var self = this; - if (App.get('supports.serverRecommendValidate') && (self.get('anyWarnings') || self.get('anyErrors'))) { + if (self.get('anyWarnings') || self.get('anyErrors')) { App.ModalPopup.show({ primary: Em.I18n.t('common.continueAnyway'), header: Em.I18n.t('installer.step6.validationIssuesAttention.header'), http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 645d435..28e9a87 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -323,37 +323,35 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { this.set('loadedClusterSiteToTagMap', siteToTagMap); //parse loaded config groups - if (App.get('supports.hostOverrides')) { - var configGroups = []; - if (data.config_groups.length) { - data.config_groups.forEach(function (item) { - item = item.ConfigGroup; - if (item.tag === serviceName) { - var groupHosts = item.hosts.mapProperty('host_name'); - var newConfigGroup = App.ConfigGroup.create({ - id: item.id, - name: item.group_name, - description: item.description, - isDefault: false, - parentConfigGroup: null, - service: App.Service.find().findProperty('serviceName', item.tag), - hosts: groupHosts, - publicHosts: manageCGController.hostsToPublic(groupHosts), - configSiteTags: [] - }); - groupHosts.forEach(function (host) { - defaultConfigGroupHosts = defaultConfigGroupHosts.without(host); - }, this); - item.desired_configs.forEach(function (config) { - newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({ - site: config.type, - tag: config.tag - })); - }, this); - configGroups.push(newConfigGroup); - } - }, this); - } + var configGroups = []; + if (data.config_groups.length) { + data.config_groups.forEach(function (item) { + item = item.ConfigGroup; + if (item.tag === serviceName) { + var groupHosts = item.hosts.mapProperty('host_name'); + var newConfigGroup = App.ConfigGroup.create({ + id: item.id, + name: item.group_name, + description: item.description, + isDefault: false, + parentConfigGroup: null, + service: App.Service.find().findProperty('serviceName', item.tag), + hosts: groupHosts, + publicHosts: manageCGController.hostsToPublic(groupHosts), + configSiteTags: [] + }); + groupHosts.forEach(function (host) { + defaultConfigGroupHosts = defaultConfigGroupHosts.without(host); + }, this); + item.desired_configs.forEach(function (config) { + newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({ + site: config.type, + tag: config.tag + })); + }, this); + configGroups.push(newConfigGroup); + } + }, this); } var defaultConfigGroup = App.ConfigGroup.create({ name: App.format.role(serviceName) + " Default", @@ -621,13 +619,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { var s = App.StackService.find(component.get('serviceName')), defaultGroupSelected = component.get('selectedConfigGroup.isDefault'); - if(!App.get('supports.serverRecommendValidate')) { - if (s && s.get('configsValidator')) { - var recommendedDefaults = this._getRecommendedDefaultsForComponent(component.get('serviceName')); - s.get('configsValidator').set('recommendedDefaults', recommendedDefaults); - } - } - configs.forEach(function (serviceConfigProperty) { if (!serviceConfigProperty) return; @@ -767,7 +758,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { }, applyServicesConfigs: function (configs, storedConfigs) { - if (this.get('allSelectedServiceNames').contains('YARN') && !App.get('supports.capacitySchedulerUi')) { + if (this.get('allSelectedServiceNames').contains('YARN')) { configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml'); } var dependendServices = ["STORM", "YARN"]; @@ -795,11 +786,9 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { * @method checkHostOverrideInstaller */ checkHostOverrideInstaller: function () { - if (App.get('supports.hostOverridesInstaller')) { - this.loadConfigGroups(this.get('content.configGroups')); - if (this.get('installedServiceNames').length > 0) { - this.loadInstalledServicesConfigGroups(this.get('installedServiceNames')); - } + this.loadConfigGroups(this.get('content.configGroups')); + if (this.get('installedServiceNames').length > 0) { + this.loadInstalledServicesConfigGroups(this.get('installedServiceNames')); } }, @@ -1020,7 +1009,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { * @method selectedServiceObserver */ selectedServiceObserver: function () { - if (App.supports.hostOverridesInstaller && this.get('selectedService') && (this.get('selectedService.serviceName') !== 'MISC')) { + if (this.get('selectedService') && (this.get('selectedService.serviceName') !== 'MISC')) { var serviceGroups = this.get('selectedService.configGroups'); serviceGroups.forEach(function (item, index, array) { if (item.isDefault) { @@ -1304,10 +1293,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { checkDatabaseConnectionTest: function () { var deferred = $.Deferred(); - if (!App.supports.databaseConnection) { - deferred.resolve(); - return deferred; - } var configMap = [ { serviceName: 'OOZIE', http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index de1929d..7cfaf8f 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -616,7 +616,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, { loadRepoInfoSuccessCallback: function (data) { var allRepos = []; data.items.forEach(function (os) { - if (!App.get('supports.ubuntu') && os.OperatingSystems.os_type == 'ubuntu12') return; // @todo: remove after Ubuntu support confirmation os.repositories.forEach(function (repository) { allRepos.push(Em.Object.create({ base_url: repository.Repositories.base_url, @@ -989,9 +988,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, { } this.createComponents(); this.registerHostsToCluster(); - if (App.get('supports.hostOverridesInstaller')) { - this.createConfigurationGroups(); - } + this.createConfigurationGroups(); this.createMasterHostComponents(); this.createSlaveAndClientsHostComponents(); if (this.get('content.controllerName') === 'addServiceController') { @@ -1405,7 +1402,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, { 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 (!App.supports.capacitySchedulerUi && service.get('serviceName') === 'MAPREDUCE' && (type === 'capacity-scheduler' || type === 'mapred-queue-acls')) { + if (service.get('serviceName') === 'MAPREDUCE' && (type === 'capacity-scheduler' || type === 'mapred-queue-acls')) { return; } else if (type === 'core-site') { coreSiteObject.service_config_version_note = serviceVersionNotes http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/data/BIGTOP/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/BIGTOP/site_properties.js b/ambari-web/app/data/BIGTOP/site_properties.js index da61b78..87fc8f8 100644 --- a/ambari-web/app/data/BIGTOP/site_properties.js +++ b/ambari-web/app/data/BIGTOP/site_properties.js @@ -2532,8 +2532,7 @@ module.exports = }, { displayName: 'Existing Oracle Database', - foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'] } ], "description": "PostgreSQL will be installed by Ambari", @@ -2857,25 +2856,17 @@ module.exports = displayName: 'New Derby Database', foreignKeys: ['oozie_derby_database'] }, - /*{ - displayName: 'New MySQL Database', - foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'], - hidden: !App.supports.hiveOozieExtraDatabases - },*/ { displayName: 'Existing MySQL Database', - foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'] }, { displayName: 'Existing PostgreSQL Database', - foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'] }, { displayName: 'Existing Oracle Database', - foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'] } ], "description": "Current Derby Database will be installed by Ambari", @@ -3730,7 +3721,6 @@ module.exports = "isReconfigurable": false, "displayType": "user", "isOverridable": false, - "isVisible": App.supports.customizeSmokeTestUser, "serviceName": "MISC", "filename": "cluster-env.xml", "category": "Users and Groups", http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index c298924..bf2ed7a 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -2813,8 +2813,7 @@ module.exports = }, { displayName: 'Existing Oracle Database', - foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'] } ], "description": "MySQL will be installed by Ambari", @@ -3162,25 +3161,17 @@ module.exports = displayName: 'New Derby Database', foreignKeys: ['oozie_derby_database'] }, - /*{ - displayName: 'New MySQL Database', - foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'], - hidden: !App.supports.hiveOozieExtraDatabases - },*/ { displayName: 'Existing MySQL Database', - foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'] }, { displayName: 'Existing PostgreSQL Database', - foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'] }, { displayName: 'Existing Oracle Database', - foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'] } ], "description": "Current Derby Database will be installed by Ambari", @@ -4035,7 +4026,6 @@ module.exports = "isReconfigurable": false, "displayType": "user", "isOverridable": false, - "isVisible": App.supports.customizeSmokeTestUser, "serviceName": "MISC", "filename": "cluster-env.xml", "category": "Users and Groups", http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/data/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js index d577819..ae844f5 100644 --- a/ambari-web/app/data/site_properties.js +++ b/ambari-web/app/data/site_properties.js @@ -1631,8 +1631,7 @@ module.exports = }, { displayName: 'Existing Oracle Database', - foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'] } ], "description": "MySQL will be installed by Ambari", @@ -1949,8 +1948,7 @@ module.exports = }, { displayName: 'Existing MySQL Database', - foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'] }, { displayName: 'Existing PostgreSQL Database', @@ -1958,8 +1956,7 @@ module.exports = }, { displayName: 'Existing Oracle Database', - foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'], - hidden: !App.supports.hiveOozieExtraDatabases + foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'] } ], "description": "Current Derby Database will be installed by Ambari", @@ -2276,52 +2273,6 @@ module.exports = "category": "Advanced zookeeper-env", "index": 1 }, - /**********************************************HUE***************************************/ - { - "id": "puppet var", - "name": "hueserver_host", - "displayName": "Hue Server host", - "value": "", - "defaultValue": "", - "description": "The host that has been assigned to run Hue Server", - "displayType": "masterHost", - "isRequiredByAgent": false, - "isOverridable": false, - "isVisible": true, - "serviceName": "HUE", - "filename": "hue-env.xml", - "category": "Hue Server" - }, - { - "id": "puppet var", - "name": "hue_log_dir", - "displayName": "HUE Log Dir", - "description": "Directory for HUE logs", - "defaultValue": "/var/log/hue", - "isReconfigurable": false, - "displayType": "directory", - "isOverridable": false, - "isRequiredByAgent": false, - "isVisible": true, - "serviceName": "HUE", - "filename": "hue-env.xml", - "category": "Advanced hue-env" - }, - { - "id": "puppet var", - "name": "hue_pid_dir", - "displayName": "HUE Pid Dir", - "description": "Directory in which the pid files for HUE processes will be created", - "defaultValue": "/var/run/hue", - "isReconfigurable": false, - "displayType": "directory", - "isOverridable": false, - "isRequiredByAgent": false, - "isVisible": true, - "serviceName": "HUE", - "filename": "hue-env.xml", - "category": "Advanced hue-env" - }, /**********************************************GANGLIA***************************************/ { "id": "puppet var", @@ -2568,7 +2519,6 @@ module.exports = "isReconfigurable": false, "displayType": "user", "isOverridable": false, - "isVisible": App.supports.customizeSmokeTestUser, "serviceName": "MISC", "filename": "cluster-env.xml", "category": "Users and Groups",
