You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/06/17 19:39:04 UTC
git commit: AMBARI-6132 dashboard graphs not showing up (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk ae8a71f27 -> cb6562311
AMBARI-6132 dashboard graphs not showing up (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb656231
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb656231
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb656231
Branch: refs/heads/trunk
Commit: cb656231110a6a7718e31f357c623c89643b50b6
Parents: ae8a71f
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Tue Jun 17 20:38:58 2014 +0300
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Tue Jun 17 20:38:58 2014 +0300
----------------------------------------------------------------------
.../GANGLIA/package/files/startRrdcached.sh | 18 ++++++++++++++++++
.../GANGLIA/package/files/startRrdcached.sh | 19 +++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb656231/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 e44af17..7ae4b37 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
@@ -60,6 +60,24 @@ then
echo "Failed to start ${RRDCACHED_BIN}";
exit 1;
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
+
+ if [ -f $GANGLIA_WEB_CONFIG_FILE ]
+ then
+ sed -i "s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] = \"unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\";@" $GANGLIA_WEB_CONFIG_FILE
+ else
+ echo "${FILE} can't be found";
+ exit 1;
+ fi
+
else
echo "${RRDCACHED_BIN} already running with PID ${rrdcachedRunningPid}";
fi
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb656231/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 807c203..b7faddf 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
@@ -33,6 +33,7 @@ if [ -z "${rrdcachedRunningPid}" ]
then
su - ${GMETAD_USER} -c "${RRDCACHED_BIN} -p ${RRDCACHED_PID_FILE} \
-m 664 -l unix:${RRDCACHED_ALL_ACCESS_UNIX_SOCKET} \
+ -m 777 -P FLUSH,STATS,HELP -l unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET} \
-b ${RRDCACHED_BASE_DIR} -B -t ${RRDCACHED_WRITE_THREADS} \
-w ${RRDCACHED_TIMEOUT} -z ${RRDCACHED_DELAY} -F"
@@ -59,6 +60,24 @@ then
echo "Failed to start ${RRDCACHED_BIN}";
exit 1;
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
+
+ if [ -f $GANGLIA_WEB_CONFIG_FILE ]
+ then
+ sed -i "s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] = \"unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\";@" $GANGLIA_WEB_CONFIG_FILE
+ else
+ echo "${FILE} can't be found";
+ exit 1;
+ fi
+
else
echo "${RRDCACHED_BIN} already running with PID ${rrdcachedRunningPid}";
fi