ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [35/35] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Wed, 12 Apr 2017 13:49:20 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f638715
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f638715
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f638715

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9f63871575c5742643035139e1e8a23181ede083
Parents: f650e35 11ab63f
Author: Nate Cole <ncole@hortonworks.com>
Authored: Wed Apr 12 09:48:35 2017 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Wed Apr 12 09:48:35 2017 -0400

----------------------------------------------------------------------
 .../ambari_commons/resources/os_family.json     |   1 +
 .../libraries/functions/solr_cloud_util.py      |   7 +-
 .../ambari-logsearch-config-api/.gitignore      |   1 +
 .../ambari-logsearch-config-api/pom.xml         |  57 ++
 .../config/api/InputConfigMonitor.java          |  41 ++
 .../logsearch/config/api/LogSearchConfig.java   |  90 +++
 .../config/api/LogSearchConfigFactory.java      |  68 +++
 .../config/api/LogSearchConfigClass1.java       |  55 ++
 .../config/api/LogSearchConfigClass2.java       |  55 ++
 .../config/api/LogSearchConfigFactoryTest.java  |  58 ++
 .../config/api/NonLogSearchConfigClass.java     |  23 +
 .../src/test/resources/log4j.xml                |  34 ++
 .../.gitignore                                  |   1 +
 .../ambari-logsearch-config-zookeeper/pom.xml   |  74 +++
 .../config/zookeeper/LogSearchConfigZK.java     | 213 ++++++++
 .../ambari-logsearch-logfeeder/pom.xml          |  66 ++-
 .../org/apache/ambari/logfeeder/LogFeeder.java  | 384 +------------
 .../ambari/logfeeder/common/ConfigHandler.java  | 428 +++++++++++++++
 .../logfeeder/input/InputConfigUploader.java    |  94 ++++
 .../ambari/logfeeder/input/InputManager.java    | 304 ++++++-----
 .../ambari/logfeeder/input/InputSimulate.java   |  22 +-
 .../ambari/logfeeder/output/OutputManager.java  |   7 -
 .../ambari/logfeeder/output/OutputS3File.java   |   4 +-
 .../ambari/logfeeder/util/LogFeederUtil.java    |   3 +
 .../apache/ambari/logfeeder/util/SSLUtil.java   |   5 +-
 .../src/main/resources/log4j.xml                |   6 +-
 .../ambari/logfeeder/input/InputFileTest.java   |   3 +-
 .../logfeeder/input/InputManagerTest.java       |  70 +--
 .../logfeeder/output/OutputManagerTest.java     |  11 +-
 .../ambari-logsearch-server/pom.xml             |  18 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |   1 +
 .../logsearch/common/PropertiesHelper.java      |   3 +
 .../conf/global/LogSearchConfigState.java       |  35 ++
 .../ambari/logsearch/configurer/Configurer.java |  23 +
 .../configurer/LogSearchConfigConfigurer.java   |  69 +++
 .../configurer/LogfeederFilterConfigurer.java   |   2 +-
 .../configurer/SolrAuditAliasConfigurer.java    |   2 +-
 .../configurer/SolrCollectionConfigurer.java    |   2 +-
 .../logsearch/configurer/SolrConfigurer.java    |  23 -
 .../ambari/logsearch/doc/DocConstants.java      |   6 +
 .../logsearch/manager/ShipperConfigManager.java |  81 +++
 .../logsearch/rest/ShipperConfigResource.java   |  73 +++
 .../ambari-logsearch-web/.gitignore             |   1 +
 .../test-config/logfeeder/logfeeder.properties  |  12 +-
 .../test-config/logsearch/logsearch.properties  |   2 +
 ambari-logsearch/pom.xml                        |   2 +
 .../ambari/annotations/TransactionalLock.java   |   6 +-
 .../server/actionmanager/ActionDBAccessor.java  |  50 +-
 .../server/actionmanager/ActionScheduler.java   | 154 +++---
 .../server/actionmanager/HostRoleCommand.java   |  26 +
 .../ambari/server/agent/ExecutionCommand.java   |   2 +-
 .../alerts/AmbariPerformanceRunnable.java       |   4 +-
 .../server/api/handlers/RequestHandler.java     |   2 +-
 .../api/predicate/expressions/Expression.java   |  14 +-
 .../predicate/operators/LogicalOperator.java    |   2 +-
 .../api/predicate/operators/Operator.java       |   8 +-
 .../predicate/operators/RelationalOperator.java |   2 +-
 .../apache/ambari/server/api/query/Query.java   |  18 +-
 .../server/api/query/render/Renderer.java       |  12 +-
 .../server/api/resources/ResourceInstance.java  |  12 +-
 .../api/resources/ResourceInstanceFactory.java  |   2 +-
 .../api/services/ResultPostProcessor.java       |   2 +-
 .../server/api/services/ResultStatus.java       |   4 +-
 .../api/services/parsers/RequestBodyParser.java |  12 +-
 .../persistence/PersistenceManager.java         |   6 +-
 .../stackadvisor/StackAdvisorRequest.java       |   2 +-
 .../commands/StackAdvisorCommandType.java       |   2 +-
 .../apache/ambari/server/api/util/TreeNode.java |  28 +-
 .../checks/DatabaseConsistencyCheckHelper.java  | 117 ++++
 .../ambari/server/checks/UpgradeCheckGroup.java |   2 +-
 .../server/configuration/Configuration.java     |   8 +-
 .../AmbariCustomCommandExecutionHelper.java     |   3 +-
 .../controller/AmbariManagementController.java  |  12 +-
 .../server/controller/KerberosHelper.java       |   2 +-
 .../controller/MaintenanceStateHelper.java      |   4 +-
 .../server/controller/StackServiceResponse.java |   8 +
 .../gsinstaller/GSInstallerStateProvider.java   |   2 +-
 .../internal/AbstractResourceProvider.java      |   2 +-
 .../internal/ArtifactResourceProvider.java      |  20 +-
 .../BlueprintConfigurationProcessor.java        |  11 +-
 .../internal/JobResourceProvider.java           |   8 +-
 .../internal/ObservableResourceProvider.java    |   4 +-
 .../internal/ResourceProviderObserver.java      |   2 +-
 .../internal/StackServiceResourceProvider.java  |   6 +
 .../internal/TaskAttemptResourceProvider.java   |  10 +-
 .../internal/WidgetLayoutResourceProvider.java  |   2 +-
 .../internal/WidgetResourceProvider.java        |   2 +-
 .../internal/WorkflowResourceProvider.java      |   8 +-
 .../server/controller/ivory/IvoryService.java   |  34 +-
 .../controller/jdbc/ConnectionFactory.java      |   2 +-
 .../server/controller/jmx/JMXHostProvider.java  |  10 +-
 .../logging/LoggingRequestHelper.java           |   8 +-
 .../controller/metrics/MetricHostProvider.java  |  10 +-
 .../metrics/MetricsPaddingMethod.java           |   2 +-
 .../metrics/MetricsServiceProvider.java         |   4 +-
 .../controller/predicate/BasePredicate.java     |   2 +-
 .../controller/predicate/PredicateVisitor.java  |  10 +-
 .../predicate/PredicateVisitorAcceptor.java     |   2 +-
 .../spi/ExtendedResourceProvider.java           |   2 +-
 .../server/controller/spi/PageRequest.java      |  10 +-
 .../server/controller/spi/PageResponse.java     |  10 +-
 .../ambari/server/controller/spi/Predicate.java |   2 +-
 .../server/controller/spi/PropertyProvider.java |   4 +-
 .../server/controller/spi/ProviderModule.java   |   4 +-
 .../server/controller/spi/QueryResponse.java    |   8 +-
 .../server/controller/spi/RequestStatus.java    |   8 +-
 .../spi/ResourcePredicateEvaluator.java         |   2 +-
 .../ambari/server/controller/spi/Schema.java    |   4 +-
 .../server/controller/spi/SchemaFactory.java    |   2 +-
 .../server/controller/spi/SortRequest.java      |   6 +-
 .../controller/utilities/StreamProvider.java    |   4 +-
 .../server/notifications/DispatchCallback.java  |   4 +-
 .../apache/ambari/server/orm/DBAccessor.java    |   6 +
 .../ambari/server/orm/DBAccessorImpl.java       |   5 +
 .../server/orm/JPATableGenerationStrategy.java  |   2 +-
 .../orm/cache/ConfigGroupHostMapping.java       |  16 +-
 .../server/orm/cache/HostConfigMapping.java     |  32 +-
 .../server/orm/dao/HostRoleCommandDAO.java      |  65 +++
 .../ambari/server/orm/dao/RequestDAO.java       | 260 ++++++++-
 .../server/orm/dao/TopologyHostTaskDAO.java     |  11 +
 .../orm/dao/TopologyLogicalRequestDAO.java      |  12 +
 .../server/orm/dao/TopologyLogicalTaskDAO.java  |  12 +
 .../orm/entities/BlueprintConfiguration.java    |  16 +-
 .../orm/entities/ExecutionCommandEntity.java    |   5 +
 .../orm/entities/HostRoleCommandEntity.java     |  31 +-
 .../server/orm/entities/RequestEntity.java      |   6 +
 .../entities/RequestOperationLevelEntity.java   |   4 +-
 .../entities/RequestResourceFilterEntity.java   |   5 +
 .../orm/entities/RoleSuccessCriteriaEntity.java |   5 +
 .../ambari/server/orm/entities/StageEntity.java |   6 +-
 .../orm/entities/TopologyHostRequestEntity.java |   5 +
 .../orm/entities/TopologyHostTaskEntity.java    |  15 +-
 .../entities/TopologyLogicalRequestEntity.java  |   5 +
 .../orm/entities/TopologyLogicalTaskEntity.java |  30 +-
 .../server/orm/entities/UpgradeEntity.java      |   2 +
 .../server/orm/entities/UpgradeItemEntity.java  |   5 +
 .../ambari/server/scheduler/ExecutionJob.java   |  10 +-
 .../server/scheduler/ExecutionScheduler.java    |  16 +-
 .../ambari/server/security/SecurityHelper.java  |   4 +-
 .../security/authorization/ResourceType.java    |   2 +-
 .../security/encryption/MasterKeyService.java   |   4 +-
 .../kerberos/KerberosConfigDataFile.java        |  14 +-
 .../kerberos/KerberosIdentityDataFile.java      |  24 +-
 .../ambari/server/stack/ConfigurationInfo.java  |   6 +-
 .../ambari/server/stack/ServiceModule.java      |   4 +
 .../server/stack/StackDefinitionModule.java     |  16 +-
 .../apache/ambari/server/stack/Validable.java   |  10 +-
 .../org/apache/ambari/server/state/Cluster.java |   4 +-
 .../server/state/CommandScriptDefinition.java   |   2 +-
 .../org/apache/ambari/server/state/Config.java  |  22 +-
 .../ambari/server/state/HostHealthStatus.java   |   2 +-
 .../apache/ambari/server/state/ServiceInfo.java |  26 +
 .../ambari/server/state/UpgradeHelper.java      |   4 +-
 .../ambari/server/state/action/Action.java      |  14 +-
 .../server/state/configgroup/ConfigGroup.java   |  32 +-
 .../server/state/fsm/MultipleArcTransition.java |   2 +-
 .../server/state/fsm/SingleArcTransition.java   |   2 +-
 .../ambari/server/state/fsm/StateMachine.java   |   6 +-
 .../kerberos/AbstractKerberosDescriptor.java    |   2 +-
 .../state/scheduler/RequestExecution.java       |  56 +-
 .../state/stack/upgrade/UpgradeFunction.java    |   2 +-
 .../ambari/server/topology/Blueprint.java       |  34 +-
 .../server/topology/BlueprintFactory.java       |   2 +-
 .../server/topology/BlueprintValidator.java     |   4 +-
 .../ambari/server/topology/HostGroup.java       |  28 +-
 .../ambari/server/topology/TopologyRequest.java |  16 +-
 .../server/topology/TopologyRequestFactory.java |   2 +-
 .../server/topology/TopologyValidator.java      |   2 +-
 .../server/topology/tasks/TopologyTask.java     |   4 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |   2 +-
 .../server/upgrade/UpgradeCatalog300.java       |  35 ++
 .../server/view/ViewInstanceHandlerList.java    |   4 +-
 .../view/persistence/SchemaManagerFactory.java  |   2 +-
 ambari-server/src/main/python/ambari-server.py  |  10 +-
 .../src/main/python/ambari_server/dbCleanup.py  |  37 +-
 .../python/ambari_server/serverConfiguration.py |   3 +
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   3 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   1 +
 .../configuration/accumulo-logsearch-conf.xml   | 124 -----
 .../templates/input.config-accumulo.json.j2     |  92 ++++
 .../configuration/infra-logsearch-conf.xml      |  80 ---
 .../templates/input.config-ambari-infra.json.j2 |  48 ++
 .../0.1.0/configuration/ams-logsearch-conf.xml  | 201 -------
 .../input.config-ambari-metrics.json.j2         | 169 ++++++
 .../configuration/atlas-logsearch-conf.xml      |  80 ---
 .../templates/input.config-atlas.json.j2        |  48 ++
 .../configuration/falcon-logsearch-conf.xml     |  80 ---
 .../templates/input.config-falcon.json.j2       |  48 ++
 .../configuration/flume-logsearch-conf.xml      |  80 ---
 .../templates/input.config-flume.json.j2        |  53 ++
 .../configuration/hbase-logsearch-conf.xml      | 111 ----
 .../templates/input.config-hbase.json.j2        |  79 +++
 .../configuration/hdfs-logsearch-conf.xml       | 248 ---------
 .../package/templates/input.config-hdfs.json.j2 | 216 ++++++++
 .../configuration/hive-logsearch-conf.xml       | 117 ----
 .../package/templates/input.config-hive.json.j2 |  85 +++
 .../configuration/kafka-logsearch-conf.xml      | 124 -----
 .../templates/input.config-kafka.json.j2        |  92 ++++
 .../configuration/knox-logsearch-conf.xml       |  93 ----
 .../package/templates/input.config-knox.json.j2 |  60 ++
 .../configuration/logfeeder-ambari-config.xml   |   1 +
 .../logfeeder-custom-logsearch-conf.xml         |  46 --
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  44 +-
 .../0.5.0/package/scripts/setup_logfeeder.py    |  15 +-
 .../templates/HadoopServiceConfig.json.j2       | 545 ++++++++++++++++---
 .../templates/input.config-logsearch.json.j2    |   6 +-
 .../configuration/oozie-logsearch-conf.xml      |  80 ---
 .../templates/input.config-oozie.json.j2        |  48 ++
 .../configuration/ranger-logsearch-conf.xml     | 111 ----
 .../templates/input.config-ranger.json.j2       |  79 +++
 .../configuration/ranger-kms-logsearch-conf.xml |  80 ---
 .../templates/input.config-ranger-kms.json.j2   |  48 ++
 .../configuration/spark-logsearch-conf.xml      |  98 ----
 .../templates/input.config-spark.json.j2        |  66 +++
 .../configuration/spark2-logsearch-conf.xml     |  98 ----
 .../templates/input.config-spark2.json.j2       |  66 +++
 .../configuration/storm-logsearch-conf.xml      | 110 ----
 .../templates/input.config-storm.json.j2        |  78 +++
 .../mapred-logsearch-conf.xml                   |  80 ---
 .../configuration/yarn-logsearch-conf.xml       | 104 ----
 .../templates/input.config-mapreduce2.json.j2   |  48 ++
 .../package/templates/input.config-yarn.json.j2 |  72 +++
 .../configuration/zeppelin-logsearch-conf.xml   |  80 ---
 .../templates/input.config-zeppelin.json.j2     |  48 ++
 .../configuration/zookeeper-logsearch-conf.xml  |  76 ---
 .../templates/input.config-zookeeper.json.j2    |  46 ++
 .../src/main/resources/properties.json          |   1 +
 .../2.0.6/hooks/after-INSTALL/scripts/params.py |  14 +
 .../scripts/shared_initialization.py            |  17 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |   2 +-
 .../configuration/hbase-logsearch-conf.xml      | 111 ----
 .../templates/input.config-hbase.json.j2        |  79 +++
 .../configuration/hdfs-logsearch-conf.xml       | 248 ---------
 .../package/templates/input.config-hdfs.json.j2 | 216 ++++++++
 .../actionmanager/TestActionScheduler.java      |  41 +-
 .../DatabaseConsistencyCheckHelperTest.java     |  66 +++
 .../AbstractJDBCResourceProviderTest.java       |   2 +-
 .../ambari/server/state/ServiceInfoTest.java    |  47 ++
 .../state/cluster/AlertDataManagerTest.java     |   4 +-
 .../ambari/server/upgrade/SectionDDL.java       |   4 +-
 .../server/upgrade/UpgradeCatalog300Test.java   |  87 +++
 .../stacks/2.0.6/YARN/test_nodemanager.py       |   6 +-
 .../stacks/2.3/ATLAS/test_metadata_server.py    |   6 +-
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py      |  28 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py      |   1 +
 .../stacks/2.5/RANGER/test_ranger_admin.py      |   8 +-
 .../stacks/2.6/RANGER/test_ranger_admin.py      |   8 +-
 ambari-web/app/app.js                           |   4 +
 ambari-web/app/assets/test/tests.js             |   1 -
 ambari-web/app/config.js                        |   2 -
 .../controllers/global/cluster_controller.js    |  31 +-
 ambari-web/app/controllers/installer.js         |  14 +-
 ambari-web/app/controllers/main.js              |  28 +-
 ambari-web/app/controllers/main/host/details.js |  14 +-
 .../app/controllers/wizard/step3_controller.js  |  10 +-
 ambari-web/app/mappers/stack_service_mapper.js  |   1 +
 .../main/host/details/actions/check_host.js     |  24 +-
 ambari-web/app/models/host_component.js         |   3 +-
 ambari-web/app/models/stack_service.js          |   1 +
 ambari-web/app/routes/main.js                   |  34 +-
 .../app/styles/theme/bootstrap-ambari.css       |  36 +-
 .../templates/main/service/services/oozie.hbs   |  40 --
 ambari-web/app/templates/wizard/step1.hbs       |   2 +-
 ambari-web/app/views.js                         |   1 -
 .../app/views/common/quick_view_link_view.js    |   8 -
 .../app/views/main/service/info/summary.js      |   7 -
 .../app/views/main/service/services/hbase.js    |   6 -
 .../app/views/main/service/services/hdfs.js     |   4 -
 .../app/views/main/service/services/oozie.js    |  29 -
 .../wizard/step3/hostWarningPopupFooter_view.js |   4 +-
 .../global/cluster_controller_test.js           |  73 +--
 ambari-web/test/controllers/main_test.js        |  67 ---
 ambari-web/test/init_test.js                    |   2 +
 .../test/mappers/stack_service_mapper_test.js   |   7 +-
 .../test/views/common/quick_link_view_test.js   |  10 -
 .../views/main/service/info/summary_test.js     |  26 -
 ambari-web/test/views/main/service/item_test.js |   3 +
 .../views/main/service/services/hbase_test.js   |  23 -
 .../views/main/service/services/hdfs_test.js    |  20 -
 .../views/main/service/services/oozie_test.js   |  55 --
 .../step3/hostWarningPopupFooter_view_test.js   |  14 +-
 .../ui/app/utils/hive-explainer/renderer.js     |  40 +-
 .../ui/app/components/flow-designer.js          |  13 +-
 .../ui/app/components/global-config.js          |   5 +
 .../ui/app/domain/cytoscape-flow-renderer.js    |   2 +-
 .../resources/ui/app/domain/cytoscape-style.js  |  10 +-
 .../src/main/resources/ui/app/index.html        |  14 +
 .../resources/ui/app/routes/design/jobtab.js    |   2 +-
 .../src/main/resources/ui/app/styles/app.less   |   6 +
 .../templates/components/coord-job-details.hbs  |  66 ++-
 .../app/templates/components/global-config.hbs  |   2 +-
 .../main/resources/ui/public/assets/custom.png  | Bin 0 -> 350 bytes
 .../main/resources/ui/public/assets/distcp.png  | Bin 0 -> 229 bytes
 .../main/resources/ui/public/assets/email.png   | Bin 0 -> 340 bytes
 .../src/main/resources/ui/public/assets/fs.png  | Bin 0 -> 254 bytes
 .../main/resources/ui/public/assets/hive.png    | Bin 0 -> 270 bytes
 .../main/resources/ui/public/assets/hive2.png   | Bin 0 -> 270 bytes
 .../main/resources/ui/public/assets/java.png    | Bin 0 -> 385 bytes
 .../resources/ui/public/assets/map-reduce.png   | Bin 0 -> 552 bytes
 .../src/main/resources/ui/public/assets/pig.png | Bin 0 -> 342 bytes
 .../main/resources/ui/public/assets/shell.png   | Bin 0 -> 222 bytes
 .../main/resources/ui/public/assets/spark.png   | Bin 0 -> 381 bytes
 .../main/resources/ui/public/assets/sqoop.png   | Bin 0 -> 482 bytes
 .../src/main/resources/ui/public/assets/ssh.png | Bin 0 -> 222 bytes
 .../resources/ui/public/assets/sub-workflow.png | Bin 0 -> 433 bytes
 dev-support/test-patch.sh                       |   4 +-
 docs/pom.xml                                    |  12 +
 311 files changed, 6074 insertions(+), 4540 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f638715/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
----------------------------------------------------------------------


Mime
View raw message