diff -N -c -r 3.0.4.orig/calendar.php 3.0.4.1/calendar.php
*** 3.0.4.orig/calendar.php Wed Dec 31 18:00:00 1969
--- 3.0.4.1/calendar.php Mon Mar 26 13:35:39 2007
***************
*** 0 ****
--- 1,41 ----
+
+ function isDisabled(date, y, m, d) {
+ var today = new Date();
+ return (today.getTime() - date.getTime()) < -1 * Date.DAY;
+ }
+ Calendar.setup({
+ inputField : "cs",
+ ifFormat : "%b %d %Y %H:%M",
+ showsTime : true,
+ step : 1,
+ weekNumbers : false,
+ dateStatusFunc : isDisabled
+ });
+
+
+ ';
+ $calendar_head = '
+
+
+
+
+
+ ';
+ ?>
diff -N -c -r 3.0.4.orig/cluster_view.php 3.0.4.1/cluster_view.php
*** 3.0.4.orig/cluster_view.php Mon Dec 25 04:02:38 2006
--- 3.0.4.1/cluster_view.php Mon Jul 16 10:52:51 2007
***************
*** 192,200 ****
$graphargs = (isset($reports[$metricname]) and
$reports[$metricname]) ?
"g=$metricname&" : "m=$metricname&";
! $graphargs .= "z=small&c=$cluster_url&h=$host_url"
."&l=$load_color&v=$val[VAL]&x=$max&n=$min"
."&r=$range&st=$cluster[LOCALTIME]";
}
}
--- 192,205 ----
$graphargs = (isset($reports[$metricname]) and
$reports[$metricname]) ?
"g=$metricname&" : "m=$metricname&";
! $graphadd = "z=small&c=$cluster_url&h=$host_url"
."&l=$load_color&v=$val[VAL]&x=$max&n=$min"
."&r=$range&st=$cluster[LOCALTIME]";
+ if ($cs)
+ $graphadd .= "&cs=$cs";
+ if ($ce)
+ $graphadd .= "&ce=$ce";
+ $graphargs .= $graphadd;
}
}
diff -N -c -r 3.0.4.orig/get_context.php 3.0.4.1/get_context.php
*** 3.0.4.orig/get_context.php Mon Dec 25 04:02:38 2006
--- 3.0.4.1/get_context.php Mon Jul 16 11:03:29 2007
***************
*** 34,39 ****
--- 34,44 ----
# A red vertical line for various events. Value specifies the event time.
$jobstart = isset($_GET["js"]) ?
escapeshellcmd($_GET["js"]) : NULL;
+ # custom start and end
+ $cs = isset($_GET["cs"]) ?
+ escapeshellcmd($_GET["cs"]) : NULL;
+ $ce = isset($_GET["ce"]) ?
+ escapeshellcmd($_GET["ce"]) : NULL;
# The direction we are travelling in the grid tree
$gridwalk = isset($_GET["gw"]) ?
escapeshellcmd($_GET["gw"]) : NULL;
***************
*** 109,114 ****
--- 114,121 ----
}
default: $start = -3600;
}
+ if ($cs or $ce)
+ $range = "custom";
if (!$metricname)
$metricname = "$default_metric";
diff -N -c -r 3.0.4.orig/graph.php 3.0.4.1/graph.php
*** 3.0.4.orig/graph.php Mon Dec 25 04:02:38 2006
--- 3.0.4.1/graph.php Mon Jul 16 11:57:36 2007
***************
*** 302,311 ****
if ($range=="month")
$end = floor($end / 672) * 672;
#
# Generate the rrdtool graph command.
#
! $command = RRDTOOL . " graph - --start $start --end $end ".
"--width $width --height $height $upper_limit $lower_limit ".
"--title '$title' $vertical_label $extras $background ".
$series;
--- 302,316 ----
if ($range=="month")
$end = floor($end / 672) * 672;
+ if ($cs)
+ $start = $cs;
+ if ($ce)
+ $end = $ce;
+
#
# Generate the rrdtool graph command.
#
! $command = RRDTOOL . " graph - --start '$start' --end '$end' ".
"--width $width --height $height $upper_limit $lower_limit ".
"--title '$title' $vertical_label $extras $background ".
$series;
diff -N -c -r 3.0.4.orig/header.php 3.0.4.1/header.php
*** 3.0.4.orig/header.php Mon Dec 25 04:02:38 2006
--- 3.0.4.1/header.php Mon Jul 16 11:44:30 2007
***************
*** 5,10 ****
--- 5,11 ----
include_once "auth.php";
checkcontrol();
checkprivate();
+ include_once "calendar.php";
# RFM - These definitions are here to eliminate "undefined variable"
# error maessages in ssl_error_log.
***************
*** 97,102 ****
--- 98,107 ----
$get_metric_string = "m=$metric&r=$range&s=$sort_url&hc=$hostcols";
if ($jobrange and $jobstart)
$get_metric_string .= "&jr=$jobrange&js=$jobstart";
+ if ($cs)
+ $get_metric_string .= "&cs=" . rawurlencode($cs);
+ if ($ce)
+ $get_metric_string .= "&ce=" . rawurlencode($ce);
# Set the Alternate view link.
$cluster_url=rawurlencode($clustername);
***************
*** 248,256 ****
$context_ranges[]="year";
if ($jobrange)
$context_ranges[]="job";
$range_menu = "Last "
! ."