You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/10 20:07:48 UTC

[ambari] branch branch-feature-AMBARI-20859 updated (7ff4a96 -> bf2f09e)

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

rlevas pushed a change to branch branch-feature-AMBARI-20859
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 7ff4a96  Merge branch 'trunk' into branch-feature-AMBARI-20859
     add 011e448  AMBARI-22741 Log Search UI: implement graph for access logs. (ababiichuk)
     add 0eddba5  Merge remote-tracking branch 'apache/trunk' into branch-feature-AMBARI-20859
     add 1ca8f99  AMBARI-22731. Infra Manager - hdfs upload support for archiving Infra Solr
     add 30f3a04  Merge pull request #75 from kasakrisz/solr-data-to-hdfs
     add 579cec8  AMBARI-22749. Create Pull Request Template
     add 1bb2355  Added inline style link
     add 4936124  Merge pull request #70 from vivekratnavel/AMBARI-22749-trunk
     add df9a638  AMBARI-22121. Create mpack for Isilon OneFS (amagyar)
     add f1758bc  AMBARI-22115. Alerts for OneFS mpack (amagyar)
     add 64bc95c  AMBARI-22236. Expression parser support for JMXServerSide alerts (amagyar)
     add b577153  AMBARI-22115. Alerts for OneFS mpack (amagyar)
     add 8fbaf8d  AMBARI-22319. Allow the same config type to belong to multiple services (amagyar)
     add 0b69fef  AMBARI-22339. Metrics for OneFS mpack (amagyar)
     add 3c90642  AMBARI-22424. Quicklinks for OneFS (amagyar)
     add e1c9e86  AMBARI-22449. Improved service/component dependency support (amagyar)
     add 145ebc0  AMBARI-22449. Improved service/component dependency support (amagyar)
     add cbfcbd6  AMBARI-22507. Ambari UI changes to support Isilon OneFS (amagyar)
     add f55b569  AMBARI-22634. Kerberos support for OneFS (amagyar)
     add 89f3bba  AMBARI-22674. ServiceAdvisor for OneFS (amagyar)
     add ebf3630  AMBARI-22449. Improved service/component dependency support (amagyar)
     add 97bd0d8  AMBARI-22121. Create mpack for Isilon OneFS (amagyar)
     add 859d050  AMBARI-22339. Metrics for OneFS mpack (amagyar)
     add db0a15a  AMBARI-22756 Post-install: Reduce navigation width in wizard. (atkach)
     add a94ca6b  Merge pull request #80 from atkach/AMBARI-22756-trunk
     add d7463e6  AMBARI-22236. Addendum - Expression parser support for JMXServerSide alerts (amagyar)
     add 635ee1d  AMBARI-22750. Add custom input / mapper descriptor to config api
     add 0aaf8c8  AMBARI-22667: Use internal LDAP configuration values rather than ambari.properties values when accessing the configured LDAP server for LDAP sync and authentication
     add 0341a36  Merge pull request #77 from smolnar82/AMBARI-22667
     add 14e8c22  Merge branch 'trunk' into branch-feature-AMBARI-20859
     new bf2f09e  Merge pull request #83 from rlevas/branch-feature-AMBARI-20859

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/PULL_REQUEST_TEMPLATE.md                   |  10 +
 .../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 +++
 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-manager/docker/docker-compose.yml |  25 +-
 .../docker/infra-manager-docker-compose.sh         |  30 +-
 ambari-infra/ambari-infra-manager/pom.xml          |  29 +-
 .../org/apache/ambari/infra/job/JobProperties.java |   2 +-
 .../archive/DocumentArchivingConfiguration.java    |  64 +++-
 .../job/archive/DocumentExportProperties.java      |  81 +++-
 .../infra/job/archive/ExportDestination.java       |  41 +-
 .../infra/job/archive/FileNameSuffixFormatter.java |  15 +-
 .../ambari/infra/job/archive/HdfsUploader.java     |  55 +++
 .../deleting/DocumentDeletingConfiguration.java    |   3 +
 .../infra/model/JobExecutionRestartRequest.java    |  10 +
 .../src/main/resources/infra-manager.properties    |   9 +-
 .../apache/ambari/infra/job/JobPropertiesTest.java |   4 +-
 .../job/archive/FileNameSuffixFormatterTest.java   |   2 +-
 .../vagrant-infra-manager.properties.sample        |  37 ++
 ambari-infra/pom.xml                               |   1 +
 ...{InputDescriptor.java => CustomDescriptor.java} |  31 +-
 ...tDescriptor.java => InputCustomDescriptor.java} |  32 +-
 .../api/model/inputconfig/InputDescriptor.java     |   2 +
 ...putDescriptor.java => MapCustomDescriptor.java} |  32 +-
 .../model/inputconfig/impl/InputAdapter.java       |   4 +-
 .../impl/InputCustomDescriptorImpl.java            |  71 ++++
 .../inputconfig/impl/InputDescriptorImpl.java      |  11 +
 .../inputconfig/impl/MapCustomDescriptorImpl.java  |  81 ++++
 .../inputconfig/impl/PostMapValuesAdapter.java     |  12 +-
 .../ambari-logsearch-web/src/app/app.module.ts     |   4 +
 .../classes/components/graph/graph.component.less  |   1 +
 .../classes/components/graph/graph.component.ts    |  75 +++-
 ...ph.component.less => time-graph.component.less} |  44 +--
 .../components/graph/time-graph.component.ts}      | 150 ++------
 .../ambari-logsearch-web/src/app/classes/graph.ts  |  19 +
 .../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              |  10 +-
 .../audit-logs-entries.component.spec.ts           |   3 +
 .../audit-logs-table.component.spec.ts             |   7 +-
 .../collapsible-panel.component.html               |   6 +-
 .../collapsible-panel.component.spec.ts            |   4 +-
 .../collapsible-panel.component.ts                 |   4 +-
 .../dropdown-button.component.spec.ts              |   7 +-
 .../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 +-
 .../logs-container/logs-container.component.html   |  28 +-
 .../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.spec.ts           |   7 +-
 .../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 +
 .../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     |  61 +--
 .../storage/audit-logs-graph-data.service.ts       |  24 +-
 .../src/app/services/storage/reducers.service.ts   |   2 +
 .../ambari-logsearch-web/src/assets/i18n/en.json   |   1 +
 ambari-server/docs/configuration/index.md          |   1 +
 ambari-server/sbin/ambari-server                   |   1 -
 .../ambari/server/alerts/JmxServerSideAlert.java   |  98 +++++
 .../org/apache/ambari/server/alerts/Threshold.java |  73 ++++
 .../configuration/ComponentSSLConfiguration.java   |   4 +-
 .../ambari/server/configuration/Configuration.java | 426 +--------------------
 .../LdapUsernameCollisionHandlingBehavior.java}    |  21 +-
 .../controller/AmbariManagementControllerImpl.java |   8 +-
 .../ambari/server/controller/ControllerModule.java |   3 +
 .../controller/StackServiceComponentResponse.java  |  10 +
 .../internal/OverriddenMetricsHostProvider.java    | 101 +++++
 .../ambari/server/controller/internal/Stack.java   |  14 +
 .../internal/StackDefinedPropertyProvider.java     |   9 +-
 .../StackServiceComponentResourceProvider.java     |   9 +-
 .../server/controller/jmx/JMXMetricHolder.java     |  64 ++++
 .../controller/metrics/MetricHostProvider.java     |   9 +
 .../timeline/AMSComponentPropertyProvider.java     |   4 +-
 .../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   |  26 +-
 .../server/orm/AmbariLocalSessionInterceptor.java  |   2 +-
 .../ambari/server/orm/GuiceJpaInitializer.java     |   8 +-
 .../AmbariLdapAuthenticationProvider.java          |  19 +-
 .../authorization/AmbariLdapBindAuthenticator.java |  13 +-
 .../authorization/LdapServerProperties.java        |  92 +----
 .../server/security/authorization/Users.java       |   6 +-
 .../security/ldap/AmbariLdapDataPopulator.java     |  15 +-
 .../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 +-
 .../server/state/stack/MetricDefinition.java       |   9 +-
 .../ambari/server/topology/AmbariContext.java      |   7 +-
 .../apache/ambari/server/utils/PasswordUtils.java  | 183 +++++++++
 ambari-server/src/main/python/ambari-server.py     |   5 +
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml    |   1 +
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml    |   1 +
 ambari-server/src/main/windows/ambari-server.ps1   |   2 -
 .../apache/ambari/server/alerts/ThresholdTest.java |  90 +++++
 .../server/configuration/ConfigurationTest.java    | 181 +--------
 .../AlertDefinitionResourceProviderTest.java       |   4 +-
 .../OverriddenMetricsHostProviderTest.java         |  95 +++++
 .../server/controller/jmx/JMXMetricHolderTest.java |  75 ++++
 .../server/ldap/AmbariLdapConfigurationTest.java   | 143 +++++++
 ...apAuthenticationProviderForDNWithSpaceTest.java |   9 +-
 ...AuthenticationProviderForDuplicateUserTest.java |  20 +-
 .../AmbariLdapAuthenticationProviderTest.java      |  28 +-
 .../AmbariLdapBindAuthenticatorTest.java           |  91 ++++-
 .../authorization/AuthorizationTestModule.java     |   3 +-
 .../AuthorizationTestModuleForLdapDNWithSpace.java |   5 +-
 .../authorization/LdapServerPropertiesTest.java    |  20 +-
 .../server/security/authorization/UsersTest.java   |   2 +
 .../security/ldap/AmbariLdapDataPopulatorTest.java |  93 ++---
 .../server/security/ldap/LdapPerformanceTest.java  |  28 +-
 .../stack/QuickLinksConfigurationModuleTest.java   |   3 +
 .../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 +-
 .../ambari/server/utils/PasswordUtilsTest.java     | 126 ++++++
 .../resources/child_quicklinks_to_override.json    |   4 +
 .../main/admin/kerberos/step1_controller.js        | 105 ++---
 ambari-web/app/controllers/main/host/details.js    |   8 +-
 .../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                         |   7 +-
 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/wizard.less                  |  15 +-
 .../app/templates/main/admin/kerberos/step1.hbs    |  14 +-
 ambari-web/app/templates/wizard/step4.hbs          |  58 ++-
 ambari-web/app/views/common/breadcrumbs_view.js    |   4 +-
 .../app/views/common/quick_view_link_view.js       |  64 +++-
 .../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 +-
 .../test/views/common/breadcrumbs_view_test.js     |   5 +
 .../test/views/common/quick_link_view_test.js      |  15 +-
 .../.gitignore                                     |   0
 .../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       |   0
 .../ONEFS/1.0.0/package/scripts/onefs_client.py    |  63 +++
 .../ONEFS/1.0.0}/package/scripts/params.py         |   0
 .../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  |   0
 .../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 +++++++
 201 files changed, 6090 insertions(+), 2034 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 copy ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/model/inputconfig/InputDescriptor.java => ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/ExportDestination.java (60%)
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/HdfsUploader.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/test/resoruces/vagrant-infra-manager.properties.sample
 copy ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/model/inputconfig/{InputDescriptor.java => CustomDescriptor.java} (68%)
 copy ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/model/inputconfig/{InputDescriptor.java => InputCustomDescriptor.java} (66%)
 copy ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/model/inputconfig/{InputDescriptor.java => MapCustomDescriptor.java} (66%)
 create mode 100644 ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/model/inputconfig/impl/InputCustomDescriptorImpl.java
 create mode 100644 ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/model/inputconfig/impl/MapCustomDescriptorImpl.java
 copy ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/{graph.component.less => time-graph.component.less} (62%)
 copy ambari-logsearch/ambari-logsearch-web/src/app/{components/time-histogram/time-histogram.component.ts => classes/components/graph/time-graph.component.ts} (63%)
 rename ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/{service-logs-histogram-query-params.spec.ts => audit-logs-graph-query-params.spec.ts} (95%)
 copy ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/{service-logs-histogram-query-params.ts => audit-logs-graph-query-params.ts} (92%)
 copy ambari-logsearch/ambari-logsearch-web/src/app/components/{time-histogram/time-histogram.component.html => time-line-graph/time-line-graph.component.html} (73%)
 copy ambari-server/src/main/java/org/apache/ambari/server/orm/GuiceJpaInitializer.java => ambari-logsearch/ambari-logsearch-web/src/app/components/time-line-graph/time-line-graph.component.less (71%)
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/time-line-graph/time-line-graph.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/time-line-graph/time-line-graph.component.ts
 copy ambari-server/src/main/java/org/apache/ambari/server/orm/GuiceJpaInitializer.java => ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-graph-data.service.ts (64%)
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/alerts/JmxServerSideAlert.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/alerts/Threshold.java
 copy ambari-server/src/main/java/org/apache/ambari/server/{orm/GuiceJpaInitializer.java => configuration/LdapUsernameCollisionHandlingBehavior.java} (71%)
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OverriddenMetricsHostProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/events/JpaInitializedEvent.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Host.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/utils/PasswordUtils.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/alerts/ThresholdTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/OverriddenMetricsHostProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXMetricHolderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/AmbariLdapConfigurationTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/state/alert/AlertUriTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/state/alert/JmxInfoTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java
 copy contrib/management-packs/{hdf-ambari-mpack => isilon-onefs-mpack}/.gitignore (100%)
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/pom.xml
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/assemblies/isilon-onefs-mpack.xml
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/alerts.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/configuration/core-site.xml
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/configuration/hadoop-env.xml
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/configuration/hdfs-site.xml
 copy ambari-server/src/main/java/org/apache/ambari/server/orm/GuiceJpaInitializer.java => contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/configuration/onefs.xml (70%)
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metainfo.xml
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metrics.json
 copy contrib/management-packs/{odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN => isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0}/package/scripts/__init__.py (100%)
 mode change 100755 => 100644
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/package/scripts/onefs_client.py
 copy {ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0 => contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0}/package/scripts/params.py (100%)
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/package/scripts/params_linux.py
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/package/scripts/params_windows.py
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/package/scripts/service_check.py
 copy {ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0 => contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0}/package/scripts/status_params.py (100%)
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/quicklinks/quicklinks.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/service_advisor.py
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/themes/theme.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/widgets.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/main/resources/mpack.json
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/test/python/TestServiceAdvisor.py
 create mode 100644 contrib/management-packs/isilon-onefs-mpack/src/test/python/unitTests.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@ambari.apache.org" <co...@ambari.apache.org>'].

