You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/22 17:49:49 UTC

[1/2] ambari git commit: AMBARI-15123. Ambari's App Timeline Web UI Alert tries make http heavy call timelineserver:httpPort which can also cause OOM (smohanty)

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 2eea1bfa9 -> ec91f74a4


AMBARI-15123. Ambari's App Timeline Web UI Alert tries make http heavy call timelineserver:httpPort which can also cause OOM (smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5366af8ca9cdf245396e9ee92a2dba9170a0456f
Parents: 4fcca62
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Feb 22 08:33:31 2016 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Feb 22 08:35:25 2016 -0800

----------------------------------------------------------------------
 .../main/resources/common-services/YARN/2.1.0.2.0/alerts.json    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5366af8c/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
index bbf3a7c..6198a74 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
@@ -388,8 +388,8 @@
         "source": {
           "type": "WEB",
           "uri": {
-            "http": "{{yarn-site/yarn.timeline-service.webapp.address}}",
-            "https": "{{yarn-site/yarn.timeline-service.webapp.https.address}}",
+            "http": "{{yarn-site/yarn.timeline-service.webapp.address}}/ws/v1/timeline",
+            "https": "{{yarn-site/yarn.timeline-service.webapp.https.address}}/ws/v1/timeline",
             "https_property": "{{yarn-site/yarn.http.policy}}",
             "https_property_value": "HTTPS_ONLY",
             "kerberos_keytab": "{{yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab}}",


[2/2] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade

Posted by nc...@apache.org.
Merge branch 'trunk' into branch-dev-patch-upgrade


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ec91f74a45544d67cb8bece50bd0ba44d9eeb749
Parents: 2eea1bf 5366af8
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Feb 22 11:48:50 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Feb 22 11:48:50 2016 -0500

----------------------------------------------------------------------
 .../main/resources/common-services/YARN/2.1.0.2.0/alerts.json    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------