diff --git a/doc/rrdfetch.html b/doc/rrdfetch.html
index afb8317fa064ed3349a31879030a53a81de4e817..392bdb2edb431805448115e5b1ca914184376931 100644 (file)
--- a/doc/rrdfetch.html
+++ b/doc/rrdfetch.html
<li><a href="#time_specification_examples">TIME SPECIFICATION EXAMPLES</a></li>
</ul>
+ <li><a href="#environment_variables">ENVIRONMENT VARIABLES</a></li>
<li><a href="#author">AUTHOR</a></li>
</ul>
<p><strong>rrdtool</strong> <strong>fetch</strong> <em>filename</em> <em>CF</em>
[<strong>--resolution</strong>|<strong>-r</strong> <em>resolution</em>]
[<strong>--start</strong>|<strong>-s</strong> <em>start</em>]
-[<strong>--end</strong>|<strong>-e</strong> <em>end</em>]</p>
+[<strong>--end</strong>|<strong>-e</strong> <em>end</em>]
+[<strong>--daemon</strong> <em>address</em>]</p>
<p>
</p>
<hr />
TIME SPECIFICATION section for a detailed explanation of how to
specify the end time.</p>
</dd>
+<dt><strong><a name="daemon_address" class="item"><strong>--daemon</strong> <em>address</em></a></strong></dt>
+
+<dd>
+<p>Address of the <a href="././rrdcached.html">the rrdcached manpage</a> daemon. If specified, a <code>flush</code> command is sent
+to the server before reading the RRD files. This allows <strong>rrdtool</strong> to return
+fresh data even if the daemon is configured to cache values for a long time.
+For a list of accepted formats, see the <strong>-l</strong> option in the <a href="././rrdcached.html">the rrdcached manpage</a> manual.</p>
+<pre>
+ rrdtool fetch --daemon unix:/var/run/rrdcached.sock /var/lib/rrd/foo.rrd AVERAGE</pre>
+</dd>
</dl>
<p>
</p>
@@ -177,11 +189,16 @@ full date in several numerical formats, including <strong>MM/DD/[YY]YY</strong>,
single-number date is interpreted as MMDD[YY]YY.</p>
<p><em>NOTE2</em>: if you specify the <em>day</em> in this way, the <em>time-of-day</em> is
REQUIRED as well.</p>
-<p>Finally, you can use the words <strong>now</strong>, <strong>start</strong>, or <strong>end</strong> as your time
+<p>Finally, you can use the words <strong>now</strong>, <strong>start</strong>, <strong>end</strong> or <strong>epoch</strong> as your time
reference. <strong>Now</strong> refers to the current moment (and is also the default
time reference). <strong>Start</strong> (<strong>end</strong>) can be used to specify a time
relative to the start (end) time for those tools that use these
-categories (<strong>rrdfetch</strong>, <a href="././rrdgraph.html">the rrdgraph manpage</a>).</p>
+categories (<strong>rrdfetch</strong>, <a href="././rrdgraph.html">the rrdgraph manpage</a>) and <strong>epoch</strong> indicates the
+*IX epoch (*IX timestamp 0 = 1970-01-01 00:00:00 UTC). <strong>epoch</strong> is
+useful to disambiguate between a timestamp value and some forms
+of abbreviated date/time specifications, because it allows to use
+time offset specifications using units, eg. <strong>epoch</strong>+19711205s unambiguously
+denotes timestamp 19711205 and not 1971-12-05 00:00:00 UTC.</p>
<p>Month and day of the week names can be used in their naturally
abbreviated form (e.g., Dec for December, Sun for Sunday, etc.). The
words <strong>now</strong>, <strong>start</strong>, <strong>end</strong> can be abbreviated as <strong>n</strong>, <strong>s</strong>, <strong>e</strong>.</p>
<p>
</p>
<hr />
+<h1><a name="environment_variables">ENVIRONMENT VARIABLES</a></h1>
+<p>The following environment variables may be used to change the behavior of
+<code>rrdtoolfetch</code>:</p>
+<dl>
+<dt><strong><a name="rrdcached_address" class="item"><strong>RRDCACHED_ADDRESS</strong></a></strong></dt>
+
+<dd>
+<p>If this environment variable is set it will have the same effect as specifying
+the <code>--daemon</code> option on the command line. If both are present, the command
+line argument takes precedence.</p>
+</dd>
+</dl>
+<p>
+</p>
+<hr />
<h1><a name="author">AUTHOR</a></h1>
<p>Tobias Oetiker <<a href="mailto:tobi@oetiker.ch">tobi@oetiker.ch</a>></p>