[ambari-logsearch] branch cloudbreak updated: Use logsearch user for Log Search container
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch cloudbreak
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/cloudbreak by this push:
new 14c0c79 Use logsearch user for Log Search container
14c0c79 is described below
commit 14c0c79882aa1c144978789f08ec46741ebfd370
Author: Oliver Szabo
AuthorDate: Tue Oct 2 02:17:01 2018 +0200
Use logsearch user for Log Search container
---
jenkins/containers/docker-logsearch-portal/Dockerfile | 6 +-
jenkins/containers/docker-logsearch-portal/conf/log4j2.yml | 3 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/jenkins/containers/docker-logsearch-portal/Dockerfile
b/jenkins/containers/docker-logsearch-portal/Dockerfile
index 03ded63..97e9964 100644
--- a/jenkins/containers/docker-logsearch-portal/Dockerfile
+++ b/jenkins/containers/docker-logsearch-portal/Dockerfile
@@ -29,8 +29,9 @@ ENV LOGSEARCH_INIT_FILE /init.sh
ENV LOGSEARCH_PORT="61888"
ENV LOGSEARCH_PATH="/usr/lib/ambari-logsearch-portal"
ENV LOGSEARCH_CONF_DIR="/usr/lib/ambari-logsearch-portal/conf"
+ENV LOG_PATH="/var/log/ambari-logsearch-portal"
ENV LOGFILE="/var/log/ambari-logsearch-portal/logsearch.log"
-ENV PID_FILE="/var/run/ambari-logsearch-portal/logsearch.pid"
+ENV LOGSEARCH_PID_FILE="/var/run/ambari-logsearch-portal/logsearch.pid"
ENV LOGSEARCH_DEBUG=false
ENV LOGSEARCH_DEBUG_PORT=5005
@@ -38,6 +39,8 @@ ENV LOGSEARCH_SSL="false"
RUN groupadd -r --gid $LOGSEARCH_GID $LOGSEARCH_GROUP && useradd -r --uid
$LOGSEARCH_UID --gid $LOGSEARCH_GID $LOGSEARCH_USER
RUN chown -R $LOGSEARCH_USER:$LOGSEARCH_GROUP /usr/lib/ambari-logsearch-portal
+RUN mkdir -p /var/log/ambari-logsearch-portal && chown -R
$LOGSEARCH_USER:$LOGSEARCH_GROUP /var/log/ambari-logsearch-portal
+RUN mkdir -p /var/run/ambari-logsearch-portal && chown -R
$LOGSEARCH_USER:$LOGSEARCH_GROUP /var/run/ambari-logsearch-portal
RUN find /usr/lib/ambari-logsearch-portal -type d -exec chmod 755 {} +
RUN find /usr/lib/ambari-logsearch-portal -type f -exec chmod 644 {} +
RUN chmod 755 $LOGSEARCH_PATH/bin/logsearch.sh
@@ -45,5 +48,6 @@ RUN chmod 755 $LOGSEARCH_PATH/conf/logsearch-env.sh
RUN chmod 755 /entrypoint.sh
RUN chmod 755 /init.sh
+USER $LOGSEARCH_USER
WORKDIR /usr/lib/ambari-logsearch-portal
CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/jenkins/containers/docker-logsearch-portal/conf/log4j2.yml
b/jenkins/containers/docker-logsearch-portal/conf/log4j2.yml
index 3e4fa63..c49373c 100644
--- a/jenkins/containers/docker-logsearch-portal/conf/log4j2.yml
+++ b/jenkins/containers/docker-logsearch-portal/conf/log4j2.yml
@@ -46,5 +46,4 @@ Configutation:
Root:
level: info
AppenderRef:
- - ref: Console_Appender
- - ref: RollingFile_Appender
\ No newline at end of file
+ - ref: Console_Appender
\ No newline at end of file
[ambari-logsearch] branch cloudbreak created (now c35688a)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a change to branch cloudbreak in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git. at c35688a Add Log Searach container support This branch includes the following new commits: new c35688a Add Log Searach container support 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.
[ambari-logsearch] 01/01: Add Log Searach container support
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch cloudbreak
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
commit c35688a3bef89037c799540a4ca6854ccac9d389
Author: Oliver Szabo
AuthorDate: Tue Oct 2 01:34:24 2018 +0200
Add Log Searach container support
---
Makefile | 38 +
ambari-logsearch-it/pom.xml| 4 +-
ambari-logsearch-server/build.xml | 6 ++
ambari-logsearch-server/pom.xml| 19 +++
.../containers/docker-logsearch-portal/Dockerfile | 49
.../docker-logsearch-portal/bin/entrypoint.sh | 32 +++
.../containers/docker-logsearch-portal/bin/init.sh | 13 +
.../docker-logsearch-portal/conf/log4j2.yml| 50
.../docker-logsearch-portal/conf/logsearch-env.sh | 13 +
.../conf/logsearch.properties | 66 ++
pom.xml| 7 +++
11 files changed, 295 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..a23e441
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,38 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GIT_REV_SHORT = $(shell git rev-parse --short HEAD)
+MAVEN_BINARY ?= mvn
+
+ifeq ("$(USE_GIT_BUILD_TAG)", "true")
+ LOGSEARCH_BUILD_DOCKER_TAG = build-$(GIT_REV_SHORT)
+else
+ LOGSEARCH_BUILD_DOCKER_TAG = "latest"
+endif
+
+package:
+ $(MAVEN_BINARY) clean package
+
+test:
+ $(MAVEN_BINARY) clean test
+
+rpm:
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
+
+deb:
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+
+docker-build:
+ $(MAVEN_BINARY) clean package docker:build -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+
+docker-push:
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
\ No newline at end of file
diff --git a/ambari-logsearch-it/pom.xml b/ambari-logsearch-it/pom.xml
index cf8970e..a4e160f 100644
--- a/ambari-logsearch-it/pom.xml
+++ b/ambari-logsearch-it/pom.xml
@@ -38,7 +38,7 @@
2.9.4
2.20
1
-localhost
+localhost
NONE
NONE
@@ -283,7 +283,7 @@
file:${project.build.testOutputDirectory}/log4j.properties
-${docker.host}
+${logsearch.docker.host}
${backend.stories.location}
diff --git a/ambari-logsearch-server/build.xml
b/ambari-logsearch-server/build.xml
index b509a15..88ccd6b 100644
--- a/ambari-logsearch-server/build.xml
+++ b/ambari-logsearch-server/build.xml
@@ -66,5 +66,11 @@
+
+
+
+
+
+
diff --git a/ambari-logsearch-server/pom.xml b/ambari-logsearch-server/pom.xml
index 39a174e..5649361 100755
--- a/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch-server/pom.xml
@@ -41,6 +41,25 @@
0.6.0
4.0.1
+
+
+
+io.fabric8
+docker-maven-plugin
+
+ true
+
+
+
apache/ambari-logsearch-portal:${logsearch.docker.tag}
+
+
${project.build.directory}/docker-logsearch-portal
+
+
+
+
+
+
+
dev
diff --git a/jenkins/containers/docker-logsearch-portal/Dockerfile
b/jenkins/containers/docker-logsearch-portal/Dockerfile
new file mode 100644
index 000..03ded63
--- /dev/null
+++ b/jenkins/containers/docker-logsearch-portal/Dockerfile
@@ -0,0 +1,49 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FROM openjdk:11-jre
+MAINTAINER d...@ambari.apache.org
+
+ADD bin/entrypoint.sh /entrypoint.sh
+ADD bin/init.sh /init.sh
[ambari] branch AMBARI-24711 updated (a6536f3 -> 2b89b14)
This is an automated email from the ASF dual-hosted git repository. mradhakrishnan pushed a change to branch AMBARI-24711 in repository https://gitbox.apache.org/repos/asf/ambari.git. from a6536f3 Modifications to choose only necessary changes from Ambari3.0 to Ambari2.8 (mradhakrishnan) add 3d782a0 AMBARI-24245. Fix FindBugs warnings (#2398) add 1f1f890 AMBARI-24700 - Slider widget: insert a space char between label value and unit-name (#2399) add 726d1d0 AMBARI-24708. Automation script for upgrade old style isilon cluster to the new mpack based structure (amagyar) (#2397) add 33a42c3 AMBARI-24715. Clean up ambari-agent.log (aonishuk) add b497744 AMBARI-24717. Ambari-agent does for save data hashes correctly (aonishuk) add 7b5fd0a AMBARI-24704. Problems with accounts page when sysprep_skip_create_users_and_groups is absent (akovalenko) add 6976220 [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 … (#2406) add 2b89b14 Merge branch 'trunk' into AMBARI-24711 No new revisions were added by this update. Summary of changes: .../src/main/python/ambari_agent/ClusterCache.py | 12 +- .../python/ambari_agent/ClusterMetadataCache.py| 9 +- .../main/python/ambari_agent/HeartbeatThread.py| 2 +- .../main/python/ambari_agent/InitializerModule.py | 2 +- .../main/python/ambari_agent/RecoveryManager.py| 10 +- .../main/python/ambari_agent/alerts/collector.py | 5 + .../listeners/CommandsEventListener.py | 4 + .../listeners/MetadataEventListener.py | 6 - .../listeners/ServerResponsesListener.py | 2 +- ambari-agent/src/main/python/ambari_agent/main.py | 2 + .../src/main/python/ambari_agent/security.py | 2 +- ambari-server/findbugs.exclude.xml | 11 +- .../server/actionmanager/ActionDBAccessorImpl.java | 4 +- .../server/actionmanager/ActionScheduler.java | 8 - .../server/actionmanager/HostRoleStatus.java | 42 +- .../ambari/server/agent/HeartbeatMonitor.java | 3 - .../ambari/server/agent/HeartbeatProcessor.java| 1 - .../ambari/server/agent/stomp/TopologyHolder.java | 2 - .../api/query/render/ClusterBlueprintRenderer.java | 2 +- .../resources/RepositoryResourceDefinition.java| 2 +- .../api/resources/UpgradeResourceDefinition.java | 2 +- .../ambari/server/api/services/BaseRequest.java| 2 +- .../services/stackadvisor/StackAdvisorHelper.java | 4 - .../services/stackadvisor/StackAdvisorRunner.java | 2 +- ...MetricsHadoopSinkVersionCompatibilityCheck.java | 4 +- .../ambari/server/checks/CheckDescription.java | 86 ++-- .../checks/DatabaseConsistencyCheckHelper.java | 5 - .../ambari/server/checks/MpackInstallChecker.java | 2 - .../ambari/server/configuration/Configuration.java | 36 +- .../AmbariCustomCommandExecutionHelper.java| 19 +- .../controller/AmbariManagementControllerImpl.java | 9 +- .../server/controller/AmbariManagementHelper.java | 1 - .../server/controller/AuthToLocalBuilder.java | 2 +- .../server/controller/KerberosHelperImpl.java | 24 - .../internal/AbstractResourceProvider.java | 2 +- .../internal/ActionResourceProvider.java | 4 +- .../ActiveWidgetLayoutResourceProvider.java| 39 +- .../internal/AlertDefinitionResourceProvider.java | 2 +- .../internal/AlertHistoryResourceProvider.java | 2 +- .../controller/internal/AlertResourceProvider.java | 4 +- .../internal/AmbariPrivilegeResourceProvider.java | 4 +- .../internal/ArtifactResourceProvider.java | 8 +- .../internal/BlueprintConfigurationProcessor.java | 24 +- .../internal/BlueprintResourceProvider.java| 4 +- .../internal/ClientConfigResourceProvider.java | 4 +- .../internal/ClusterPrivilegeResourceProvider.java | 4 +- .../internal/ClusterResourceProvider.java | 42 +- .../ClusterStackVersionResourceProvider.java | 11 +- ...ompatibleRepositoryVersionResourceProvider.java | 8 +- .../internal/ComponentResourceProvider.java| 2 +- .../internal/ConfigGroupResourceProvider.java | 6 +- .../internal/ConfigurationResourceProvider.java| 2 +- .../internal/ExportBlueprintRequest.java | 23 - .../internal/ExtensionLinkResourceProvider.java| 6 +- .../internal/ExtensionResourceProvider.java| 4 +- .../internal/ExtensionVersionResourceProvider.java | 4 +- .../controller/internal/FeedResourceProvider.java | 4 +- .../internal/GroupPrivilegeResourceProvider.java | 23 +- .../controller/internal/GroupResourceProvider.java | 4 +- .../HostComponentProcessResourceProvider.java | 4 +- .../internal/HostComponentResourceProvider.java| 6 +- .../controller/internal/HostResourceProvider.java | 8 +- .../internal/HostStackVersionResourceProvider.java | 6 +- .../internal/InstanceResourceProvider.java
[ambari-metrics] branch master updated: Update README.md
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new dc75b01 Update README.md
dc75b01 is described below
commit dc75b010c9661b1b4f0dce78e5e592439f57717e
Author: avijayanhwx
AuthorDate: Mon Oct 1 15:06:03 2018 -0700
Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1c3911f..67d9146 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Apache Ambari subproject
**Ambari Metrics System** ("AMS") is a system for collecting, aggregating,
serving and visualizing daemon and system metrics in Ambari-managed clusters.
The original JIRA Epic for Ambari Metrics System can be found here:
https://issues.apache.org/jira/browse/AMBARI-5707
-First official release of AMS was with Ambari 2.0.0. With metrics repro split,
the aim is to be able to release the sub-project with separate cadence than
Amabri.
+First official release of AMS was with Ambari 2.0.0. With metrics repro split,
the aim is to be able to release the sub-project with separate cadence than
Ambari.
| Term | Definition |
[ambari-infra] branch branch-feature-jenkins-test updated: Exclude .repository from rat check
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch branch-feature-jenkins-test in repository https://gitbox.apache.org/repos/asf/ambari-infra.git The following commit(s) were added to refs/heads/branch-feature-jenkins-test by this push: new 472bd9b Exclude .repository from rat check 472bd9b is described below commit 472bd9b0ca32e82f5850607f59f1bd60051dce0e Author: Oliver Szabo AuthorDate: Mon Oct 1 23:45:31 2018 +0200 Exclude .repository from rat check --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a38a3e5..cf43d51 100644 --- a/pom.xml +++ b/pom.xml @@ -285,6 +285,7 @@ **/docker/Profile **/docker/.env **/*.story +.repository/**
[ambari-infra] branch branch-feature-jenkins-test updated: Add .repository to .gitignore
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch branch-feature-jenkins-test in repository https://gitbox.apache.org/repos/asf/ambari-infra.git The following commit(s) were added to refs/heads/branch-feature-jenkins-test by this push: new 233a1fb Add .repository to .gitignore 233a1fb is described below commit 233a1fb9592d56541786c391ee3ca46594d0b58b Author: Oliver Szabo AuthorDate: Mon Oct 1 23:42:18 2018 +0200 Add .repository to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b48f609..9c77d11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .classpath .project .settings +.repository .idea/ .iml/ .DS_Store
[ambari-infra] branch branch-feature-jenkins-test updated: Remove ls from Dockerfile
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-feature-jenkins-test
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git
The following commit(s) were added to refs/heads/branch-feature-jenkins-test by
this push:
new c343716 Remove ls from Dockerfile
c343716 is described below
commit c3437163d8d1aba547d2206885db5a99f508db99
Author: Oliver Szabo
AuthorDate: Mon Oct 1 23:34:41 2018 +0200
Remove ls from Dockerfile
---
jenkins/containers/docker-infra-solr/Dockerfile | 2 --
1 file changed, 2 deletions(-)
diff --git a/jenkins/containers/docker-infra-solr/Dockerfile
b/jenkins/containers/docker-infra-solr/Dockerfile
index 18a1290..cdab2cc 100644
--- a/jenkins/containers/docker-infra-solr/Dockerfile
+++ b/jenkins/containers/docker-infra-solr/Dockerfile
@@ -44,8 +44,6 @@ RUN find /usr/lib/ambari-infra-solr -type f -exec chmod 644
{} +
RUN find /usr/lib/ambari-infra-solr-client -type d -exec chmod 755 {} +
RUN find /usr/lib/ambari-infra-solr-client -type f -exec chmod 644 {} +
-RUN ls -la /usr/lib/ambari-infra-solr
-
USER $SOLR_USER
WORKDIR /infra-solr/bin/
[ambari-infra] branch branch-feature-jenkins-test updated: add Makefile + docker build changes for infra-solr
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-feature-jenkins-test
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git
The following commit(s) were added to refs/heads/branch-feature-jenkins-test by
this push:
new 8c9848f add Makefile + docker build changes for infra-solr
8c9848f is described below
commit 8c9848f2c6d199b1661ccf1a19c9a96798943239
Author: Oliver Szabo
AuthorDate: Mon Oct 1 23:06:43 2018 +0200
add Makefile + docker build changes for infra-solr
---
Makefile | 32 ++
ambari-infra-assembly/pom.xml | 15 --
ambari-infra-manager-it/pom.xml| 4 +--
jenkins/build.sh | 32 --
.../{infra-solr => docker-infra-solr}/Dockerfile | 22 ++-
.../bin/entrypoint.sh | 0
.../{infra-solr => docker-infra-solr}/bin/init.sh | 0
.../conf/infra-solr.conf | 0
.../conf/solr.xml | 0
9 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..8620dbe
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GIT_REV_SHORT = $(shell git rev-parse --short HEAD)
+MAVEN_BINARY ?= mvn
+
+package:
+ $(MAVEN_BINARY) clean package
+
+test:
+ $(MAVEN_BINARY) clean test
+
+rpm:
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
+
+deb:
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+
+docker-build:
+ $(MAVEN_BINARY) clean package docker:build -DskipTests -Dbuild-deb
+
+docker-push:
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dbuild-deb
diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml
index 9cd0b7e..fe9d72e 100644
--- a/ambari-infra-assembly/pom.xml
+++ b/ambari-infra-assembly/pom.xml
@@ -45,6 +45,7 @@
http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar
commons-fileupload-1.3.3.jar
commons-fileupload-1.3.2.jar
+../jenkins/containers
@@ -397,6 +398,16 @@
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+
+
+
+
+
+
+
+
+
+
@@ -405,13 +416,13 @@
io.fabric8
docker-maven-plugin
-0.27.1
+ true
apache/ambari-infra-solr:latest
-openjdk:10-jdk
+
${project.build.directory}/docker-infra-solr
diff --git a/ambari-infra-manager-it/pom.xml b/ambari-infra-manager-it/pom.xml
index c9b8bad..2fac6a9 100644
--- a/ambari-infra-manager-it/pom.xml
+++ b/ambari-infra-manager-it/pom.xml
@@ -34,7 +34,7 @@
4.0.5
2.20
-localhost
+localhost
NONE
@@ -202,7 +202,7 @@
file:${project.build.testOutputDirectory}/log4j.properties
-${docker.host}
+${infra-manager.docker.host}
${stories.location}
diff --git a/jenkins/build.sh b/jenkins/build.sh
deleted file mode 100755
index 669ff7d..000
--- a/jenkins/build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-readlinkf(){
- # get
[ambari-metrics] 02/02: [AMBARI-24688] Backend changes for the newer version of AMS Grafana.
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
commit d27e4865cca0591ea16d92e2e1099ddb32be56fe
Author: Aravindan Vijayan
AuthorDate: Mon Oct 1 12:56:47 2018 -0700
[AMBARI-24688] Backend changes for the newer version of AMS Grafana.
---
ambari-metrics-assembly/pom.xml| 13 +++
.../ambari-metrics/config_ctrl.d.ts| 18 +
.../ambari-metrics/config_ctrl.js.map | 18 +
.../ambari-metrics/datasource.js | 2 +-
ambari-metrics-grafana/ambari-metrics/module.js| 18 +
.../ambari-metrics/module.js.map | 18 +
.../partials/annotations.editor.html | 17
ambari-metrics-grafana/ambari-metrics/plugin.json | 6 +-
.../ambari-metrics/query_ctrl.d.ts | 18 +
.../ambari-metrics/query_ctrl.js.map | 18 +
ambari-metrics-grafana/conf/unix/ams-grafana.ini | 93 --
ambari-metrics-grafana/pom.xml | 8 +-
pom.xml| 4 +-
13 files changed, 231 insertions(+), 20 deletions(-)
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 6244649..4841f9c 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -516,8 +516,20 @@
/var/lib/ambari-metrics-grafana
+
/var/lib/ambari-metrics-grafana/plugins
+
+
/var/log/ambari-metrics-grafana
+
+
/var/lib/ambari-metrics-grafana/plugins/ambari-metrics
+ 755
+
+
+ ${grafana.dir}/ambari-metrics
+
+
+
@@ -754,6 +766,7 @@
/var/lib/ambari-metrics-collector
/var/lib/ambari-metrics-monitor/lib
/var/lib/ambari-metrics-grafana
+/var/lib/ambari-metrics-grafana/plugins
/usr/lib/ambari-metrics-hadoop-sink
/usr/lib/ambari-metrics-kafka-sink
/usr/lib/ambari-metrics-kafka-sink/lib
diff --git a/ambari-metrics-grafana/ambari-metrics/config_ctrl.d.ts
b/ambari-metrics-grafana/ambari-metrics/config_ctrl.d.ts
index 33286c8..da4bca7 100644
--- a/ambari-metrics-grafana/ambari-metrics/config_ctrl.d.ts
+++ b/ambari-metrics-grafana/ambari-metrics/config_ctrl.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
///
export declare class AmbariMetricsConfigCtrl {
static templateUrl: string;
diff --git a/ambari-metrics-grafana/ambari-metrics/config_ctrl.js.map
b/ambari-metrics-grafana/ambari-metrics/config_ctrl.js.map
index 8c46be5..68d7464 100644
--- a/ambari-metrics-grafana/ambari-metrics/config_ctrl.js.map
+++ b/ambari-metrics-grafana/ambari-metrics/config_ctrl.js.map
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
[ambari-metrics] branch master updated (7c9b16d -> d27e486)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git.
from 7c9b16d Update README.md
new aa2dd69 [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal
Rao, Ishan Bhatt via avijayan)
new d27e486 [AMBARI-24688] Backend changes for the newer version of AMS
Grafana.
The 2 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:
ambari-metrics-assembly/pom.xml| 13 +
.../ambari-metrics/config_ctrl.d.ts| 10 +-
.../{directives.js => config_ctrl.js} | 32 +-
.../ambari-metrics/config_ctrl.js.map |8 +-
.../ambari-metrics/config_ctrl.ts | 11 +-
.../ambari-metrics/datasource.d.ts |9 +-
.../ambari-metrics/datasource.js | 2066 +++-
.../ambari-metrics/directives.js |1 +
.../ambari-metrics/img/ams-screenshot.png | Bin 0 -> 157579 bytes
.../ambari-metrics/img/apache-ambari-logo-sm.png | Bin 0 -> 11354 bytes
.../ambari-metrics/img/apache-ambari-logo.png | Bin 0 -> 25912 bytes
.../ambari-metrics/img/apache-ambari-project.png | Bin 0 -> 17174 bytes
.../ambari-metrics/module.d.ts | 12 +-
.../ambari-metrics/{directives.js => module.js}| 35 +-
.../ambari-metrics/module.js.map |8 +-
.../ambari-metrics/module.ts | 15 +-
.../{config.html => annotations.editor.html} |4 +-
.../ambari-metrics/partials/config.html|3 +-
.../ambari-metrics/partials/query.editor.html | 222 +--
.../ambari-metrics/partials/query.options.html | 42 -
ambari-metrics-grafana/ambari-metrics/plugin.json | 33 +-
ambari-metrics-grafana/ambari-metrics/queryCtrl.js | 160 --
.../ambari-metrics/query_ctrl.d.ts | 32 +-
.../ambari-metrics/query_ctrl.js | 152 ++
.../ambari-metrics/query_ctrl.js.map | 19 +
.../ambari-metrics/query_ctrl.ts | 169 ++
ambari-metrics-grafana/conf/unix/ams-grafana.ini | 93 +-
ambari-metrics-grafana/pom.xml |8 +-
pom.xml|4 +-
29 files changed, 1719 insertions(+), 1442 deletions(-)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/config_ctrl.d.ts (81%)
copy ambari-metrics-grafana/ambari-metrics/{directives.js => config_ctrl.js}
(58%)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/config_ctrl.js.map (67%)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/config_ctrl.ts (79%)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/datasource.d.ts (81%)
create mode 100644 ambari-metrics-grafana/ambari-metrics/img/ams-screenshot.png
create mode 100644
ambari-metrics-grafana/ambari-metrics/img/apache-ambari-logo-sm.png
create mode 100644
ambari-metrics-grafana/ambari-metrics/img/apache-ambari-logo.png
create mode 100644
ambari-metrics-grafana/ambari-metrics/img/apache-ambari-project.png
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/module.d.ts (73%)
copy ambari-metrics-grafana/ambari-metrics/{directives.js => module.js} (51%)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/module.js.map (79%)
copy
ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterMBean.java
=> ambari-metrics-grafana/ambari-metrics/module.ts (72%)
copy ambari-metrics-grafana/ambari-metrics/partials/{config.html =>
annotations.editor.html} (93%)
delete mode 100644
ambari-metrics-grafana/ambari-metrics/partials/query.options.html
delete mode 100644 ambari-metrics-grafana/ambari-metrics/queryCtrl.js
copy
ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/net/MetricsSender.java
=> ambari-metrics-grafana/ambari-metrics/query_ctrl.d.ts (56%)
create mode 100644 ambari-metrics-grafana/ambari-metrics/query_ctrl.js
create mode 100644
[ambari] branch branch-2.7 updated: [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 … (#2405)
This is an automated email from the ASF dual-hosted git repository.
vbrodetskyi pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 0e8dcfd [AMBARI-24718] STS fails after start, after stack upgrade
from 3.0.1 … (#2405)
0e8dcfd is described below
commit 0e8dcfd9be2d1ccd526126cf9bc0073e3e8a1c73
Author: vbrodetskyi
AuthorDate: Mon Oct 1 23:18:41 2018 +0300
[AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 …
(#2405)
* [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 to
3.0.3.(vbrodetskyi)
* [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 to
3.0.3.(vbrodetskyi)
---
.../upgrades/FixSparkYarnIdentity.java | 87 ++
1 file changed, 87 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
new file mode 100644
index 000..3d1b994
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.Host;
+import org.apache.ambari.server.state.SecurityType;
+
+/**
+ * Check if spark.yarn.kaytab/principal property exists
+ * if not, then we are creating them and copy pasting
+ * values from spark.history.kerberos.keytab/principal properties.
+ * Works only for kerberized cluster.
+ */
+public class FixSparkYarnIdentity extends AbstractUpgradeServerAction {
+ private static final String SPARK2_THRIFT_SPARKCONF_CONFIG_TYPE =
"spark2-thrift-sparkconf";
+ private static final String SPARK2_DEFAULTS_CONFIG_TYPE = "spark2-defaults";
+
+ private static final String SPARK_YARN_KEYTAB_PROPERTY_NAME =
"spark.yarn.keytab";
+ private static final String SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME =
"spark.yarn.principal";
+
+ private static final String SPARK_HISTORY_KERBEROS_KEYTAB_PROPERTY_NAME =
"spark.history.kerberos.keytab";
+ private static final String SPARK_HISTORY_KERBEROS_PRINCIPAL_PROPERTY_NAME =
"spark.history.kerberos.principal";
+
+
+ @Override
+ public CommandReport execute(ConcurrentMap
requestSharedDataContext)
+ throws AmbariException, InterruptedException {
+
+String clusterName = getExecutionCommand().getClusterName();
+
+Cluster cluster = getClusters().getCluster(clusterName);
+
+if (cluster.getSecurityType() == SecurityType.KERBEROS) {
+
+ Config spark2ThriftSparkConfConfig =
cluster.getDesiredConfigByType(SPARK2_THRIFT_SPARKCONF_CONFIG_TYPE);
+
+ if (spark2ThriftSparkConfConfig != null) {
+Map spark2ThriftSparkConfProperties =
spark2ThriftSparkConfConfig.getProperties();
+if
(!spark2ThriftSparkConfProperties.containsKey(SPARK_YARN_KEYTAB_PROPERTY_NAME)
&&
+
!spark2ThriftSparkConfProperties.containsKey(SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME))
{
+
+ Config spark2DefaultsConfig =
cluster.getDesiredConfigByType(SPARK2_DEFAULTS_CONFIG_TYPE);
+ if (spark2DefaultsConfig != null) {
+Map spark2DefultsProperties = spark2DefaultsConfig.getProperties();
+
+
spark2ThriftSparkConfProperties.put(SPARK_YARN_KEYTAB_PROPERTY_NAME,
spark2DefultsProperties.get(SPARK_HISTORY_KERBEROS_KEYTAB_PROPERTY_NAME));
+
spark2ThriftSparkConfProperties.put(SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME,
spark2DefultsProperties.get(SPARK_HISTORY_KERBEROS_PRINCIPAL_PROPERTY_NAME));
+
[ambari] branch trunk updated: [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 … (#2406)
This is an automated email from the ASF dual-hosted git repository.
vbrodetskyi pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6976220 [AMBARI-24718] STS fails after start, after stack upgrade
from 3.0.1 … (#2406)
6976220 is described below
commit 69762201ee278a4be486a1656f3c56a775c24518
Author: vbrodetskyi
AuthorDate: Mon Oct 1 23:18:51 2018 +0300
[AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 …
(#2406)
* [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 to
3.0.3.(vbrodetskyi)
* [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 to
3.0.3.(vbrodetskyi)
---
.../upgrades/FixSparkYarnIdentity.java | 87 ++
1 file changed, 87 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
new file mode 100644
index 000..3d1b994
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixSparkYarnIdentity.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.Host;
+import org.apache.ambari.server.state.SecurityType;
+
+/**
+ * Check if spark.yarn.kaytab/principal property exists
+ * if not, then we are creating them and copy pasting
+ * values from spark.history.kerberos.keytab/principal properties.
+ * Works only for kerberized cluster.
+ */
+public class FixSparkYarnIdentity extends AbstractUpgradeServerAction {
+ private static final String SPARK2_THRIFT_SPARKCONF_CONFIG_TYPE =
"spark2-thrift-sparkconf";
+ private static final String SPARK2_DEFAULTS_CONFIG_TYPE = "spark2-defaults";
+
+ private static final String SPARK_YARN_KEYTAB_PROPERTY_NAME =
"spark.yarn.keytab";
+ private static final String SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME =
"spark.yarn.principal";
+
+ private static final String SPARK_HISTORY_KERBEROS_KEYTAB_PROPERTY_NAME =
"spark.history.kerberos.keytab";
+ private static final String SPARK_HISTORY_KERBEROS_PRINCIPAL_PROPERTY_NAME =
"spark.history.kerberos.principal";
+
+
+ @Override
+ public CommandReport execute(ConcurrentMap
requestSharedDataContext)
+ throws AmbariException, InterruptedException {
+
+String clusterName = getExecutionCommand().getClusterName();
+
+Cluster cluster = getClusters().getCluster(clusterName);
+
+if (cluster.getSecurityType() == SecurityType.KERBEROS) {
+
+ Config spark2ThriftSparkConfConfig =
cluster.getDesiredConfigByType(SPARK2_THRIFT_SPARKCONF_CONFIG_TYPE);
+
+ if (spark2ThriftSparkConfConfig != null) {
+Map spark2ThriftSparkConfProperties =
spark2ThriftSparkConfConfig.getProperties();
+if
(!spark2ThriftSparkConfProperties.containsKey(SPARK_YARN_KEYTAB_PROPERTY_NAME)
&&
+
!spark2ThriftSparkConfProperties.containsKey(SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME))
{
+
+ Config spark2DefaultsConfig =
cluster.getDesiredConfigByType(SPARK2_DEFAULTS_CONFIG_TYPE);
+ if (spark2DefaultsConfig != null) {
+Map spark2DefultsProperties = spark2DefaultsConfig.getProperties();
+
+
spark2ThriftSparkConfProperties.put(SPARK_YARN_KEYTAB_PROPERTY_NAME,
spark2DefultsProperties.get(SPARK_HISTORY_KERBEROS_KEYTAB_PROPERTY_NAME));
+
spark2ThriftSparkConfProperties.put(SPARK_YARN_KEYTAB_PRINCIPAL_PROPERTY_NAME,
spark2DefultsProperties.get(SPARK_HISTORY_KERBEROS_PRINCIPAL_PROPERTY_NAME));
+
[GitHub] asfgit commented on issue #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan)
asfgit commented on issue #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan) URL: https://github.com/apache/ambari-metrics/pull/3#issuecomment-426044812 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/6/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit commented on issue #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan)
asfgit commented on issue #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan) URL: https://github.com/apache/ambari-metrics/pull/3#issuecomment-426026077 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/5/ Test FAILed. Test FAILured. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] avijayanhwx opened a new pull request #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan)
avijayanhwx opened a new pull request #3: [AMBARI-24665] Migrating grafana plugin for 5.x use (Prajwal Rao, Ishan Bhatt via avijayan) URL: https://github.com/apache/ambari-metrics/pull/3 What changes were proposed in this pull request? Required changes to be used with changed sdks This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari] branch trunk updated (b497744 -> 7b5fd0a)
This is an automated email from the ASF dual-hosted git repository. akovalenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from b497744 AMBARI-24717. Ambari-agent does for save data hashes correctly (aonishuk) add 7b5fd0a AMBARI-24704. Problems with accounts page when sysprep_skip_create_users_and_groups is absent (akovalenko) No new revisions were added by this update. Summary of changes: ambari-web/app/views/wizard/step7/accounts_tab_view.js | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-)
[ambari] branch trunk updated: AMBARI-24717. Ambari-agent does for save data hashes correctly (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new b497744 AMBARI-24717. Ambari-agent does for save data hashes
correctly (aonishuk)
b497744 is described below
commit b497744c3fd5db56c0c70954b1f8f96c244bbe8b
Author: Andrew Onishuk
AuthorDate: Mon Oct 1 14:32:14 2018 +0300
AMBARI-24717. Ambari-agent does for save data hashes correctly (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/ClusterCache.py| 12 ++--
.../src/main/python/ambari_agent/ClusterMetadataCache.py | 9 -
.../src/main/python/ambari_agent/InitializerModule.py| 2 +-
ambari-agent/src/main/python/ambari_agent/RecoveryManager.py | 9 +
.../python/ambari_agent/listeners/MetadataEventListener.py | 6 --
5 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/ClusterCache.py
b/ambari-agent/src/main/python/ambari_agent/ClusterCache.py
index 2e13f16..ea3498d 100644
--- a/ambari-agent/src/main/python/ambari_agent/ClusterCache.py
+++ b/ambari-agent/src/main/python/ambari_agent/ClusterCache.py
@@ -99,10 +99,7 @@ class ClusterCache(dict):
del self[cache_id_to_delete]
self.on_cache_update()
-self.persist_cache()
-
-# if all of above are sucessful finally set the hash
-self.hash = cache_hash
+self.persist_cache(cache_hash)
def cache_update(self, update_dict, cache_hash):
"""
@@ -131,7 +128,7 @@ class ClusterCache(dict):
with self._cache_lock:
self[cluster_id] = immutable_cache
- def persist_cache(self):
+ def persist_cache(self, cache_hash):
# ensure that our cache directory exists
if not os.path.exists(self.cluster_cache_dir):
os.makedirs(self.cluster_cache_dir)
@@ -142,7 +139,10 @@ class ClusterCache(dict):
if self.hash is not None:
with open(self.__current_cache_hash_file, 'w') as fp:
- fp.write(self.hash)
+ fp.write(cache_hash)
+
+# if all of above are successful finally set the hash
+self.hash = cache_hash
def _get_mutable_copy(self):
with self._cache_lock:
diff --git a/ambari-agent/src/main/python/ambari_agent/ClusterMetadataCache.py
b/ambari-agent/src/main/python/ambari_agent/ClusterMetadataCache.py
index 2ae7962..6c9fc8e 100644
--- a/ambari-agent/src/main/python/ambari_agent/ClusterMetadataCache.py
+++ b/ambari-agent/src/main/python/ambari_agent/ClusterMetadataCache.py
@@ -30,14 +30,21 @@ class ClusterMetadataCache(ClusterCache):
topology properties.
"""
- def __init__(self, cluster_cache_dir):
+ def __init__(self, cluster_cache_dir, config):
"""
Initializes the topology cache.
:param cluster_cache_dir:
:return:
"""
+self.config = config
super(ClusterMetadataCache, self).__init__(cluster_cache_dir)
+ def on_cache_update(self):
+try:
+
self.config.update_configuration_from_metadata(self['-1']['agentConfigs'])
+except KeyError:
+ pass
+
def cache_delete(self, cache_update, cache_hash):
"""
Only deleting cluster is supported here
diff --git a/ambari-agent/src/main/python/ambari_agent/InitializerModule.py
b/ambari-agent/src/main/python/ambari_agent/InitializerModule.py
index b15aaec..c5d9bee 100644
--- a/ambari-agent/src/main/python/ambari_agent/InitializerModule.py
+++ b/ambari-agent/src/main/python/ambari_agent/InitializerModule.py
@@ -84,7 +84,7 @@ class InitializerModule:
"""
self.is_registered = False
-self.metadata_cache = ClusterMetadataCache(self.config.cluster_cache_dir)
+self.metadata_cache = ClusterMetadataCache(self.config.cluster_cache_dir,
self.config)
self.topology_cache = ClusterTopologyCache(self.config.cluster_cache_dir,
self.config)
self.host_level_params_cache =
ClusterHostLevelParamsCache(self.config.cluster_cache_dir)
self.configurations_cache =
ClusterConfigurationCache(self.config.cluster_cache_dir)
diff --git a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
index e178457..4842353 100644
--- a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
+++ b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
@@ -103,6 +103,15 @@ class RecoveryManager:
self.actions = {}
self.update_config(6, 60, 5, 12, recovery_enabled, auto_start_only,
auto_install_start)
+# FIXME: Recovery manager does not support multiple clusters as of now.
+if len(self.initializer_module.configurations_cache):
+ self.cluster_id = self.initializer_module.configurations_cache.keys()[0]
+ self.on_config_update()
+
+if len(self.initializer_module.host_level_params_cache):
+ self.cluster_id =
self.initializer_module.host_level_params_cache.keys()[0]
+
[ambari] branch branch-2.7 updated: AMBARI-24708. Automation script for upgrade old style isilon cluster to the new mpack based structure (amagyar) (#2397) (#2404)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 21f5186 AMBARI-24708. Automation script for upgrade old style isilon
cluster to the new mpack based structure (amagyar) (#2397) (#2404)
21f5186 is described below
commit 21f518644a92ee965be6ce9d161cea020660e029
Author: Attila Magyar
AuthorDate: Mon Oct 1 14:39:49 2018 +0200
AMBARI-24708. Automation script for upgrade old style isilon cluster to the
new mpack based structure (amagyar) (#2397) (#2404)
* AMBARI-24708. Automation script for upgrade old style isilon cluster to
the new mpack based structure (amagyar)
* AMBARI-24708. Automation script for upgrade old style isilon cluster to
the new mpack based structure (amagyar)
---
.../src/main/tools/hdfs_to_onefs_convert.py| 531 +
1 file changed, 531 insertions(+)
diff --git
a/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
new file mode 100644
index 000..4c63c9f
--- /dev/null
+++
b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
@@ -0,0 +1,531 @@
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+import urllib2, base64, json, ssl, time, random, sys
+from optparse import OptionParser
+from contextlib import closing
+
+class SslContext:
+ def build(self, url):
+if not url.startswith('https') or not hasattr(ssl, 'SSLContext'):
+ return None
+return ssl.SSLContext(self._protocol()) if self._protocol() else
ssl.create_default_context()
+
+ def _protocol(self):
+if hasattr(ssl, 'PROTOCOL_TLS'): return ssl.PROTOCOL_TLS
+elif hasattr(ssl, 'PROTOCOL_TLSv1_2'): return ssl.PROTOCOL_TLSv1_2
+elif hasattr(ssl, 'PROTOCOL_TLSv1_1'): return ssl.PROTOCOL_TLSv1_1
+elif hasattr(ssl, 'PROTOCOL_TLSv1'): return ssl.PROTOCOL_TLSv1
+else: return None
+
+class PermissiveSslContext:
+ def build(self, url):
+context = SslContext().build(url)
+if hasattr(context, '_https_verify_certificates'):
+ context._https_verify_certificates(False)
+return context
+
+class Url:
+ @classmethod
+ def base(clazz, protocol, host, port):
+ return clazz('%s://%s:%d' % (protocol, host, port))
+
+ def __init__(self, url_str):
+self.base = url_str.rstrip('/')
+
+ def __div__(self, suffix_url):
+suffix_str = str(suffix_url)
+if self._is_absolute(suffix_str):
+ return Url(suffix_str)
+else:
+ return Url(self.base + (suffix_str if suffix_str.startswith('/') else
'/' + suffix_str))
+
+ def _is_absolute(self, suffix_str):
+return suffix_str.startswith(self.base)
+
+ def query_params(self, a_dict):
+return Url(self.base + '?' + '&'.join('%s=%s' % (name, value) for name,
value in a_dict.items()))
+
+ def __str__(self):
+return self.base
+
+class Header:
+ @classmethod
+ def csrf(clazz):
+return clazz('X-Requested-By', 'ambari')
+
+ def __init__(self, key, value):
+self.key, self.value = key, value
+
+ def add_to(self, request):
+request.add_header(self.key, self.value)
+
+class BasicAuth:
+ def __init__(self, user, password):
+self.header = Header(
+ 'Authorization',
+ 'Basic %s' % base64.encodestring('%s:%s' % (user,
password)).replace('\n', ''))
+
+ def authenticate(self, request):
+self.header.add_to(request)
+
+class ResponseTransformer:
+ @staticmethod
+ def identity():
+return lambda url, code, data: (code, data)
+
+ def __call__(self, url, code, data):
+raise RuntimeError('Subclass responsibility')
+
+class UnexpectedHttpCode(Exception): pass
+
+class JsonTransformer(ResponseTransformer):
+ def __call__(self, url, code, data):
+if 200 <= code <= 299:
+ return code, self._parse(data)
+else:
+ return UnexpectedHttpCode('Unexpected http code: %d url: %s response:
%s' % (code, url, data))
+
+ def _parse(self, a_str):
+if not a_str:
+ return {}
+try:
+ return json.loads(a_str)
+except ValueError as e:
+ raise
[ambari] branch trunk updated: AMBARI-24715. Clean up ambari-agent.log (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 33a42c3 AMBARI-24715. Clean up ambari-agent.log (aonishuk)
33a42c3 is described below
commit 33a42c32bc45fc0ea5732819214d7b891c3c829f
Author: Andrew Onishuk
AuthorDate: Mon Oct 1 13:02:50 2018 +0300
AMBARI-24715. Clean up ambari-agent.log (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py | 2 +-
ambari-agent/src/main/python/ambari_agent/RecoveryManager.py | 1 -
ambari-agent/src/main/python/ambari_agent/alerts/collector.py| 5 +
.../src/main/python/ambari_agent/listeners/CommandsEventListener.py | 4
.../main/python/ambari_agent/listeners/ServerResponsesListener.py| 2 +-
ambari-agent/src/main/python/ambari_agent/main.py| 2 ++
ambari-agent/src/main/python/ambari_agent/security.py| 2 +-
7 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
index 9210e79..36b88d6 100644
--- a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
+++ b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
@@ -143,7 +143,7 @@ class HeartbeatThread(threading.Thread):
try:
listener.on_event({}, response)
except:
- logger.exception("Exception while handing response to request at
{0}. {1}".format(endpoint, response))
+ logger.exception("Exception while handing response to request at {0}
{1}".format(endpoint, response))
raise
finally:
with listener.event_queue_lock:
diff --git a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
index ba6507c..e178457 100644
--- a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
+++ b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
@@ -165,7 +165,6 @@ class RecoveryManager:
component_status = copy.deepcopy(self.default_component_status)
component_status["current"] = state
self.statuses[component] = component_status
- logger.info("New status, current status is set to %s for %s",
self.statuses[component]["current"], component)
finally:
self.__status_lock.release()
pass
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
b/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
index 089301f..daac7ee 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
@@ -66,6 +66,11 @@ class AlertCollector():
for cluster,alert_map in self.__buckets.iteritems():
for alert_name in alert_map.keys():
alert = alert_map[alert_name]
+
+ if not 'uuid' in alert:
+logger.warn("Alert {0} does not have uuid key.".format(alert))
+continue
+
if alert['uuid'] == alert_uuid:
self.remove(cluster, alert_name)
finally:
diff --git
a/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
b/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
index b25ec69..51ba7df 100644
---
a/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
+++
b/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
@@ -74,6 +74,10 @@ class CommandsEventListener(EventListener):
command['repositoryFile'] = '...'
if 'commandParams' in command:
command['commandParams'] = '...'
+ if 'clusterHostInfo' in command:
+command['clusterHostInfo'] = '...'
+ if 'componentVersionMap' in command:
+command['componentVersionMap'] = '...'
except KeyError:
pass
diff --git
a/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
b/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
index 02d60a5..a4af571 100644
---
a/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
+++
b/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
@@ -74,7 +74,7 @@ class ServerResponsesListener(EventListener):
This string will be used to log received messsage of this type
"""
if Constants.CORRELATION_ID_STRING in headers:
- correlation_id = headers[Constants.CORRELATION_ID_STRING]
+ correlation_id = int(headers[Constants.CORRELATION_ID_STRING])
if correlation_id in self.logging_handlers:
message_json = self.logging_handlers[correlation_id](headers,
message_json)
diff --git
[ambari] branch trunk updated: AMBARI-24708. Automation script for upgrade old style isilon cluster to the new mpack based structure (amagyar) (#2397)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 726d1d0 AMBARI-24708. Automation script for upgrade old style isilon
cluster to the new mpack based structure (amagyar) (#2397)
726d1d0 is described below
commit 726d1d016ec8eae1056a1412f8b857927dfc32ad
Author: Attila Magyar
AuthorDate: Mon Oct 1 13:40:54 2018 +0200
AMBARI-24708. Automation script for upgrade old style isilon cluster to the
new mpack based structure (amagyar) (#2397)
* AMBARI-24708. Automation script for upgrade old style isilon cluster to
the new mpack based structure (amagyar)
* AMBARI-24708. Automation script for upgrade old style isilon cluster to
the new mpack based structure (amagyar)
---
.../src/main/tools/hdfs_to_onefs_convert.py| 531 +
1 file changed, 531 insertions(+)
diff --git
a/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
new file mode 100644
index 000..4c63c9f
--- /dev/null
+++
b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py
@@ -0,0 +1,531 @@
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+import urllib2, base64, json, ssl, time, random, sys
+from optparse import OptionParser
+from contextlib import closing
+
+class SslContext:
+ def build(self, url):
+if not url.startswith('https') or not hasattr(ssl, 'SSLContext'):
+ return None
+return ssl.SSLContext(self._protocol()) if self._protocol() else
ssl.create_default_context()
+
+ def _protocol(self):
+if hasattr(ssl, 'PROTOCOL_TLS'): return ssl.PROTOCOL_TLS
+elif hasattr(ssl, 'PROTOCOL_TLSv1_2'): return ssl.PROTOCOL_TLSv1_2
+elif hasattr(ssl, 'PROTOCOL_TLSv1_1'): return ssl.PROTOCOL_TLSv1_1
+elif hasattr(ssl, 'PROTOCOL_TLSv1'): return ssl.PROTOCOL_TLSv1
+else: return None
+
+class PermissiveSslContext:
+ def build(self, url):
+context = SslContext().build(url)
+if hasattr(context, '_https_verify_certificates'):
+ context._https_verify_certificates(False)
+return context
+
+class Url:
+ @classmethod
+ def base(clazz, protocol, host, port):
+ return clazz('%s://%s:%d' % (protocol, host, port))
+
+ def __init__(self, url_str):
+self.base = url_str.rstrip('/')
+
+ def __div__(self, suffix_url):
+suffix_str = str(suffix_url)
+if self._is_absolute(suffix_str):
+ return Url(suffix_str)
+else:
+ return Url(self.base + (suffix_str if suffix_str.startswith('/') else
'/' + suffix_str))
+
+ def _is_absolute(self, suffix_str):
+return suffix_str.startswith(self.base)
+
+ def query_params(self, a_dict):
+return Url(self.base + '?' + '&'.join('%s=%s' % (name, value) for name,
value in a_dict.items()))
+
+ def __str__(self):
+return self.base
+
+class Header:
+ @classmethod
+ def csrf(clazz):
+return clazz('X-Requested-By', 'ambari')
+
+ def __init__(self, key, value):
+self.key, self.value = key, value
+
+ def add_to(self, request):
+request.add_header(self.key, self.value)
+
+class BasicAuth:
+ def __init__(self, user, password):
+self.header = Header(
+ 'Authorization',
+ 'Basic %s' % base64.encodestring('%s:%s' % (user,
password)).replace('\n', ''))
+
+ def authenticate(self, request):
+self.header.add_to(request)
+
+class ResponseTransformer:
+ @staticmethod
+ def identity():
+return lambda url, code, data: (code, data)
+
+ def __call__(self, url, code, data):
+raise RuntimeError('Subclass responsibility')
+
+class UnexpectedHttpCode(Exception): pass
+
+class JsonTransformer(ResponseTransformer):
+ def __call__(self, url, code, data):
+if 200 <= code <= 299:
+ return code, self._parse(data)
+else:
+ return UnexpectedHttpCode('Unexpected http code: %d url: %s response:
%s' % (code, url, data))
+
+ def _parse(self, a_str):
+if not a_str:
+ return {}
+try:
+ return json.loads(a_str)
+except ValueError as e:
+ raise ValueError('Error %s while
[ambari] branch trunk updated: AMBARI-24700 - Slider widget: insert a space char between label value and unit-name (#2399)
This is an automated email from the ASF dual-hosted git repository.
krisztiankasa pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1f1f890 AMBARI-24700 - Slider widget: insert a space char between
label value and unit-name (#2399)
1f1f890 is described below
commit 1f1f890c65aa45243f76efac2fec741fea28a35b
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Mon Oct 1 11:30:28 2018 +0200
AMBARI-24700 - Slider widget: insert a space char between label value and
unit-name (#2399)
---
.../app/views/common/configs/widgets/slider_config_widget_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 21d6f68..f00a7fd 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -434,7 +434,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
step: mirrorStep,
formatter: function (val) {
var labelValue = Em.isArray(val) ? val[0] : val;
-return self.formatTickLabel(labelValue);
+return self.formatTickLabel(labelValue, ' ');
}
});
