This is an automated email from the ASF dual-hosted git repository.

ncole pushed a commit to branch branch-feature-AMBARI-21674
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 8ef2a23db4f658af44750467742de4e41fba39fb
Merge: c9a4d06 eb6c7d6
Author: ncole <[email protected]>
AuthorDate: Wed Jan 24 15:34:06 2018 -0500

    Merge pull request #174 from 
yussufsh/AMBARI-22816-branch-feature-AMBARI-21674
    
    [AMBARI-22816] Use of OS family instead of OS type in hybrid setup for 
JAVA_HOME, Ambari and HDP repos

 .github/PULL_REQUEST_TEMPLATE.md                   |    10 +
 .../src/main/resources/ui/admin-web/app/index.html |     6 +-
 .../main/resources/ui/admin-web/app/scripts/app.js |     2 +-
 .../stackVersions/StackVersionsEditCtrl.js         |     2 +-
 .../controllers/userManagement/GroupsListCtrl.js   |     6 +-
 .../ui/admin-web/app/scripts/services/User.js      |     9 +
 .../admin-web/app/styles/cluster-information.css   |    29 +-
 .../resources/ui/admin-web/app/styles/main.css     |     9 +
 .../app/views/clusters/clusterInformation.html     |     8 +-
 .../src/main/resources/ui/admin-web/bower.json     |    11 +-
 .../src/main/resources/ui/admin-web/package.json   |     4 +-
 .../main/python/ambari_agent/alerts/ams_alert.py   |     4 +-
 .../main/python/ambari_agent/alerts/base_alert.py  |    47 +-
 .../python/ambari_agent/alerts/metric_alert.py     |     3 +-
 .../main/python/ambari_agent/alerts/port_alert.py  |     4 +-
 .../main/python/ambari_agent/alerts/web_alert.py   |     6 +-
 .../src/main/python/ambari_commons/inet_utils.py   |    46 +
 .../python/ambari_commons/kerberos/__init__.py     |    19 +
 .../ambari_commons/kerberos/kerberos_common.py     |   168 +
 .../main/python/ambari_commons/kerberos}/utils.py  |     4 +
 .../src/main/python/ambari_commons/os_check.py     |     2 +
 ambari-infra/ambari-infra-assembly/pom.xml         |    43 +-
 .../src/main/package/deb/manager/postinst          |     9 +-
 .../src/main/package/deb/manager/postrm            |     8 +
 .../src/main/package/rpm/manager/postinstall.sh    |    11 +-
 .../manager/postinst => rpm/manager/postremove.sh} |     7 +-
 ambari-infra/ambari-infra-manager-it/pom.xml       |    12 +
 .../java/org/apache/ambari/infra/InfraClient.java  |    25 +-
 .../ambari/infra/steps/AbstractInfraSteps.java     |    43 +-
 .../apache/ambari/infra/steps/ExportJobsSteps.java |    59 +-
 .../test/resources/stories/infra_api_tests.story   |    23 +-
 ambari-infra/ambari-infra-manager/.gitignore       |     5 +-
 ambari-infra/ambari-infra-manager/build.xml        |    11 +-
 .../ambari-infra-manager/docker/bin/start.sh       |     2 +-
 .../ambari-infra-manager/docker/docker-compose.yml |    25 +-
 .../docker/infra-manager-docker-compose.sh         |    35 +-
 ambari-infra/ambari-infra-manager/pom.xml          |    39 +-
 .../java/org/apache/ambari/infra/InfraManager.java |     2 +-
 .../org/apache/ambari/infra/job/JobProperties.java |     2 +-
 .../archive/DocumentArchivingConfiguration.java    |    76 +-
 ...rties.java => DocumentArchivingProperties.java} |    87 +-
 ...yMap.java => DocumentArchivingPropertyMap.java} |    16 +-
 .../infra/job/archive/ExportDestination.java       |    31 +-
 .../infra/job/archive/FileNameSuffixFormatter.java |    17 +-
 .../ambari/infra/job/archive/HdfsUploader.java     |    55 +
 .../deleting/DocumentDeletingConfiguration.java    |     3 +
 .../infra/model/JobExecutionRestartRequest.java    |    10 +
 .../src/main/resources/infra-manager-env.sh        |    24 +-
 .../src/main/resources/infra-manager.properties    |    82 +-
 .../src/main/resources/infraManager.sh             |   258 +-
 .../apache/ambari/infra/job/JobPropertiesTest.java |    26 +-
 .../job/archive/FileNameSuffixFormatterTest.java   |     2 +-
 .../vagrant-infra-manager.properties.sample        |    37 +
 ambari-infra/pom.xml                               |     1 +
 .../src/main/package/rpm/logfeeder/postinstall.sh  |     5 +-
 .../src/main/package/rpm/logfeeder/postremove.sh   |     6 +-
 .../{postremove.sh => postremove.sh~HEAD}          |     0
 .../{postremove.sh => postremove.sh~trunk}         |     0
 .../src/main/package/rpm/portal/postinstall.sh     |     5 +-
 .../src/main/package/rpm/portal/postremove.sh      |     6 +-
 .../portal/{postremove.sh => postremove.sh~HEAD}   |     0
 .../portal/{postremove.sh => postremove.sh~trunk}  |     0
 .../api/model/inputconfig/CustomDescriptor.java}   |    23 +-
 .../model/inputconfig/InputCustomDescriptor.java}  |    24 +-
 .../model/inputconfig/MapCustomDescriptor.java}    |    24 +-
 .../model/inputconfig/impl/InputAdapter.java       |     4 +-
 .../impl/InputCustomDescriptorImpl.java            |    71 +
 .../inputconfig/impl/InputDescriptorImpl.java      |     2 +
 .../inputconfig/impl/MapCustomDescriptorImpl.java  |    81 +
 .../inputconfig/impl/PostMapValuesAdapter.java     |    12 +-
 .../ambari-logsearch-logfeeder-plugin-api/pom.xml  |    76 +
 .../ambari/logfeeder/plugin/common}/AliasUtil.java |    51 +-
 .../ambari/logfeeder/plugin/common/ConfigItem.java |   191 +
 .../plugin/common/LogFeederProperties.java}        |    26 +-
 .../logfeeder/plugin/common}/MetricData.java       |    17 +-
 .../ambari/logfeeder/plugin}/filter/Filter.java    |   152 +-
 .../logfeeder/plugin/filter}/mapper/Mapper.java    |    41 +-
 .../ambari/logfeeder/plugin}/input/Input.java      |   353 +-
 .../logfeeder/plugin/input/InputMarker.java}       |    21 +-
 .../logfeeder/plugin}/input/cache/LRUCache.java    |     2 +-
 .../logfeeder/plugin/manager/BlockManager.java}    |    31 +-
 .../logfeeder/plugin/manager/InputManager.java}    |    36 +-
 .../logfeeder/plugin/manager/OutputManager.java}   |    37 +-
 .../ambari/logfeeder/plugin}/output/Output.java    |   123 +-
 .../ambari-logsearch-logfeeder/pom.xml             |    10 +
 .../ambari/logfeeder/common/ConfigBlock.java       |   153 -
 .../ambari/logfeeder/common/ConfigHandler.java     |   111 +-
 .../apache/ambari/logfeeder/common/ConfigItem.java |   103 -
 .../logfeeder/common/LogEntryParseTester.java      |    51 +-
 .../ambari/logfeeder/conf/ApplicationConfig.java   |    13 +-
 .../ambari/logfeeder/conf/LogEntryCacheConfig.java |     4 +-
 .../ambari/logfeeder/conf/LogFeederProps.java      |     3 +-
 .../logfeeder/conf/LogFeederSecurityConfig.java    |     2 +
 .../apache/ambari/logfeeder/filter/FilterGrok.java |    50 +-
 .../apache/ambari/logfeeder/filter/FilterJSON.java |    24 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java    |    38 +-
 .../ambari/logfeeder/input/AbstractInputFile.java  |   329 -
 .../logfeeder/input/InputConfigUploader.java       |    26 +-
 .../apache/ambari/logfeeder/input/InputFile.java   |   277 +-
 .../{InputMarker.java => InputFileMarker.java}     |    46 +-
 .../{InputManager.java => InputManagerImpl.java}   |    76 +-
 .../apache/ambari/logfeeder/input/InputS3File.java |    61 +-
 .../ambari/logfeeder/input/InputSimulate.java      |    81 +-
 .../logfeeder/input/file/FileCheckInHelper.java    |    93 +
 .../logfeeder/input/file/ProcessFileHelper.java    |   143 +
 .../input/file/ResumeLineNumberHelper.java         |    91 +
 .../ambari/logfeeder/input/reader/GZIPReader.java  |     4 +-
 .../input/reader/LogsearchReaderFactory.java       |     4 +-
 .../loglevelfilter/LogLevelFilterHandler.java      |    30 +-
 .../ambari/logfeeder/mapper/MapperAnonymize.java   |    11 +-
 .../apache/ambari/logfeeder/mapper/MapperDate.java |    32 +-
 .../ambari/logfeeder/mapper/MapperFieldCopy.java   |     8 +-
 .../ambari/logfeeder/mapper/MapperFieldName.java   |    10 +-
 .../ambari/logfeeder/mapper/MapperFieldValue.java  |    10 +-
 .../ambari/logfeeder/metrics/MetricsManager.java   |     1 +
 .../ambari/logfeeder/metrics/StatsLogger.java      |     1 +
 .../apache/ambari/logfeeder/output/OutputData.java |     4 +-
 .../ambari/logfeeder/output/OutputDevNull.java     |    48 +-
 .../apache/ambari/logfeeder/output/OutputFile.java |    55 +-
 .../ambari/logfeeder/output/OutputHDFSFile.java    |    41 +-
 .../ambari/logfeeder/output/OutputKafka.java       |    52 +-
 .../ambari/logfeeder/output/OutputLineFilter.java  |     4 +-
 .../{OutputManager.java => OutputManagerImpl.java} |    69 +-
 .../ambari/logfeeder/output/OutputS3File.java      |    34 +-
 .../apache/ambari/logfeeder/output/OutputSolr.java |    58 +-
 .../logfeeder/output/S3OutputConfiguration.java    |    12 +-
 .../apache/ambari/logfeeder/output/S3Uploader.java |     1 -
 .../ambari/logfeeder/output/spool/LogSpooler.java  |    13 +-
 .../ambari/logfeeder/util/LogFeederUtil.java       |    37 +-
 .../src/main/scripts/logfeeder-env.sh~HEAD         |    30 +-
 .../src/main/scripts/logfeeder-env.sh~trunk        |    30 +-
 .../src/main/scripts/logfeeder.sh                  |    12 +-
 .../ambari/logfeeder/filter/FilterGrokTest.java    |    26 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java    |    18 +-
 .../logfeeder/filter/FilterKeyValueTest.java       |    20 +-
 .../ambari/logfeeder/input/InputFileTest.java      |    46 +-
 .../ambari/logfeeder/input/InputManagerTest.java   |    25 +-
 .../ambari/logfeeder/input/cache/LRUCacheTest.java |     1 +
 .../logfeeder/metrics/MetricsManagerTest.java      |     2 +
 .../ambari/logfeeder/output/OutputKafkaTest.java   |     6 +-
 .../logfeeder/output/OutputLineFilterTest.java     |     4 +-
 .../ambari/logfeeder/output/OutputManagerTest.java |    35 +-
 .../ambari/logfeeder/output/OutputS3FileTest.java  |   105 -
 .../ambari/logfeeder/output/OutputSolrTest.java    |   183 -
 .../src/main/scripts/logsearch-env.sh~HEAD         |    30 +-
 .../src/main/scripts/logsearch-env.sh~trunk        |    30 +-
 .../src/main/scripts/logsearch.sh                  |    12 +-
 ambari-logsearch/ambari-logsearch-web/package.json |     1 +
 .../ambari-logsearch-web/src/app/app.module.ts     |    13 +-
 .../classes/components/graph/graph.component.less  |     1 +
 .../classes/components/graph/graph.component.ts    |   140 +-
 ...ph.component.less => time-graph.component.less} |    44 +-
 .../components/graph/time-graph.component.ts}      |   150 +-
 .../ambari-logsearch-web/src/app/classes/graph.ts  |    24 +
 .../src/app/classes/models/store.ts                |     1 +
 ...ec.ts => audit-logs-graph-query-params.spec.ts} |     6 +-
 ...-params.ts => audit-logs-graph-query-params.ts} |     7 +-
 .../queries/service-logs-histogram-query-params.ts |    50 +-
 .../audit-logs-entries.component.html              |    14 +-
 .../audit-logs-entries.component.spec.ts           |     3 +
 .../audit-logs-entries.component.ts                |    47 +
 .../audit-logs-table.component.spec.ts             |     7 +-
 .../collapsible-panel.component.html               |     6 +-
 .../collapsible-panel.component.spec.ts            |     4 +-
 .../collapsible-panel.component.ts                 |     4 +-
 .../context-menu.component.html}                   |    11 +-
 .../context-menu/context-menu.component.less       |    10 +-
 .../context-menu.component.spec.ts}                |    67 +-
 .../context-menu/context-menu.component.ts         |    72 +
 .../dropdown-button.component.spec.ts              |     7 +-
 .../dropdown-list/dropdown-list.component.html     |     3 +-
 .../dropdown-list/dropdown-list.component.spec.ts  |     7 +-
 .../filter-button/filter-button.component.spec.ts  |     7 +-
 .../filter-dropdown.component.spec.ts              |     3 +
 .../filters-panel/filters-panel.component.spec.ts  |     7 +-
 .../horizontal-histogram.component.ts              |     8 +-
 .../log-context/log-context.component.spec.ts      |     7 +-
 .../log-message/log-message.component.html         |     2 +-
 .../log-message/log-message.component.less         |    27 +-
 .../log-message/log-message.component.spec.ts      |    14 +
 .../log-message/log-message.component.ts           |    24 +-
 .../logs-container/logs-container.component.html   |    28 +-
 .../logs-container/logs-container.component.less   |     3 +-
 .../logs-container.component.spec.ts               |     7 +-
 .../logs-container/logs-container.component.ts     |    30 +-
 .../menu-button/menu-button.component.spec.ts      |     7 +-
 .../service-logs-table.component.html              |   188 +-
 .../service-logs-table.component.less              |   216 +-
 .../service-logs-table.component.spec.ts           |    24 +-
 .../service-logs-table.component.ts                |   198 +-
 .../time-histogram/time-histogram.component.html   |     2 +-
 .../time-histogram/time-histogram.component.less   |    36 -
 .../time-histogram.component.spec.ts               |     1 -
 .../time-histogram/time-histogram.component.ts     |   247 +-
 .../time-line-graph.component.html}                |    14 +-
 .../time-line-graph/time-line-graph.component.less |    32 +-
 .../time-line-graph.component.spec.ts              |    69 +
 .../time-line-graph/time-line-graph.component.ts   |   111 +
 .../time-range-picker.component.spec.ts            |     7 +-
 .../timezone-picker.component.spec.ts              |     7 +-
 .../components/top-menu/top-menu.component.spec.ts |     3 +
 .../src/app/components/variables.less              |     7 +
 .../ambari-logsearch-web/src/app/mock-data.ts      |    36 +-
 .../app/services/component-actions.service.spec.ts |     7 +-
 .../services/component-generator.service.spec.ts   |     7 +-
 .../src/app/services/http-client.service.ts        |     5 +
 .../app/services/logs-container.service.spec.ts    |     3 +
 .../src/app/services/logs-container.service.ts     |    74 +-
 .../storage/audit-logs-graph-data.service.ts       |    26 +-
 .../src/app/services/storage/reducers.service.ts   |     2 +
 .../ambari-logsearch-web/src/assets/i18n/en.json   |     5 +
 ambari-logsearch/ambari-logsearch-web/yarn.lock    |     4 +
 ambari-logsearch/pom.xml                           |     1 +
 ambari-project/pom.xml                             |     2 +-
 ambari-server/docs/api/generated/index.html        | 30360 +++++++++++--------
 ambari-server/docs/api/generated/swagger.json      |  4906 +--
 .../docs/api/v1/authentication-source-create.md    |    86 +
 .../docs/api/v1/authentication-source-delete.md    |    49 +
 .../docs/api/v1/authentication-source-get.md       |    93 +
 .../docs/api/v1/authentication-source-list.md      |   116 +
 .../docs/api/v1/authentication-source-resources.md |   117 +
 .../docs/api/v1/authentication-source-update.md    |   104 +
 ambari-server/docs/api/v1/index.md                 |    12 +
 ambari-server/docs/api/v1/user-create.md           |   107 +
 ambari-server/docs/api/v1/user-delete.md           |    48 +
 ambari-server/docs/api/v1/user-get.md              |    97 +
 ambari-server/docs/api/v1/user-list.md             |    98 +
 ambari-server/docs/api/v1/user-resources.md        |   175 +
 ambari-server/docs/api/v1/user-update.md           |   115 +
 ambari-server/docs/configuration/index.md          |    11 +-
 ambari-server/pom.xml                              |     1 -
 ambari-server/sbin/ambari-server                   |     1 -
 .../ambari/server/agent/HeartbeatProcessor.java    |    14 +-
 .../ambari/server/alerts/JmxServerSideAlert.java   |    98 +
 .../org/apache/ambari/server/alerts/Threshold.java |    73 +
 .../ambari/server/api/AmbariErrorHandler.java      |     2 +-
 .../api/resources/ResourceInstanceFactoryImpl.java |     4 +
 .../api/resources/UserResourceDefinition.java      |     1 +
 .../ambari/server/api/services/AmbariMetaInfo.java |    80 +-
 .../ambari/server/api/services/BaseService.java    |    70 +-
 .../users/UserAuthenticationSourceService.java     |   223 +
 .../server/api/services/users/UserService.java     |   132 +-
 .../ambari/server/audit/event/LoginAuditEvent.java |    20 +
 .../configuration/ComponentSSLConfiguration.java   |     4 +-
 .../ambari/server/configuration/Configuration.java |   595 +-
 .../LdapUsernameCollisionHandlingBehavior.java}    |    16 +-
 .../controller/AmbariActionExecutionHelper.java    |     5 +-
 .../AmbariCustomCommandExecutionHelper.java        |     8 +-
 .../controller/AmbariManagementController.java     |    39 -
 .../controller/AmbariManagementControllerImpl.java |   159 +-
 .../ambari/server/controller/AmbariServer.java     |    24 +-
 .../ambari/server/controller/ControllerModule.java |     7 +
 .../server/controller/ResourceProviderFactory.java |     6 +
 .../controller/StackServiceComponentResponse.java  |    10 +
 .../UserAuthenticationSourceRequest.java           |    82 +
 ...erAuthenticationSourceRequestCreateSwagger.java |    40 +
 ...erAuthenticationSourceRequestUpdateSwagger.java |    40 +
 .../UserAuthenticationSourceResponse.java          |   127 +
 .../ambari/server/controller/UserRequest.java      |    50 +-
 .../controller/UserRequestCreateUserSwagger.java   |    49 +
 .../controller/UserRequestCreateUsersSwagger.java  |    52 +
 .../controller/UserRequestUpdateUserSwagger.java   |    52 +
 .../ambari/server/controller/UserResponse.java     |    87 +-
 .../AbstractControllerResourceProvider.java        |     4 +-
 .../ActiveWidgetLayoutResourceProvider.java        |     2 +-
 .../controller/internal/CalculatedStatus.java      |     7 +-
 .../internal/ClientConfigResourceProvider.java     |     2 +-
 .../internal/HostComponentResourceProvider.java    |    35 +-
 .../internal/OverriddenMetricsHostProvider.java    |   101 +
 .../internal/RequestResourceProvider.java          |    31 +-
 .../ambari/server/controller/internal/Stack.java   |    14 +
 .../internal/StackDefinedPropertyProvider.java     |     9 +-
 .../StackServiceComponentResourceProvider.java     |     9 +-
 .../UserAuthenticationSourceResourceProvider.java  |   417 +
 .../internal/UserPrivilegeResourceProvider.java    |    19 +-
 .../controller/internal/UserResourceProvider.java  |   482 +-
 .../server/controller/jmx/JMXMetricHolder.java     |    64 +
 .../controller/metrics/MetricHostProvider.java     |     9 +
 .../timeline/AMSComponentPropertyProvider.java     |     4 +-
 .../ambari/server/controller/spi/Resource.java     |     2 +
 .../apache/ambari/server/events/AmbariEvent.java   |     7 +-
 .../ambari/server/events/JpaInitializedEvent.java  |    34 +
 .../ldap/domain/AmbariLdapConfiguration.java       |   174 +-
 .../ldap/domain/AmbariLdapConfigurationKeys.java   |   110 +-
 .../service/AmbariLdapConfigurationProvider.java   |    29 +-
 .../server/orm/AmbariLocalSessionInterceptor.java  |     2 +-
 .../org/apache/ambari/server/orm/DBAccessor.java   |    29 +
 .../apache/ambari/server/orm/DBAccessorImpl.java   |     3 +
 .../ambari/server/orm/GuiceJpaInitializer.java     |     8 +-
 .../server/orm/dao/UserAuthenticationDAO.java      |   116 +
 .../org/apache/ambari/server/orm/dao/UserDAO.java  |    95 +-
 .../orm/entities/AmbariConfigurationEntity.java    |     2 +-
 .../orm/entities/TopologyHostRequestEntity.java    |    27 +
 .../orm/entities/UserAuthenticationEntity.java     |   189 +
 .../ambari/server/orm/entities/UserEntity.java     |   253 +-
 .../AccountDisabledException.java}                 |    14 +-
 .../AmbariAuthenticationEventHandler.java          |    64 +
 .../AmbariAuthenticationEventHandlerImpl.java      |   168 +
 .../AmbariAuthenticationException.java}            |    25 +-
 .../authentication/AmbariAuthenticationFilter.java |    10 +
 .../AmbariAuthenticationProvider.java              |   117 +
 .../AmbariBasicAuthenticationFilter.java           |    97 +-
 .../AmbariJWTAuthenticationFilter.java             |   140 -
 .../AmbariLocalAuthenticationProvider.java         |   113 +
 .../AmbariUserAuthentication.java                  |     5 +-
 .../AuthenticationMethodNotAllowedException.java   |    65 +
 ...nvalidUsernamePasswordCombinationException.java |    22 +-
 .../TooManyLoginFailuresException.java}            |    17 +-
 .../authentication/UserNotFoundException.java}     |    35 +-
 .../jwt/AmbariJwtAuthenticationFilter.java}        |   270 +-
 .../jwt/AmbariJwtAuthenticationProvider.java       |   136 +
 .../jwt/JwtAuthenticationProperties.java           |     2 +-
 .../jwt/JwtAuthenticationToken.java}               |    34 +-
 .../AmbariAuthToLocalUserDetailsService.java       |   163 +-
 .../AmbariKerberosAuthenticationFilter.java        |    76 +-
 .../AmbariKerberosAuthenticationProperties.java    |    26 +-
 .../pam/AmbariPamAuthenticationProvider.java       |   302 +
 .../pam/PamAuthenticationFactory.java              |    21 +-
 .../authorization/AmbariAuthentication.java        |   229 -
 .../authorization/AmbariAuthorizationFilter.java   |     4 +-
 .../AmbariLdapAuthenticationProvider.java          |   183 +-
 .../AmbariLdapAuthoritiesPopulator.java            |     5 +-
 .../authorization/AmbariLdapBindAuthenticator.java |    13 +-
 .../authorization/AmbariLocalUserProvider.java     |   107 -
 .../AmbariPamAuthenticationProvider.java           |   252 -
 .../AmbariUserAuthorizationFilter.java             |    12 +-
 ...ionException.java => AuthenticationMethod.java} |    19 +-
 .../authorization/AuthorizationHelper.java         |     4 +-
 .../authorization/LdapServerProperties.java        |    99 +-
 .../ambari/server/security/authorization/User.java |    61 +-
 .../{UserType.java => UserAuthenticationType.java} |     5 +-
 .../server/security/authorization/Users.java       |  1259 +-
 .../AmbariInternalAuthenticationProvider.java      |     4 +-
 .../authorization/jwt/JwtAuthentication.java       |    34 -
 .../security/ldap/AmbariLdapDataPopulator.java     |    91 +-
 .../ambari/server/security/ldap/LdapBatchDto.java  |    32 +-
 .../ConfigureAmbariIdentitiesServerAction.java     |     2 +
 .../kerberos/KerberosOperationHandler.java         |    14 +-
 .../serveraction/upgrades/ConfigureAction.java     |    51 +-
 .../java/org/apache/ambari/server/state/Alert.java |     1 +
 .../apache/ambari/server/state/ComponentInfo.java  |    15 +
 .../apache/ambari/server/state/ConfigHelper.java   |     7 +-
 .../ambari/server/state/alert/AlertDefinition.java |    13 +
 .../apache/ambari/server/state/alert/AlertUri.java |    41 +
 .../ambari/server/state/alert/MetricSource.java    |    66 +-
 .../ambari/server/state/alert/Reporting.java       |    38 +
 .../ambari/server/state/alert/ServerSource.java    |    15 +
 .../ambari/server/state/cluster/ClusterImpl.java   |    79 +-
 .../ambari/server/state/quicklinks/Host.java       |    75 +
 .../ambari/server/state/quicklinks/Link.java       |    13 +
 .../state/services/AmbariServerAlertService.java   |     7 +-
 .../state/services/MetricsRetrievalService.java    |     8 +-
 .../server/state/stack/MetricDefinition.java       |     9 +-
 .../state/stack/upgrade/ClusterGrouping.java       |     9 +
 .../state/stack/upgrade/StageWrapperBuilder.java   |    10 +-
 .../ambari/server/state/stack/upgrade/Task.java    |     7 +
 .../ambari/server/topology/AmbariContext.java      |     7 +-
 .../server/topology/AsyncCallableService.java      |    16 +-
 .../ambari/server/topology/HostOfferResponse.java  |    23 +-
 .../apache/ambari/server/topology/HostRequest.java |    52 +-
 .../ambari/server/topology/LogicalRequest.java     |    44 +
 .../ambari/server/topology/PersistedState.java     |     5 +
 .../ambari/server/topology/PersistedStateImpl.java |    11 +
 .../ambari/server/topology/TopologyManager.java    |    59 +-
 .../server/topology/tasks/TopologyHostTask.java    |     4 +
 .../ambari/server/topology/tasks/TopologyTask.java |    20 +-
 .../ambari/server/upgrade/SchemaUpgradeHelper.java |     1 +
 .../ambari/server/upgrade/UpgradeCatalog252.java   |     7 +-
 .../ambari/server/upgrade/UpgradeCatalog260.java   |     3 +
 .../ambari/server/upgrade/UpgradeCatalog262.java   |    70 +
 .../ambari/server/upgrade/UpgradeCatalog300.java   |   486 +
 .../apache/ambari/server/utils/PasswordUtils.java  |   183 +
 ambari-server/src/main/python/ambari-server.py     |    18 +-
 .../python/ambari_server/dbConfiguration_linux.py  |    26 +-
 .../main/python/ambari_server/kerberos_setup.py    |     2 -
 .../src/main/python/ambari_server/serverSetup.py   |    28 +-
 ambari-server/src/main/python/bootstrap.py         |    12 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |    35 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |    37 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |    35 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |    34 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |    36 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |    38 +-
 .../src/main/resources/META-INF/persistence.xml    |     1 +
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml    |     1 +
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml    |     1 +
 .../KERBEROS/1.10.3-10/configuration/krb5-conf.xml |    11 +
 .../1.10.3-10/package/scripts/kerberos_client.py   |    57 +-
 .../1.10.3-10/package/scripts/kerberos_common.py   |   493 -
 .../KERBEROS/1.10.3-10/package/scripts/params.py   |     6 +-
 .../1.10.3-10/package/scripts/service_check.py     |    32 +-
 .../KERBEROS/1.10.3-10/properties/krb5_conf.j2     |     3 +
 .../KERBEROS/1.10.3-30/configuration/krb5-conf.xml |    11 +
 .../1.10.3-30/package/scripts/kerberos_client.py   |    57 +-
 .../1.10.3-30/package/scripts/kerberos_common.py   |   493 -
 .../KERBEROS/1.10.3-30/package/scripts/params.py   |     7 +-
 .../1.10.3-30/package/scripts/service_check.py     |    32 +-
 .../KERBEROS/1.10.3-30/package/scripts/utils.py    |   105 -
 .../KERBEROS/1.10.3-30/properties/krb5_conf.j2     |     3 +
 .../LOGSEARCH/0.5.0/package/scripts/logfeeder.py   |     4 +-
 .../SPARK/1.2.1/package/scripts/livy_service.py    |     2 -
 .../SPARK2/2.0.0/package/scripts/livy2_service.py  |     2 -
 .../STORM/1.0.1.3.0/configuration/storm-site.xml   |     2 +-
 .../STORM/1.0.1.3.0/service_advisor.py             |     1 +
 .../STORM/1.0.1/configuration/storm-site.xml       |     2 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py         |     4 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py         |     4 +-
 .../ZEPPELIN/0.7.0/package/scripts/master.py       |    66 +-
 .../custom_actions/scripts/install_packages.py     |    38 +-
 .../HDP/2.0.6/properties/stack_packages.json       |   106 +-
 .../stacks/HDP/2.5/services/stack_advisor.py       |     1 +
 .../services/KERBEROS/configuration/krb5-conf.xml  |    11 +
 .../services/KERBEROS/package/scripts/params.py    |     2 +
 .../1.0/services/KERBEROS/properties/krb5_conf.j2  |     3 +
 ambari-server/src/main/resources/upgrade-pack.xsd  |     1 +
 .../resources/webapp/WEB-INF/spring-security.xml   |    13 +-
 ambari-server/src/main/windows/ambari-server.ps1   |     2 -
 .../apache/ambari/server/alerts/ThresholdTest.java |    90 +
 .../api/resources/UserResourceDefinitionTest.java  |    13 +-
 .../server/api/services/AmbariMetaInfoTest.java    |    53 +
 .../ambari/server/audit/LoginAuditEventTest.java   |    36 +-
 .../server/configuration/ConfigurationTest.java    |   225 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |     5 +-
 .../controller/AmbariManagementControllerTest.java |    91 +-
 .../controller/RootServiceResponseFactoryTest.java |   145 +-
 .../AbstractPrivilegeResourceProviderTest.java     |    38 -
 .../ActiveWidgetLayoutResourceProviderTest.java    |     4 +-
 .../AlertDefinitionResourceProviderTest.java       |     4 +-
 .../internal/ClientConfigResourceProviderTest.java |     4 +-
 .../GroupPrivilegeResourceProviderTest.java        |    46 +-
 .../OverriddenMetricsHostProviderTest.java         |    95 +
 .../controller/internal/RequestImplTest.java       |     7 -
 .../internal/RequestResourceProviderTest.java      |   223 +-
 ...erAuthenticationSourceResourceProviderTest.java |   448 +
 .../UserPrivilegeResourceProviderTest.java         |   109 +-
 .../internal/UserResourceProviderDBTest.java       |   438 +-
 .../internal/UserResourceProviderTest.java         |   749 +-
 .../server/controller/jmx/JMXMetricHolderTest.java |    75 +
 .../server/ldap/AmbariLdapConfigurationTest.java   |   143 +
 .../ambari/server/orm/DBAccessorImplTest.java      |    30 +
 .../apache/ambari/server/orm/OrmTestHelper.java    |     7 +-
 .../apache/ambari/server/orm/dao/UserDAOTest.java  |    53 +-
 .../server/security/SecurityHelperImplTest.java    |     7 +-
 .../server/security/TestAuthenticationFactory.java |    26 +-
 .../AbstractAuthenticationProviderTest.java        |   217 +
 .../AmbariBasicAuthenticationFilterTest.java       |   136 +-
 .../AmbariJWTAuthenticationFilterTest.java         |   191 -
 .../AmbariLocalAuthenticationProviderTest.java     |    90 +
 .../jwt/AmbariJwtAuthenticationFilterTest.java     |   493 +
 .../jwt/JwtAuthenticationPropertiesTest.java       |     2 +-
 .../AmbariAuthToLocalUserDetailsServiceTest.java   |    33 +-
 .../AmbariKerberosAuthenticationFilterTest.java    |   183 +-
 ...AmbariKerberosAuthenticationPropertiesTest.java |    16 -
 .../pam/AmbariPamAuthenticationProviderTest.java   |   285 +
 .../authorization/AmbariAuthenticationTest.java    |   334 -
 .../AmbariAuthorizationFilterTest.java             |     5 +-
 ...AmbariAuthorizationProviderDisableUserTest.java |    99 -
 ...apAuthenticationProviderForDNWithSpaceTest.java |    34 +-
 ...AuthenticationProviderForDuplicateUserTest.java |    21 +-
 .../AmbariLdapAuthenticationProviderTest.java      |    54 +-
 .../AmbariLdapBindAuthenticatorTest.java           |    91 +-
 .../authorization/AmbariLocalUserProviderTest.java |   166 -
 .../AmbariPamAuthenticationProviderTest.java       |   151 -
 .../AmbariUserAuthenticationFilterTest.java        |    20 +-
 .../authorization/AuthorizationHelperTest.java     |    24 +-
 .../authorization/AuthorizationTestModule.java     |     3 +-
 .../AuthorizationTestModuleForLdapDNWithSpace.java |     5 +-
 .../authorization/LdapServerPropertiesTest.java    |    20 +-
 .../TestAmbariLdapAuthoritiesPopulator.java        |     4 +-
 .../server/security/authorization/TestUsers.java   |   320 +-
 .../server/security/authorization/UsersTest.java   |    17 +-
 .../jwt/JwtAuthenticationFilterTest.java           |   373 -
 .../security/ldap/AmbariLdapDataPopulatorTest.java |   331 +-
 .../server/security/ldap/LdapPerformanceTest.java  |    28 +-
 .../kerberos/ADKerberosOperationHandlerTest.java   |    15 +-
 .../kerberos/IPAKerberosOperationHandlerTest.java  |    19 +-
 .../kerberos/KerberosOperationHandlerTest.java     |    16 +
 .../kerberos/MITKerberosOperationHandlerTest.java  |    19 +-
 .../stack/QuickLinksConfigurationModuleTest.java   |     3 +
 .../ambari/server/state/UpgradeHelperTest.java     |    14 +-
 .../ambari/server/state/alert/AlertUriTest.java    |    60 +
 .../ambari/server/state/alert/JmxInfoTest.java     |    85 +
 .../ambari/server/state/cluster/ClusterTest.java   |     4 +
 .../ambari/server/topology/AmbariContextTest.java  |     5 +-
 .../server/topology/AsyncCallableServiceTest.java  |    29 +-
 .../ambari/server/topology/BlueprintImplTest.java  |    26 +-
 .../server/topology/ConfigureClusterTaskTest.java  |     2 +-
 .../server/topology/TopologyManagerTest.java       |     7 +
 .../server/upgrade/UpgradeCatalog260Test.java      |     1 +
 .../server/upgrade/UpgradeCatalog300Test.java      |   362 +-
 .../ambari/server/utils/PasswordUtilsTest.java     |   126 +
 ambari-server/src/test/python/TestAmbariServer.py  |    22 +-
 ambari-server/src/test/python/TestBootstrap.py     |    14 +-
 .../stacks/2.2/KERBEROS/test_kerberos_client.py    |     2 +-
 .../python/stacks/2.4/LOGSEARCH/test_logfeeder.py  |     2 +-
 .../python/stacks/2.5/common/test_stack_advisor.py |     1 +
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py       |    47 +
 ambari-server/src/test/resources/ambari.properties |     4 +-
 .../resources/child_quicklinks_to_override.json    |     4 +
 .../HDP/2.2.0/upgrades/upgrade_test_conditions.xml |    22 +-
 ambari-web/app/assets/img/install-box.svg          |    28 +
 ambari-web/app/assets/test/tests.js                |     1 +
 .../main/admin/kerberos/step1_controller.js        |   105 +-
 .../main/admin/kerberos/step2_controller.js        |     4 +-
 .../main/admin/kerberos/wizard_controller.js       |    16 +-
 ambari-web/app/controllers/main/host/details.js    |    40 +-
 ambari-web/app/controllers/main/service/item.js    |    25 +
 .../app/controllers/wizard/step4_controller.js     |   128 +-
 .../app/controllers/wizard/step8_controller.js     |     8 +-
 ambari-web/app/mappers/stack_service_mapper.js     |     4 +
 ambari-web/app/messages.js                         |    11 +-
 ambari-web/app/models/host_component.js            |     6 +
 ambari-web/app/models/stack_service.js             |   103 +
 ambari-web/app/models/stack_service_component.js   |    33 +
 ambari-web/app/routes/create_widget.js             |     3 -
 ambari-web/app/styles/application.less             |    14 +-
 .../app/styles/enhanced_service_dashboard.less     |     5 +-
 ambari-web/app/styles/wizard.less                  |    15 +-
 ambari-web/app/templates/application.hbs           |   129 +-
 .../templates/common/configs/service_config.hbs    |     2 +-
 .../app/templates/main/admin/kerberos/step1.hbs    |    14 +-
 .../main/alerts/alert_notifications_popup.hbs      |    30 +-
 .../app/templates/main/service/menu_item.hbs       |     2 +-
 ambari-web/app/templates/wizard/step4.hbs          |    58 +-
 ambari-web/app/utils/ajax/ajax.js                  |    30 +
 ambari-web/app/views/common/breadcrumbs_view.js    |     4 +-
 .../configs/config_versions_dropdown_view.js       |     2 +-
 .../configs/service_configs_by_category_view.js    |     2 +-
 .../app/views/common/quick_view_link_view.js       |    64 +-
 ambari-web/app/views/main/host/details.js          |     4 +
 ambari-web/app/views/main/menu.js                  |     4 +
 ambari-web/app/views/main/service/item.js          |     4 +
 .../nameNode/step3_controller_test.js              |    23 +-
 .../main/admin/kerberos/step2_controller_test.js   |     2 +-
 .../test/controllers/main/host/details_test.js     |    23 +-
 ambari-web/test/controllers/wizard/step4_test.js   |    45 +-
 ambari-web/test/controllers/wizard/step8_test.js   |    41 +-
 ambari-web/test/utils/date/timezone_test.js        |     2 +-
 .../test/views/common/breadcrumbs_view_test.js     |     5 +
 .../test/views/common/chart/linear_time_test.js    |    10 +-
 .../configs/config_versions_dropdown_view_test.js  |    82 +
 ambari-web/test/views/common/controls_view_test.js |    18 +-
 .../common/host_progress_popup_body_view_test.js   |    90 +-
 .../test/views/common/quick_link_view_test.js      |    15 +-
 .../management-packs/isilon-onefs-mpack/.gitignore |     1 +
 .../management-packs/isilon-onefs-mpack/pom.xml    |   133 +
 .../src/main/assemblies/isilon-onefs-mpack.xml     |    40 +
 .../addon-services/ONEFS/1.0.0/alerts.json         |   122 +
 .../ONEFS/1.0.0/configuration/core-site.xml        |   100 +
 .../ONEFS/1.0.0/configuration/hadoop-env.xml       |   404 +
 .../ONEFS/1.0.0/configuration/hdfs-site.xml        |    65 +
 .../ONEFS/1.0.0/configuration/onefs.xml            |    32 +-
 .../addon-services/ONEFS/1.0.0/kerberos.json       |    73 +
 .../addon-services/ONEFS/1.0.0/metainfo.xml        |   111 +
 .../addon-services/ONEFS/1.0.0/metrics.json        |   230 +
 .../ONEFS/1.0.0/package/scripts/__init__.py        |    20 +
 .../ONEFS/1.0.0/package/scripts/onefs_client.py    |    63 +
 .../ONEFS/1.0.0/package/scripts/params.py          |    29 +
 .../ONEFS/1.0.0/package/scripts/params_linux.py    |    70 +
 .../ONEFS/1.0.0/package/scripts/params_windows.py  |    83 +
 .../ONEFS/1.0.0/package/scripts/service_check.py   |    59 +
 .../ONEFS/1.0.0/package/scripts/status_params.py   |    58 +
 .../ONEFS/1.0.0/quicklinks/quicklinks.json         |    31 +
 .../addon-services/ONEFS/1.0.0/service_advisor.py  |   122 +
 .../addon-services/ONEFS/1.0.0/themes/theme.json   |    60 +
 .../addon-services/ONEFS/1.0.0/widgets.json        |   141 +
 .../src/main/resources/mpack.json                  |    28 +
 .../src/test/python/TestServiceAdvisor.py          |    67 +
 .../src/test/python/unitTests.py                   |   132 +
 .../ODPi/2.0/services/YARN/package/scripts/yarn.py |     4 +-
 .../view/commons/hdfs/FileOperationService.java    |     4 +-
 .../resources/ui/app/services/file-operation.js    |     2 +-
 dev-support/build-ambari.sh                        |    58 +
 pom.xml                                            |     1 +
 574 files changed, 42021 insertions(+), 26086 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to