Added support for the custom time range in the stacked graph module

Makefile

@@ -13,66 +13,148 @@ GWEB_STATEDIR = /var/lib/ganglia-web
 # Gmetad rootdir (parent location of rrd folder)
 GMETAD_ROOTDIR = /var/lib/ganglia
 
-APACHE_USER = www-data
+#APACHE_USER = www-data
+#APACHE_GROUP = www-data
 ##########################################################
 
+ifndef APACHE_USER
+$(info APACHE_USER is not set using www-data)
+APACHE_USER = www-data
+endif
+
+ifndef APACHE_GROUP
+$(info APACHE_GROUP is not set, using $(APACHE_USER))
+APACHE_GROUP = $(APACHE_USER)
+endif
+
 # Gweb version
 GWEB_VERSION = 3.7.2
 
 DIST_NAME = ganglia-web
 DIST_DIR = $(DIST_NAME)-$(GWEB_VERSION)
 DIST_TARBALL = $(DIST_DIR).tar.gz
 
-TARGETS = conf_default.php ganglia-web.spec version.php apache.conf
+# TARGETS: Files that needs to be patched with user chosen variables
+TARGETS = conf_default.php conf_redirect.php apache.conf
+
+# DIST_GZIP_TARGETS targets that needs to be patched once before dist-gzip
+# basicaly version and default values.
+DIST_GZIP_TARGETS = ganglia-web.spec version.php
 
 all: default
 
 default:	$(TARGETS)
 
 clean:
-	rm -rf $(TARGETS) $(DIST_DIR) $(DIST_TARBALL) rpmbuild
+	@echo -n "Cleaning build files ............................... "
+	@rm -rf $(TARGETS) $(DIST_DIR) $(DIST_TARBALL) rpmbuild
+	@echo "DONE."
 
 conf_default.php:	conf_default.php.in
-	sed -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
+	@echo -n "Generating conf_default.php ........................ "
+	@sed -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebdir@|$(GWEB_STATEDIR)|g" -e "s|@vargwebroot@|$(GDESTDIR)|g" conf_default.php.in > conf_default.php
+	@echo "DONE."
+
+conf_redirect.php:	conf_redirect.php.in
+	@echo -n "Generating conf_redirect.php ....................... "
+	@sed -e "s|@etcdir@|$(GCONFDIR)|" conf_redirect.php.in > conf_redirect.php
+	@echo "DONE."
 
 ganglia-web.spec:	ganglia-web.spec.in
-	sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ -e "s|@vargwebdir@|$(GWEB_STATEDIR)|" -e "s|@varapacheuser@|$(APACHE_USER)|g" -e "s|@etcdir@|$(GCONFDIR)|g" ganglia-web.spec.in > ganglia-web.spec
+	@echo -n "Generating ganglia-web.spec ........................ "
+	@sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ -e "s|@vargwebdir@|$(GWEB_STATEDIR)|" -e "s|@GDESTDIR@|$(GDESTDIR)|g" -e "s|@etcdir@|$(GCONFDIR)|g" ganglia-web.spec.in > ganglia-web.spec
+	@echo "DONE."
 
 version.php:	version.php.in
-	sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ version.php.in > version.php
+	@echo -n "Generating version.php ............................. "
+	@sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ version.php.in > version.php
+	@echo "DONE."
 
 apache.conf:	apache.conf.in
-	sed -e "s|@GDESTDIR@|$(GDESTDIR)|g" apache.conf.in > apache.conf
+	@echo -n "Generating apache.conf ............................. "
+	@sed -e "s|@GDESTDIR@|$(GDESTDIR)|g" apache.conf.in > apache.conf
+	@echo "DONE."
 
 dist-dir:	default
