[ambari] branch branch-2.7 updated: [AMBARI-25249] Ambari UI quicklinks
This is an automated email from the ASF dual-hosted git repository.
akovalenko 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 7df08ed [AMBARI-25249] Ambari UI quicklinks
7df08ed is described below
commit 7df08ed4c8689adda76cedad5105aa9b3cfd95e9
Author: Aleksandr Kovalenko
AuthorDate: Mon Apr 15 19:41:42 2019 +0300
[AMBARI-25249] Ambari UI quicklinks
---
.../app/views/common/quick_view_link_view.js | 33 +++---
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/ambari-web/app/views/common/quick_view_link_view.js
b/ambari-web/app/views/common/quick_view_link_view.js
index 4a64c20..1281554 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -418,14 +418,17 @@ App.QuickLinksView = Em.View.extend({
var links = Em.get(quickLinksConfig, 'links');
links.forEach(function (link) {
-var publicHostName = this.publicHostName(link, hosts, protocol);
-if (publicHostName) {
- if (link.protocol) {
-protocol = this.setProtocol(configProperties, link.protocol);
- }
- var newItem = this.getHostLink(link, publicHostName, protocol,
configProperties, response); //quicklink generated for the hbs template
- if (!Em.isNone(newItem)) {
-quickLinks.push(newItem);
+var isRelatedComponentInstalled =
this.isRelatedComponentInstalled(link);
+if (isRelatedComponentInstalled) {
+ var publicHostName = this.publicHostName(link, hosts, protocol);
+ if (publicHostName) {
+if (link.protocol) {
+ protocol = this.setProtocol(configProperties, link.protocol);
+}
+var newItem = this.getHostLink(link, publicHostName, protocol,
configProperties, response); //quicklink generated for the hbs template
+if (!Em.isNone(newItem)) {
+ quickLinks.push(newItem);
+}
}
}
}, this);
@@ -480,7 +483,8 @@ App.QuickLinksView = Em.View.extend({
links.forEach(function (link) {
var linkRemoved = Em.get(link, 'removed');
var url = Em.get(link, 'url');
-if (url && !linkRemoved) {
+var isRelatedComponentInstalled =
this.isRelatedComponentInstalled(link);
+if (url && !linkRemoved && isRelatedComponentInstalled) {
var hostNameRegExp = new RegExp('([\\w\\W]*):\\d+');
if (serviceName === 'HDFS') {
var config;
@@ -874,5 +878,14 @@ App.QuickLinksView = Em.View.extend({
App.tooltip($(`[rel="${this.get('tooltipAttribute')}"]`));
}
});
- }.observes('showQuickLinks', 'isLoaded', 'quickLinksArray.length')
+ }.observes('showQuickLinks', 'isLoaded', 'quickLinksArray.length'),
+
+ /**
+ * Check if host component related to quickLink is installed
+ * @param quickLink
+ * @returns {Boolean}
+ */
+ isRelatedComponentInstalled: function (quickLink) {
+return App.HostComponent.find().someProperty('componentName',
quickLink.component_name);
+ }
});
[ambari] branch branch-2.7 updated: AMBARI-25243. Tez/MR service check fails with ClassNotFoundException LzoCodec during host ordered upgrade (amagyar) (#2929) (#2930)
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 cc693c3 AMBARI-25243. Tez/MR service check fails with
ClassNotFoundException LzoCodec during host ordered upgrade (amagyar) (#2929)
(#2930)
cc693c3 is described below
commit cc693c3e518bfd59e728d7d942ce4b1c8b2aea04
Author: Attila Magyar
AuthorDate: Mon Apr 15 15:32:08 2019 +0200
AMBARI-25243. Tez/MR service check fails with ClassNotFoundException
LzoCodec during host ordered upgrade (amagyar) (#2929) (#2930)
---
.../ambari/server/controller/AmbariActionExecutionHelper.java | 2 ++
.../src/main/resources/custom_actions/scripts/install_packages.py | 7 +++
2 files changed, 9 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index c0a7a7b..f586180 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -22,6 +22,7 @@ import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STA
import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STACK_RETRY_ON_UNAVAILABILITY;
import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
+import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.GPL_LICENSE_ACCEPTED;
import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
@@ -456,6 +457,7 @@ public class AmbariActionExecutionHelper {
resourceFilter.getComponentName() : componentName);
Map hostLevelParams = execCmd.getHostLevelParams();
+ hostLevelParams.put(GPL_LICENSE_ACCEPTED,
configs.getGplLicenseAccepted().toString());
hostLevelParams.put(AGENT_STACK_RETRY_ON_UNAVAILABILITY,
configs.isAgentStackRetryOnInstallEnabled());
hostLevelParams.put(AGENT_STACK_RETRY_COUNT,
configs.getAgentStackRetryOnInstallCount());
for (Map.Entry dbConnectorName :
configs.getDatabaseConnectorNames().entrySet()) {
diff --git
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 800bb21..14524cc 100644
---
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -40,6 +40,7 @@ from resource_management.libraries.functions.repository_util
import CommandRepos
from resource_management.libraries.functions.stack_features import
check_stack_feature
from resource_management.libraries.script.script import Script
from resource_management.core import sudo
+from resource_management.libraries.functions import lzo_utils
class InstallPackages(Script):
@@ -144,6 +145,12 @@ class InstallPackages(Script):
num_errors += 1
Logger.logger.exception("Could not install packages. Error:
{0}".format(str(err)))
+try:
+ lzo_utils.install_lzo_if_needed()
+except Exception as err:
+ num_errors += 1
+ Logger.logger.exception("Could not install LZO packages. Error:
{0}".format(str(err)))
+
# Provide correct exit code
if num_errors > 0:
raise Fail("Failed to distribute repositories/install packages")
[ambari] branch branch-2.6 updated: AMBARI-25246 Add module based dependency with custom version for the excluded transitiend modules (dgrinenko) (#2931)
This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new c29f680 AMBARI-25246 Add module based dependency with custom version
for the excluded transitiend modules (dgrinenko) (#2931)
c29f680 is described below
commit c29f680ff9d4ca4b7b976d7fe97c6e9c9845fde0
Author: Dmytro Grinenko
AuthorDate: Mon Apr 15 13:53:04 2019 +0300
AMBARI-25246 Add module based dependency with custom version for the
excluded transitiend modules (dgrinenko) (#2931)
---
ambari-logsearch/ambari-logsearch-solr-client/pom.xml | 4
ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 5 -
ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml | 4
ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 ++
ambari-metrics/pom.xml | 10 ++
5 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
b/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
index 2c320cc..648dc86 100644
--- a/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
@@ -92,6 +92,10 @@
3.4
test
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index 721fb8a..41e71d7 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -206,6 +206,9 @@ limitations under the License.
powermock-module-junit4
test
+
+ com.fasterxml.jackson.core
+ jackson-core
+
-
diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
index 1e4b2fb..a4e8db9 100644
--- a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
@@ -177,6 +177,10 @@ limitations under the License.
+ com.fasterxml.jackson.core
+ jackson-core
+
+
org.apache.ambari
ambari-metrics-common
${project.version}
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index c7c1304..19e176b 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -388,6 +388,16 @@
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
org.apache.hadoop
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 545e212..f7c9ea3 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -135,6 +135,16 @@
commons-codec
1.12
+
+com.fasterxml.jackson.core
+jackson-core
+2.9.8
+
+
+com.fasterxml.jackson.core
+jackson-databind
+2.9.8
+
