You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/06/26 14:46:08 UTC
[1/2] git commit: AMBARI-6257. Ganglia is not coming up on SUSE after
cluster install. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 b9897dfc4 -> 8957574de
refs/heads/trunk 71647f50f -> 4b8eef1a9
AMBARI-6257. Ganglia is not coming up on SUSE after cluster install. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b8eef1a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b8eef1a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b8eef1a
Branch: refs/heads/trunk
Commit: 4b8eef1a95adc25366f585d6df7af52f16f51c40
Parents: 71647f5
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Jun 26 15:45:54 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Jun 26 15:45:54 2014 +0300
----------------------------------------------------------------------
.../HDP/1.3.2/services/GANGLIA/metainfo.xml | 6 ++--
.../GANGLIA/package/files/startRrdcached.sh | 8 +----
.../GANGLIA/package/scripts/ganglia_server.py | 13 ++++++--
.../services/GANGLIA/package/scripts/params.py | 10 ++++++
.../GANGLIA/package/templates/ganglia.conf.j2 | 34 ++++++++++++++++++++
.../GANGLIA/package/templates/gangliaEnv.sh.j2 | 1 +
.../HDP/2.0.6/services/GANGLIA/metainfo.xml | 15 +++------
.../GANGLIA/package/files/startRrdcached.sh | 8 +----
.../GANGLIA/package/scripts/ganglia_server.py | 12 +++----
.../services/GANGLIA/package/scripts/params.py | 15 ++++++++-
.../GANGLIA/package/templates/ganglia.conf.j2 | 4 +--
.../GANGLIA/package/templates/gangliaEnv.sh.j2 | 1 +
.../stacks/1.3.2/GANGLIA/test_ganglia_server.py | 10 ++++--
.../python/stacks/1.3.2/configs/default.json | 5 +--
.../python/stacks/1.3.2/configs/secured.json | 5 +--
.../stacks/2.0.6/GANGLIA/test_ganglia_server.py | 10 ++++--
.../python/stacks/2.0.6/configs/default.json | 3 +-
.../python/stacks/2.0.6/configs/secured.json | 5 +--
18 files changed, 113 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
index 3f97445..588708d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
@@ -53,6 +53,9 @@
<osFamily>any</osFamily>
<packages>
<package>
+ <name>python-rrdtool-1.4.5</name>
+ </package>
+ <package>
<name>libganglia-3.5.0-99</name>
</package>
<package>
@@ -65,9 +68,6 @@
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <name>python-rrdtool.x86_64</name>
- </package>
- <package>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
index 266d2f5..1ab1a2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
@@ -62,13 +62,7 @@ then
fi
#Configure Ganglia Web to work with RRDCached
- GANGLIA_WEB_CONFIG_FILE=""
- if [ -f /etc/SuSE-release ]
- then
- GANGLIA_WEB_CONFIG_FILE=/srv/www/htdocs/ganglia/conf_default.php
- else
- GANGLIA_WEB_CONFIG_FILE=/var/www/html/ganglia/conf_default.php
- fi
+ GANGLIA_WEB_CONFIG_FILE=${GANGLIA_WEB_PATH}/conf_default.php
if [ -f $GANGLIA_WEB_CONFIG_FILE ]
then
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
index 1096b14..3ee55ea 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
@@ -55,6 +55,7 @@ class GangliaServer(Script):
def configure(self, env):
import params
+ env.set_params(params)
ganglia.groups_and_users()
ganglia.config()
@@ -81,11 +82,11 @@ class GangliaServer(Script):
def change_permission():
import params
- Directory('/var/lib/ganglia/dwoo',
- mode=0777,
- owner=params.gmetad_user,
+ Directory(params.dwoo_path,
+ mode=0755,
recursive=True
)
+ Execute(format("chown -R {web_user} {dwoo_path}"))
def server_files():
@@ -110,6 +111,12 @@ def server_files():
recursive=True
)
+ if System.get_instance().os_family == "suse":
+ File( params.ganglia_apache_config_file,
+ content = Template("ganglia.conf.j2"),
+ mode = 0644
+ )
+
if __name__ == "__main__":
GangliaServer().execute()
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index 24c6a4b..5f421b2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
+import os
config = Script.get_config()
@@ -93,7 +94,16 @@ for key in ganglia_cluster_names:
ganglia_clusters.append(x)
+ganglia_apache_config_file = "/etc/apache2/conf.d/ganglia.conf"
+ganglia_web_path="/var/www/html/ganglia"
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia-web/dwoo'
+ web_user = "wwwrun"
+ # for upgrade purposes as path to ganglia was changed
+ if not os.path.exists(ganglia_web_path):
+ ganglia_web_path='/srv/www/htdocs/ganglia'
else:
rrd_py_path = '/var/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "apache"
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
new file mode 100644
index 0000000..a08fb31
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
@@ -0,0 +1,34 @@
+# 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.
+#
+
+Alias /ganglia "{{ganglia_web_path}}"
+
+<Directory "{{ganglia_web_path}}">
+# SSLRequireSSL
+ Options None
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+# Order deny,allow
+# Deny from all
+# Allow from 127.0.0.1
+# AuthName "Ganglia Access"
+# AuthType Basic
+# AuthUserFile /etc/ganglia/htpasswd.users
+# Require valid-user
+</Directory>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
index 0214753..89c750c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
@@ -41,3 +41,4 @@ RRD_ROOTDIR={{rrdcached_base_dir}}
GMETAD_USER={{gmetad_user}};
GMOND_USER={{gmond_user}};
WEBSERVER_GROUP={{webserver_group}};
+GANGLIA_WEB_PATH={{ganglia_web_path}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
index ed94bd3..7ca798a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
@@ -50,16 +50,11 @@
</components>
<osSpecifics>
<osSpecific>
- <osFamily>any</osFamily>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <name>python-rrdtool</name>
+ <name>python-rrdtool-1.4.5</name>
</package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
- <packages>
<package>
<name>libganglia-3.5.0-99</name>
</package>
@@ -73,9 +68,6 @@
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <name>python-rrdtool.x86_64</name>
- </package>
- <package>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
@@ -87,6 +79,9 @@
<osFamily>debian12</osFamily>
<packages>
<package>
+ <name>python-rrdtool</name>
+ </package>
+ <package>
<name>gmetad</name>
</package>
<package>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
index a24d045..b3c5009 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
@@ -62,13 +62,7 @@ then
fi
#Configure Ganglia Web to work with RRDCached
- GANGLIA_WEB_CONFIG_FILE=""
- if [ -f /etc/SuSE-release ]
- then
- GANGLIA_WEB_CONFIG_FILE=/srv/www/htdocs/ganglia/conf_default.php
- else
- GANGLIA_WEB_CONFIG_FILE=/var/www/html/ganglia/conf_default.php
- fi
+ GANGLIA_WEB_CONFIG_FILE=${GANGLIA_WEB_PATH}/conf_default.php
if [ -f $GANGLIA_WEB_CONFIG_FILE ]
then
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
index ad2094b..bda24d1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
@@ -57,6 +57,7 @@ class GangliaServer(Script):
def configure(self, env):
import params
+ env.set_params(params)
ganglia.groups_and_users()
ganglia.config()
@@ -78,12 +79,11 @@ class GangliaServer(Script):
def change_permission():
import params
- Directory('/var/lib/ganglia/dwoo',
- mode=0777,
- owner=params.gmetad_user,
+ Directory(params.dwoo_path,
+ mode=0755,
recursive=True
)
-
+ Execute(format("chown -R {web_user} {dwoo_path}"))
def server_files():
import params
@@ -107,8 +107,8 @@ def server_files():
recursive=True
)
- if System.get_instance().os_family == "debian":
- File( params.ganglia_debian_apache_conf_file,
+ if System.get_instance().os_family in ["debian","suse"]:
+ File( params.ganglia_apache_config_file,
content = Template("ganglia.conf.j2"),
mode = 0644
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index a4c3db1..f27eda8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
+import os
config = Script.get_config()
@@ -50,7 +51,6 @@ rrdcached_delay = default("/configurations/global/rrdcached_delay", 1800)
rrdcached_write_threads = default("/configurations/global/rrdcached_write_threads", 10)
ganglia_server_host = config["clusterHostInfo"]["ganglia_server_host"][0]
-ganglia_debian_apache_conf_file = "/etc/apache2/conf.d/ganglia.conf"
hostname = config["hostname"]
namenode_host = set(default("/clusterHostInfo/namenode_host", []))
@@ -133,9 +133,22 @@ if len(gmond_apps) > 0:
for x in ganglia_cluster_names[gmond_app]:
ganglia_clusters.append(x)
+ganglia_apache_config_file = "/etc/apache2/conf.d/ganglia.conf"
+ganglia_web_path="/var/www/html/ganglia"
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia-web/dwoo'
+ web_user = "wwwrun"
+ # for upgrade purposes as path to ganglia was changed
+ if not os.path.exists(ganglia_web_path):
+ ganglia_web_path='/srv/www/htdocs/ganglia'
+
elif System.get_instance().os_family == "redhat":
rrd_py_path = '/var/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "apache"
elif System.get_instance().os_family == "debian":
rrd_py_path = '/usr/lib/cgi-bin'
+ ganglia_web_path = '/usr/share/ganglia-webfrontend'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "www-data"
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
index ca6468e..a08fb31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
@@ -16,9 +16,9 @@
# under the License.
#
-Alias /ganglia "/usr/share/ganglia-webfrontend"
+Alias /ganglia "{{ganglia_web_path}}"
-<Directory "/usr/share/ganglia-webfrontend">
+<Directory "{{ganglia_web_path}}">
# SSLRequireSSL
Options None
AllowOverride None
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
index 3a14305..0b68623 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
@@ -43,3 +43,4 @@ GMETAD_USER={{gmetad_user}};
GMOND_USER={{gmond_user}};
WEBSERVER_GROUP={{webserver_group}};
MODULES_DIR={{modules_dir}}
+GANGLIA_WEB_PATH={{ganglia_web_path}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
index 494c3dc..63e3387 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
@@ -168,11 +168,11 @@ class TestGangliaServer(RMFTestCase):
'/bin',
'/usr/bin'],
)
- self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
- owner = 'nobody',
+ self.assertResourceCalled('Directory', '/var/lib/ganglia-web/dwoo',
recursive = True,
- mode = 0777,
+ mode = 0755,
)
+ self.assertResourceCalled('Execute', 'chown -R wwwrun /var/lib/ganglia-web/dwoo',)
self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
recursive = True,
)
@@ -187,6 +187,10 @@ class TestGangliaServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('File', '/etc/apache2/conf.d/ganglia.conf',
+ content = Template('ganglia.conf.j2'),
+ mode = 0644,
+ )
self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
owner = 'root',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index 6630cf2..3f79343 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -157,8 +157,9 @@
"proxyuser_group": "users",
"zk_user": "zookeeper",
"namenode_formatted_mark_dir": "/var/run/hadoop/hdfs/namenode/formatted/",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "syncLimit": "5",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "syncLimit": "5",
"oozie_pid_dir": "/var/run/oozie",
"hbase_regionserver_heapsize": "1024m",
"dtnode_heapsize": "1024m",
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index 7d4b758..8e0427b 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -201,8 +201,9 @@
"hadoop_heapsize": "1024",
"hbase_regionserver_primary_name": "hbase",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "keytab_path": "/etc/security/keytabs",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "keytab_path": "/etc/security/keytabs",
"hive_pid_dir": "/var/run/hive",
"webhcat_server": "c6402.ambari.apache.org",
"zk_data_dir": "/hadoop/zookeeper",
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
index a8ad60b..317635f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
@@ -158,11 +158,11 @@ class TestGangliaServer(RMFTestCase):
'/bin',
'/usr/bin'],
)
- self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
- owner = 'nobody',
+ self.assertResourceCalled('Directory', '/var/lib/ganglia-web/dwoo',
recursive = True,
- mode = 0777,
+ mode = 0755,
)
+ self.assertResourceCalled('Execute', 'chown -R wwwrun /var/lib/ganglia-web/dwoo',)
self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
recursive = True,
)
@@ -177,6 +177,10 @@ class TestGangliaServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('File', '/etc/apache2/conf.d/ganglia.conf',
+ content = Template('ganglia.conf.j2'),
+ mode = 0644,
+ )
self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
owner = 'root',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 7caa590..6c0121b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -218,7 +218,8 @@
"hbase_pid_dir": "/var/run/hbase",
"proxyuser_group": "users",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
"syncLimit": "5",
"storm_pid_dir": "/var/run/storm",
"oozie_pid_dir": "/var/run/oozie",
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b8eef1a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 34b521b..f9db528 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -268,8 +268,9 @@
"hadoop_heapsize": "1024",
"hbase_regionserver_primary_name": "hbase",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
"hive_pid_dir": "/var/run/hive",
"webhcat_server": "c6402.ambari.apache.org",
"zk_data_dir": "/hadoop/zookeeper",
[2/2] git commit: AMBARI-6257. Ganglia is not coming up on SUSE after
cluster install. (aonishuk)
Posted by ao...@apache.org.
AMBARI-6257. Ganglia is not coming up on SUSE after cluster install. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8957574d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8957574d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8957574d
Branch: refs/heads/branch-1.6.1
Commit: 8957574defac840c0a9e30f84975f3efbc6b6840
Parents: b9897df
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Jun 26 15:45:56 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Jun 26 15:45:56 2014 +0300
----------------------------------------------------------------------
.../HDP/1.3.2/services/GANGLIA/metainfo.xml | 6 ++--
.../GANGLIA/package/files/startRrdcached.sh | 8 +----
.../GANGLIA/package/scripts/ganglia_server.py | 13 ++++++--
.../services/GANGLIA/package/scripts/params.py | 10 ++++++
.../GANGLIA/package/templates/ganglia.conf.j2 | 34 ++++++++++++++++++++
.../GANGLIA/package/templates/gangliaEnv.sh.j2 | 1 +
.../HDP/2.0.6/services/GANGLIA/metainfo.xml | 15 +++------
.../GANGLIA/package/files/startRrdcached.sh | 8 +----
.../GANGLIA/package/scripts/ganglia_server.py | 12 +++----
.../services/GANGLIA/package/scripts/params.py | 15 ++++++++-
.../GANGLIA/package/templates/ganglia.conf.j2 | 4 +--
.../GANGLIA/package/templates/gangliaEnv.sh.j2 | 1 +
.../stacks/1.3.2/GANGLIA/test_ganglia_server.py | 10 ++++--
.../python/stacks/1.3.2/configs/default.json | 5 +--
.../python/stacks/1.3.2/configs/secured.json | 5 +--
.../stacks/2.0.6/GANGLIA/test_ganglia_server.py | 10 ++++--
.../python/stacks/2.0.6/configs/default.json | 3 +-
.../python/stacks/2.0.6/configs/secured.json | 5 +--
18 files changed, 113 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
index 3f97445..588708d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
@@ -53,6 +53,9 @@
<osFamily>any</osFamily>
<packages>
<package>
+ <name>python-rrdtool-1.4.5</name>
+ </package>
+ <package>
<name>libganglia-3.5.0-99</name>
</package>
<package>
@@ -65,9 +68,6 @@
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <name>python-rrdtool.x86_64</name>
- </package>
- <package>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
index 266d2f5..1ab1a2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
@@ -62,13 +62,7 @@ then
fi
#Configure Ganglia Web to work with RRDCached
- GANGLIA_WEB_CONFIG_FILE=""
- if [ -f /etc/SuSE-release ]
- then
- GANGLIA_WEB_CONFIG_FILE=/srv/www/htdocs/ganglia/conf_default.php
- else
- GANGLIA_WEB_CONFIG_FILE=/var/www/html/ganglia/conf_default.php
- fi
+ GANGLIA_WEB_CONFIG_FILE=${GANGLIA_WEB_PATH}/conf_default.php
if [ -f $GANGLIA_WEB_CONFIG_FILE ]
then
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
index 1096b14..3ee55ea 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
@@ -55,6 +55,7 @@ class GangliaServer(Script):
def configure(self, env):
import params
+ env.set_params(params)
ganglia.groups_and_users()
ganglia.config()
@@ -81,11 +82,11 @@ class GangliaServer(Script):
def change_permission():
import params
- Directory('/var/lib/ganglia/dwoo',
- mode=0777,
- owner=params.gmetad_user,
+ Directory(params.dwoo_path,
+ mode=0755,
recursive=True
)
+ Execute(format("chown -R {web_user} {dwoo_path}"))
def server_files():
@@ -110,6 +111,12 @@ def server_files():
recursive=True
)
+ if System.get_instance().os_family == "suse":
+ File( params.ganglia_apache_config_file,
+ content = Template("ganglia.conf.j2"),
+ mode = 0644
+ )
+
if __name__ == "__main__":
GangliaServer().execute()
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index 24c6a4b..5f421b2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
+import os
config = Script.get_config()
@@ -93,7 +94,16 @@ for key in ganglia_cluster_names:
ganglia_clusters.append(x)
+ganglia_apache_config_file = "/etc/apache2/conf.d/ganglia.conf"
+ganglia_web_path="/var/www/html/ganglia"
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia-web/dwoo'
+ web_user = "wwwrun"
+ # for upgrade purposes as path to ganglia was changed
+ if not os.path.exists(ganglia_web_path):
+ ganglia_web_path='/srv/www/htdocs/ganglia'
else:
rrd_py_path = '/var/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "apache"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
new file mode 100644
index 0000000..a08fb31
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/ganglia.conf.j2
@@ -0,0 +1,34 @@
+# 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.
+#
+
+Alias /ganglia "{{ganglia_web_path}}"
+
+<Directory "{{ganglia_web_path}}">
+# SSLRequireSSL
+ Options None
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+# Order deny,allow
+# Deny from all
+# Allow from 127.0.0.1
+# AuthName "Ganglia Access"
+# AuthType Basic
+# AuthUserFile /etc/ganglia/htpasswd.users
+# Require valid-user
+</Directory>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
index 0214753..89c750c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2
@@ -41,3 +41,4 @@ RRD_ROOTDIR={{rrdcached_base_dir}}
GMETAD_USER={{gmetad_user}};
GMOND_USER={{gmond_user}};
WEBSERVER_GROUP={{webserver_group}};
+GANGLIA_WEB_PATH={{ganglia_web_path}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
index ed94bd3..7ca798a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
@@ -50,16 +50,11 @@
</components>
<osSpecifics>
<osSpecific>
- <osFamily>any</osFamily>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <name>python-rrdtool</name>
+ <name>python-rrdtool-1.4.5</name>
</package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
- <packages>
<package>
<name>libganglia-3.5.0-99</name>
</package>
@@ -73,9 +68,6 @@
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <name>python-rrdtool.x86_64</name>
- </package>
- <package>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
@@ -87,6 +79,9 @@
<osFamily>debian12</osFamily>
<packages>
<package>
+ <name>python-rrdtool</name>
+ </package>
+ <package>
<name>gmetad</name>
</package>
<package>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
index a24d045..b3c5009 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
@@ -62,13 +62,7 @@ then
fi
#Configure Ganglia Web to work with RRDCached
- GANGLIA_WEB_CONFIG_FILE=""
- if [ -f /etc/SuSE-release ]
- then
- GANGLIA_WEB_CONFIG_FILE=/srv/www/htdocs/ganglia/conf_default.php
- else
- GANGLIA_WEB_CONFIG_FILE=/var/www/html/ganglia/conf_default.php
- fi
+ GANGLIA_WEB_CONFIG_FILE=${GANGLIA_WEB_PATH}/conf_default.php
if [ -f $GANGLIA_WEB_CONFIG_FILE ]
then
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
index ad2094b..bda24d1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
@@ -57,6 +57,7 @@ class GangliaServer(Script):
def configure(self, env):
import params
+ env.set_params(params)
ganglia.groups_and_users()
ganglia.config()
@@ -78,12 +79,11 @@ class GangliaServer(Script):
def change_permission():
import params
- Directory('/var/lib/ganglia/dwoo',
- mode=0777,
- owner=params.gmetad_user,
+ Directory(params.dwoo_path,
+ mode=0755,
recursive=True
)
-
+ Execute(format("chown -R {web_user} {dwoo_path}"))
def server_files():
import params
@@ -107,8 +107,8 @@ def server_files():
recursive=True
)
- if System.get_instance().os_family == "debian":
- File( params.ganglia_debian_apache_conf_file,
+ if System.get_instance().os_family in ["debian","suse"]:
+ File( params.ganglia_apache_config_file,
content = Template("ganglia.conf.j2"),
mode = 0644
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index a4c3db1..f27eda8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
+import os
config = Script.get_config()
@@ -50,7 +51,6 @@ rrdcached_delay = default("/configurations/global/rrdcached_delay", 1800)
rrdcached_write_threads = default("/configurations/global/rrdcached_write_threads", 10)
ganglia_server_host = config["clusterHostInfo"]["ganglia_server_host"][0]
-ganglia_debian_apache_conf_file = "/etc/apache2/conf.d/ganglia.conf"
hostname = config["hostname"]
namenode_host = set(default("/clusterHostInfo/namenode_host", []))
@@ -133,9 +133,22 @@ if len(gmond_apps) > 0:
for x in ganglia_cluster_names[gmond_app]:
ganglia_clusters.append(x)
+ganglia_apache_config_file = "/etc/apache2/conf.d/ganglia.conf"
+ganglia_web_path="/var/www/html/ganglia"
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia-web/dwoo'
+ web_user = "wwwrun"
+ # for upgrade purposes as path to ganglia was changed
+ if not os.path.exists(ganglia_web_path):
+ ganglia_web_path='/srv/www/htdocs/ganglia'
+
elif System.get_instance().os_family == "redhat":
rrd_py_path = '/var/www/cgi-bin'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "apache"
elif System.get_instance().os_family == "debian":
rrd_py_path = '/usr/lib/cgi-bin'
+ ganglia_web_path = '/usr/share/ganglia-webfrontend'
+ dwoo_path = '/var/lib/ganglia/dwoo'
+ web_user = "www-data"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
index ca6468e..a08fb31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/ganglia.conf.j2
@@ -16,9 +16,9 @@
# under the License.
#
-Alias /ganglia "/usr/share/ganglia-webfrontend"
+Alias /ganglia "{{ganglia_web_path}}"
-<Directory "/usr/share/ganglia-webfrontend">
+<Directory "{{ganglia_web_path}}">
# SSLRequireSSL
Options None
AllowOverride None
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
index 3a14305..0b68623 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2
@@ -43,3 +43,4 @@ GMETAD_USER={{gmetad_user}};
GMOND_USER={{gmond_user}};
WEBSERVER_GROUP={{webserver_group}};
MODULES_DIR={{modules_dir}}
+GANGLIA_WEB_PATH={{ganglia_web_path}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
index 494c3dc..63e3387 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
@@ -168,11 +168,11 @@ class TestGangliaServer(RMFTestCase):
'/bin',
'/usr/bin'],
)
- self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
- owner = 'nobody',
+ self.assertResourceCalled('Directory', '/var/lib/ganglia-web/dwoo',
recursive = True,
- mode = 0777,
+ mode = 0755,
)
+ self.assertResourceCalled('Execute', 'chown -R wwwrun /var/lib/ganglia-web/dwoo',)
self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
recursive = True,
)
@@ -187,6 +187,10 @@ class TestGangliaServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('File', '/etc/apache2/conf.d/ganglia.conf',
+ content = Template('ganglia.conf.j2'),
+ mode = 0644,
+ )
self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
owner = 'root',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index 6630cf2..3f79343 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -157,8 +157,9 @@
"proxyuser_group": "users",
"zk_user": "zookeeper",
"namenode_formatted_mark_dir": "/var/run/hadoop/hdfs/namenode/formatted/",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "syncLimit": "5",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "syncLimit": "5",
"oozie_pid_dir": "/var/run/oozie",
"hbase_regionserver_heapsize": "1024m",
"dtnode_heapsize": "1024m",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index 7d4b758..8e0427b 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -201,8 +201,9 @@
"hadoop_heapsize": "1024",
"hbase_regionserver_primary_name": "hbase",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "keytab_path": "/etc/security/keytabs",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "keytab_path": "/etc/security/keytabs",
"hive_pid_dir": "/var/run/hive",
"webhcat_server": "c6402.ambari.apache.org",
"zk_data_dir": "/hadoop/zookeeper",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
index a8ad60b..317635f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
@@ -158,11 +158,11 @@ class TestGangliaServer(RMFTestCase):
'/bin',
'/usr/bin'],
)
- self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
- owner = 'nobody',
+ self.assertResourceCalled('Directory', '/var/lib/ganglia-web/dwoo',
recursive = True,
- mode = 0777,
+ mode = 0755,
)
+ self.assertResourceCalled('Execute', 'chown -R wwwrun /var/lib/ganglia-web/dwoo',)
self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
recursive = True,
)
@@ -177,6 +177,10 @@ class TestGangliaServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('File', '/etc/apache2/conf.d/ganglia.conf',
+ content = Template('ganglia.conf.j2'),
+ mode = 0644,
+ )
self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
owner = 'root',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 7caa590..6c0121b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -218,7 +218,8 @@
"hbase_pid_dir": "/var/run/hbase",
"proxyuser_group": "users",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
"syncLimit": "5",
"storm_pid_dir": "/var/run/storm",
"oozie_pid_dir": "/var/run/oozie",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8957574d/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 34b521b..f9db528 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -268,8 +268,9 @@
"hadoop_heapsize": "1024",
"hbase_regionserver_primary_name": "hbase",
"zk_user": "zookeeper",
- "rrdcached_base_dir": "/var/lib/ganglia/rrds",
- "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
+ "rrdcached_base_dir": "/var/lib/ganglia/rrds",
+ "ganglia_web_path": "/var/www/html/ganglia",
+ "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
"hive_pid_dir": "/var/run/hive",
"webhcat_server": "c6402.ambari.apache.org",
"zk_data_dir": "/hadoop/zookeeper",