You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2016/02/11 02:12:55 UTC
ambari git commit: AMBARI-14964: AMS cannot be installed on trunk
(avijayan via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk c147b27e9 -> 3242a5590
AMBARI-14964: AMS cannot be installed on trunk (avijayan via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3242a559
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3242a559
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3242a559
Branch: refs/heads/trunk
Commit: 3242a5590a6cf84f9cd664e38c7ae8b1c2fe968a
Parents: c147b27
Author: Jun Aoki <ja...@apache.org>
Authored: Wed Feb 10 17:12:48 2016 -0800
Committer: Jun Aoki <ja...@apache.org>
Committed: Wed Feb 10 17:12:48 2016 -0800
----------------------------------------------------------------------
.../libraries/functions/package_conditions.py | 7 ++++++-
.../stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml | 2 +-
.../common-services/AMBARI_METRICS/0.1.0/metainfo.xml | 2 ++
.../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py | 4 +++-
.../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py | 5 ++++-
.../AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py | 2 +-
6 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-common/src/main/python/resource_management/libraries/functions/package_conditions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/package_conditions.py b/ambari-common/src/main/python/resource_management/libraries/functions/package_conditions.py
index 0fb0fe4..4ca3b7b 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/package_conditions.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/package_conditions.py
@@ -19,7 +19,8 @@ limitations under the License.
Ambari Agent
"""
-__all__ = ["is_lzo_enabled", "should_install_phoenix", "should_install_ams_collector", "should_install_mysql", "should_install_mysl_connector"]
+__all__ = ["is_lzo_enabled", "should_install_phoenix", "should_install_ams_collector", "should_install_ams_grafana",
+ "should_install_mysql", "should_install_mysl_connector"]
import os
from resource_management.libraries.script import Script
@@ -41,6 +42,10 @@ def should_install_ams_collector():
config = Script.get_config()
return 'role' in config and config['role'] == "METRICS_COLLECTOR"
+def should_install_ams_grafana():
+ config = Script.get_config()
+ return 'role' in config and config['role'] == "METRICS_GRAFANA"
+
def should_install_mysql():
config = Script.get_config()
hive_database = config['configurations']['hive-env']['hive_database']
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
index be99b83..fe3b860 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
@@ -69,7 +69,7 @@
<packages>
<package>
<name>ambari-metrics-collector</name>
- <condition>package_chooser.should_install_ams_collector()</condition>
+ <condition>should_install_ams_collector</condition>
</package>
<package>
<name>ambari-metrics-monitor</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
index c3dbc6b..3a832eb 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
@@ -83,6 +83,7 @@
<package>
<name>ambari-metrics-collector</name>
<skipUpgrade>true</skipUpgrade>
+ <condition>should_install_ams_collector</condition>
</package>
<package>
<name>ambari-metrics-monitor</name>
@@ -95,6 +96,7 @@
<package>
<name>ambari-metrics-grafana</name>
<skipUpgrade>true</skipUpgrade>
+ <condition>should_install_ams_grafana</condition>
</package>
<package>
<name>gcc</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index ddefed7..533d3ec 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -31,7 +31,9 @@ from ambari_commons.os_family_impl import OsFamilyImpl
class AmsCollector(Script):
def install(self, env):
- self.install_packages(env, exclude_packages = ['ambari-metrics-grafana'])
+ import params
+ env.set_params(params)
+ self.install_packages(env)
def configure(self, env, action = None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
index d96309c..6dd60f5 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
@@ -26,7 +26,10 @@ from metrics_grafana_util import create_ams_datasource
class AmsGrafana(Script):
def install(self, env):
- self.install_packages(env, exclude_packages = ['ambari-metrics-collector'])
+ import params
+ env.set_params(params)
+ self.install_packages(env)
+ self.configure(env) # for security
def configure(self, env, action = None):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/3242a559/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
index 921bed7..d98384b 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
@@ -27,7 +27,7 @@ class AmsMonitor(Script):
def install(self, env):
import params
env.set_params(params)
- self.install_packages(env, exclude_packages = ['ambari-metrics-collector', 'ambari-metrics-grafana'])
+ self.install_packages(env)
self.configure(env) # for security
def configure(self, env):