[ambari] 01/01: Merge pull request #83 from rlevas/branch-feature-AMBARI-20859

Posted by rl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit bf2f09e8279d81b833d59595c74542a0da0a7d14
Merge: 7ff4a96 14e8c22
Author: Robert Levas <rl...@users.noreply.github.com>
AuthorDate: Wed Jan 10 15:07:43 2018 -0500

    Merge pull request #83 from rlevas/branch-feature-AMBARI-20859
    
    Merge branch 'trunk' into branch-feature-AMBARI-20859

 .github/PULL_REQUEST_TEMPLATE.md                   |  10 +
 .../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 +++
 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-manager/docker/docker-compose.yml |  25 +-
 .../docker/infra-manager-docker-compose.sh         |  30 +-
 ambari-infra/ambari-infra-manager/pom.xml          |  29 +-
 .../org/apache/ambari/infra/job/JobProperties.java |   2 +-
 .../archive/DocumentArchivingConfiguration.java    |  64 +++-
 .../job/archive/DocumentExportProperties.java      |  81 +++-
 .../infra/job/archive/ExportDestination.java       |  41 +-
 .../infra/job/archive/FileNameSuffixFormatter.java |  15 +-
 .../ambari/infra/job/archive/HdfsUploader.java     |  55 +++
 .../deleting/DocumentDeletingConfiguration.java    |   3 +
 .../infra/model/JobExecutionRestartRequest.java    |  10 +
 .../src/main/resources/infra-manager.properties    |   9 +-
 .../apache/ambari/infra/job/JobPropertiesTest.java |   4 +-
 .../job/archive/FileNameSuffixFormatterTest.java   |   2 +-
 .../vagrant-infra-manager.properties.sample        |  37 ++
 ambari-infra/pom.xml                               |   1 +
 ...{InputDescriptor.java => CustomDescriptor.java} |  31 +-
 ...tDescriptor.java => InputCustomDescriptor.java} |  32 +-
 .../api/model/inputconfig/InputDescriptor.java     |   2 +
 ...putDescriptor.java => MapCustomDescriptor.java} |  32 +-
 .../model/inputconfig/impl/InputAdapter.java       |   4 +-
 .../impl/InputCustomDescriptorImpl.java            |  71 ++++
 .../inputconfig/impl/InputDescriptorImpl.java      |  11 +
 .../inputconfig/impl/MapCustomDescriptorImpl.java  |  81 ++++
 .../inputconfig/impl/PostMapValuesAdapter.java     |  12 +-
 .../ambari-logsearch-web/src/app/app.module.ts     |   4 +
 .../classes/components/graph/graph.component.less  |   1 +
 .../classes/components/graph/graph.component.ts    |  75 +++-
 ...ph.component.less => time-graph.component.less} |  44 +--
 .../components/graph/time-graph.component.ts}      | 150 ++------
 .../ambari-logsearch-web/src/app/classes/graph.ts  |  19 +
 .../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              |  10 +-
 .../audit-logs-entries.component.spec.ts           |   3 +
 .../audit-logs-table.component.spec.ts             |   7 +-
 .../collapsible-panel.component.html               |   6 +-
 .../collapsible-panel.component.spec.ts            |   4 +-
 .../collapsible-panel.component.ts                 |   4 +-
 .../dropdown-button.component.spec.ts              |   7 +-
 .../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 +-
 .../logs-container/logs-container.component.html   |  28 +-
 .../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.spec.ts           |   7 +-
 .../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 +
 .../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     |  61 +--
 .../storage/audit-logs-graph-data.service.ts       |  24 +-
 .../src/app/services/storage/reducers.service.ts   |   2 +
 .../ambari-logsearch-web/src/assets/i18n/en.json   |   1 +
 ambari-server/docs/configuration/index.md          |   1 +
 ambari-server/sbin/ambari-server                   |   1 -
 .../ambari/server/alerts/JmxServerSideAlert.java   |  98 +++++
 .../org/apache/ambari/server/alerts/Threshold.java |  73 ++++
 .../configuration/ComponentSSLConfiguration.java   |   4 +-
 .../ambari/server/configuration/Configuration.java | 426 +--------------------
 .../LdapUsernameCollisionHandlingBehavior.java}    |  21 +-
 .../controller/AmbariManagementControllerImpl.java |   8 +-
 .../ambari/server/controller/ControllerModule.java |   3 +
 .../controller/StackServiceComponentResponse.java  |  10 +
 .../internal/OverriddenMetricsHostProvider.java    | 101 +++++
 .../ambari/server/controller/internal/Stack.java   |  14 +
 .../internal/StackDefinedPropertyProvider.java     |   9 +-
 .../StackServiceComponentResourceProvider.java     |   9 +-
 .../server/controller/jmx/JMXMetricHolder.java     |  64 ++++
 .../controller/metrics/MetricHostProvider.java     |   9 +
 .../timeline/AMSComponentPropertyProvider.java     |   4 +-
 .../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   |  26 +-
 .../server/orm/AmbariLocalSessionInterceptor.java  |   2 +-
 .../ambari/server/orm/GuiceJpaInitializer.java     |   8 +-
 .../AmbariLdapAuthenticationProvider.java          |  19 +-
 .../authorization/AmbariLdapBindAuthenticator.java |  13 +-
 .../authorization/LdapServerProperties.java        |  92 +----
 .../server/security/authorization/Users.java       |   6 +-
 .../security/ldap/AmbariLdapDataPopulator.java     |  15 +-
 .../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 +-
 .../server/state/stack/MetricDefinition.java       |   9 +-
 .../ambari/server/topology/AmbariContext.java      |   7 +-
 .../apache/ambari/server/utils/PasswordUtils.java  | 183 +++++++++
 ambari-server/src/main/python/ambari-server.py     |   5 +
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml    |   1 +
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml    |   1 +
 ambari-server/src/main/windows/ambari-server.ps1   |   2 -
 .../apache/ambari/server/alerts/ThresholdTest.java |  90 +++++
 .../server/configuration/ConfigurationTest.java    | 181 +--------
 .../AlertDefinitionResourceProviderTest.java       |   4 +-
 .../OverriddenMetricsHostProviderTest.java         |  95 +++++
 .../server/controller/jmx/JMXMetricHolderTest.java |  75 ++++
 .../server/ldap/AmbariLdapConfigurationTest.java   | 143 +++++++
 ...apAuthenticationProviderForDNWithSpaceTest.java |   9 +-
 ...AuthenticationProviderForDuplicateUserTest.java |  20 +-
 .../AmbariLdapAuthenticationProviderTest.java      |  28 +-
 .../AmbariLdapBindAuthenticatorTest.java           |  91 ++++-
 .../authorization/AuthorizationTestModule.java     |   3 +-
 .../AuthorizationTestModuleForLdapDNWithSpace.java |   5 +-
 .../authorization/LdapServerPropertiesTest.java    |  20 +-
 .../server/security/authorization/UsersTest.java   |   2 +
 .../security/ldap/AmbariLdapDataPopulatorTest.java |  93 ++---
 .../server/security/ldap/LdapPerformanceTest.java  |  28 +-
 .../stack/QuickLinksConfigurationModuleTest.java   |   3 +
 .../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 +-
 .../ambari/server/utils/PasswordUtilsTest.java     | 126 ++++++
 .../resources/child_quicklinks_to_override.json    |   4 +
 .../main/admin/kerberos/step1_controller.js        | 105 ++---
 ambari-web/app/controllers/main/host/details.js    |   8 +-
 .../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                         |   7 +-
 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/wizard.less                  |  15 +-
 .../app/templates/main/admin/kerberos/step1.hbs    |  14 +-
 ambari-web/app/templates/wizard/step4.hbs          |  58 ++-
 ambari-web/app/views/common/breadcrumbs_view.js    |   4 +-
 .../app/views/common/quick_view_link_view.js       |  64 +++-
 .../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 +-
 .../test/views/common/breadcrumbs_view_test.js     |   5 +
 .../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 +++++++
 201 files changed, 6198 insertions(+), 2034 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.