Prechádzať zdrojové kódy

AMBARI-6132 dashboard graphs not showing up (dsen)

Dmitry Sen 11 rokov pred
rodič
commit
cb65623111

+ 18 - 0
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

+ 19 - 0
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