-	rsync --exclude "rpmbuild" --exclude "*.gz" --exclude "Makefile" --exclude "*debian*" --exclude "$(DIST_DIR)" --exclude ".git*" --exclude "*.in" --exclude "*~" --exclude "#*#" --exclude "ganglia-web.spec" --exclude "apache.conf" -a . $(DIST_DIR)
-
-install:	dist-dir
-	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/compiled && \
-	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/cache && \
-	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR) && \
-	rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GWEB_STATEDIR) && \
-	mkdir -p $(DESTDIR)/$(GDESTDIR) && \
-	rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR) && \
-	chown -R $(APACHE_USER):$(APACHE_USER) $(DESTDIR)/$(GWEB_STATEDIR)
-
-dist-gzip:	dist-dir
-	if [ -f $(DIST_TARBALL) ]; then \
-	rm -rf $(DIST_TARBALL) ;\
-	fi ;\
-	tar -czf $(DIST_TARBALL) $(DIST_DIR)/*
+	@echo -n "Filling dist dir ................................... "
+	@rsync	--exclude "rpmbuild" \
+		--exclude "debian/ganglia-webfrontend" \
+		--exclude "*.gz" \
+		--exclude "$(DIST_DIR)" \
+		--exclude ".git*" \
+		--exclude "version.php.in" \
+		--exclude "ganglia-web.spec.in" \
+		--exclude "apache.conf" \
+		--exclude "conf_default.php" \
+		--exclude "*~" \
+		--exclude "#*#" \
+		-a . $(DIST_DIR)
+	@echo "DONE."
+
+install:	install-files
+	@echo -n "Setting ownership to the sharedstattedir files ..... "
+	@chown -R $(APACHE_USER):$(APACHE_GROUP) $(DESTDIR)/$(GWEB_STATEDIR)
+	@echo "DONE."
+
+
+install-files:	dist-dir
+	@echo -n "Creating dwoo sharedstattedir tree ................. "
+	@mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/compiled
+	@mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/cache
+	@mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/filters
+	@echo "DONE."
+	@echo -n "Installing ganglia-webfrontend low level conf ...... "
+	@rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GWEB_STATEDIR)
+	@echo "DONE."
+	@echo -n "Installing php files ............................... "
+	@mkdir -p $(DESTDIR)/$(GDESTDIR)
+	@rsync 	--exclude "conf" \
+		--exclude conf_redirect.php \
+		--exclude "*.in" \
+		--exclude "*.spec" \
+		-a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR)
+	@echo "DONE."
+	@echo -n "Intalling redirect conf.php ........................ "
+	@# so it can be seen as a config file under debian packages.
+	@# Do the same for all distro to avoid specific case for debian.
+	@cp -f conf_redirect.php $(DESTDIR)/$(GDESTDIR)/conf.php
+	@echo "DONE."
+	@echo -n "Installing the generated conf_default.php file ..... "
+	@cp -f conf_default.php $(DESTDIR)/$(GDESTDIR)/conf_default.php
+	@echo "DONE."
+	@echo -n "Creating the etc/ganglia-webfrontend directory ..... "
+	@mkdir -p $(DESTDIR)/$(GCONFDIR)
+	@echo "DONE."
+	@echo -n "Installing apache.conf ............................. "
+	@cp -f apache.conf $(DESTDIR)/$(GCONFDIR)/
+	@echo "DONE."
+	@echo -n "Installing the editable copy of conf_default.php ... "
+	@cp -f conf_default.php $(DESTDIR)/$(GCONFDIR)/conf.php
+	@echo "DONE."
+
+dist-gzip:	dist-dir $(DIST_GZIP_TARGETS)
+	@echo -n "Creating tarball ................................... "
+	@if [ -f $(DIST_TARBALL) ]; then \
+		rm -rf $(DIST_TARBALL) ;\
+	fi
+	@cp -pf $(DIST_GZIP_TARGETS) $(DIST_DIR)
+	@tar -czf $(DIST_TARBALL) $(DIST_DIR)/*
+	@echo "DONE."
 
 rpm: dist-gzip ganglia-web.spec apache.conf
-	rm -rf rpmbuild
-	mkdir rpmbuild
-	mkdir rpmbuild/SOURCES 
-	mkdir rpmbuild/BUILD 
-	mkdir rpmbuild/RPMS 
-	mkdir rpmbuild/SRPMS
-	cp $(DIST_TARBALL) rpmbuild/SOURCES
-	cp apache.conf rpmbuild/SOURCES
-	rpmbuild --define '_topdir $(PWD)/rpmbuild' --define 'custom_web_prefixdir $(GDESTDIR)' -bb ganglia-web.spec
+	@echo -n "Creating binary rpm ................................ "
+	@rm -rf rpmbuild
+	@mkdir rpmbuild
+	@mkdir rpmbuild/SOURCES 
+	@mkdir rpmbuild/BUILD 
+	@mkdir rpmbuild/RPMS 
+	@mkdir rpmbuild/SRPMS
+	@ln -s ../../$(DIST_TARBALL) rpmbuild/SOURCES/$(DIST_TARBALL)
+	@rpmbuild --define '_topdir $(PWD)/rpmbuild' --define 'web_prefixdir $(GDESTDIR)' -bb ganglia-web.spec
+	@echo "DONE."
 
 uninstall:
+	@echo -n "Uninstalling ganglia-web. (conf files untouched) ... "
 	rm -rf $(DESTDIR)/$(GDESTDIR)  $(DESTDIR)/$(GWEB_STATEDIR)
+	@echo "DONE."
 

aggregate_graphs.php

@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
   function refreshAggregateGraph() {
     $("#aggregate_graph_display img").each(function (index) {
 	var src = $(this).attr("src");
@@ -10,7 +10,7 @@ function refreshAggregateGraph() {
   }
 
   function createAggregateGraph() {
-    if ($('#hreg').val() == "" || $('#metric_chooser').val() == "") {
+    if ($('#hreg').val() == "" || $('#aggregate_graph_metric_chooser').val() == "") {
       alert("Host regular expression and metric name can't be blank");
       return false;
     }
@@ -95,6 +95,8 @@ function restoreAggregateGraph() {
     var hreg = $.cookie("ganglia-aggregate-graph-hreg" + window.name);
     if (hreg != null)
       $("#hreg").val(hreg);
+    else
+      $("#hreg").val(".*");
 
     var gtype = $.cookie("ganglia-aggregate-graph-gtype" + window.name);
     if (gtype != null) {
@@ -112,9 +114,18 @@ function restoreAggregateGraph() {
 	$("#glhide").click();
     }
 
-    var metric = $.cookie("ganglia-aggregate-graph-metric" + window.name);
-    if (metric != null)
-      $("#metric_chooser").val(metric);
+    var mreg = $.cookie("ganglia-aggregate-graph-metric" + window.name);
+    if (mreg != null) {
+      var metric_chooser = $("#aggregate_graph_metric_chooser");
+      var metrics = mreg.split("_|_");
+      // Ensure that all selected options are included in the list
+      for (var i = 0; i < metrics.length; i++) {
+        if (metric_chooser.find("option[value='" + metrics[i] + "']").length == 0) {
+	  metric_chooser.append($("<option></option>").attr("value", metrics[i]).text(metrics[i]));
+	}
+      }
+      metric_chooser.val(metrics).trigger("chosen:updated");
+    }
 
     var title = $.cookie("ganglia-aggregate-graph-title" + window.name);
     if (title != null)
@@ -132,24 +143,31 @@ function restoreAggregateGraph() {
     if (lower != null)
       $("#n").val(lower);
 
-    if (hreg != null && metric != null)
+    if (mreg != null)
       return true;
     else
       return false;
   }
 
-  $( "#metric_chooser" ).autocomplete({
-      source: availablemetrics,
-      change: function(event, ui) {
-	$.cookie("ganglia-aggregate-graph-metric" + window.name,
-	         $("#metric_chooser").val());
-      }
+  $( "#aggregate_graph_metric_chooser" ).chosen({
+    create_option: true,
+    skip_no_results: true,
+    search_contains: true,	
+    no_results_text: "No metrics matched",
+    placeholder_text_multiple: "Select and/or define metrics to be plotted",
+    create_option_text: "Add metric regular expression"
+  }).
+  on('change', function(event, params) {
+    if (event.target == this) {
+      $.cookie("ganglia-aggregate-graph-metric" + window.name,
+	       $(this).val().join("_|_"));
+    }
   });
 
   if (restoreAggregateGraph())
     createAggregateGraph();
 });
-</script>
+</script type="text/javascript">
 <div id="aggregate_graph_header">
 <h2>Create aggregate graphs</h2>
 <form id="aggregate_graph_form">
@@ -169,8 +187,22 @@ function restoreAggregateGraph() {
 <td>Host Regular expression e.g. web-[0,4], web or (web|db):</td>
 <td colspan=2><input name="hreg[]" id="hreg" size=60></td>
 </tr>
-<tr><td>Metric Regular expression (not a report e.g. load_one, bytes_(in|out)):</td>
-<td colspan=2><input name="mreg[]" id="metric_chooser" size=60></td>
+<tr><td>Metric Regular expression(s):</td>
+<td colspan=2><select name="mreg[]" id="aggregate_graph_metric_chooser" multiple style="width:100%;">
+<?php
+  require_once('./eval_conf.php');
+  require_once('./functions.php');
+
+  $available_metrics = array();
+  retrieve_metrics_cache("metric_list");
+
+  asort($index_array['metrics']);
+  foreach ($index_array['metrics'] as $key => $value) {
+    print "<option value='" . $value . "'>" . $value . "</option>";
+  }
+  unset($available_metrics);
+?>
+</select></td>
 </tr>
 <tr>
 <td>Graph Type:</td><td>