287 lines
13 KiB
Diff
287 lines
13 KiB
Diff
|
diff -up rrdtool-1.4.8/doc/rrdtool.html.orig4 rrdtool-1.4.8/doc/rrdtool.html
|
|||
|
--- rrdtool-1.4.8/doc/rrdtool.html.orig4 2013-05-23 09:55:51.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdtool.html 2013-07-01 10:51:11.150276130 +0200
|
|||
|
@@ -105,6 +105,12 @@ PHP, etc.</p>
|
|||
|
<p>Create a graph from data stored in one or several RRDs. Apart from
|
|||
|
generating graphs, data can also be extracted to stdout. Check <a href="././rrdgraph.html">the rrdgraph manpage</a>.</p>
|
|||
|
</dd>
|
|||
|
+<dt><strong><a name="graphv" class="item"><strong>graphv</strong></a></strong></dt>
|
|||
|
+
|
|||
|
+<dd>
|
|||
|
+<p>Create a graph from data stored in one or several RRDs. Same as graph, but
|
|||
|
+metadata are printed before the graph. Check <a href="././rrdgraph.html">the rrdgraph manpage</a>.</p>
|
|||
|
+</dd>
|
|||
|
<dt><strong><a name="dump" class="item"><strong>dump</strong></a></strong></dt>
|
|||
|
|
|||
|
<dd>
|
|||
|
@@ -128,17 +134,28 @@ uses fetch to retrieve its data from an
|
|||
|
<dd>
|
|||
|
<p>Alter setup of an RRD. Check <a href="././rrdtune.html">the rrdtune manpage</a>.</p>
|
|||
|
</dd>
|
|||
|
+<dt><strong><a name="first" class="item"><strong>first</strong></a></strong></dt>
|
|||
|
+
|
|||
|
+<dd>
|
|||
|
+<p>Find the first update time of an RRD. Check <a href="././rrdfirst.html">the rrdfirst manpage</a>.</p>
|
|||
|
+</dd>
|
|||
|
<dt><strong><a name="last" class="item"><strong>last</strong></a></strong></dt>
|
|||
|
|
|||
|
<dd>
|
|||
|
<p>Find the last update time of an RRD. Check <a href="././rrdlast.html">the rrdlast manpage</a>.</p>
|
|||
|
</dd>
|
|||
|
+<dt><strong><a name="lastupdate" class="item"><strong>lastupdate</strong></a></strong></dt>
|
|||
|
+
|
|||
|
+<dd>
|
|||
|
+<p>Find the last update time of an RRD. It also returns the value stored for each
|
|||
|
+datum in the most recent update. Check <a href="././rrdlastupdate.html">the rrdlastupdate manpage</a>.</p>
|
|||
|
+</dd>
|
|||
|
<dt><strong><a name="info" class="item"><strong>info</strong></a></strong></dt>
|
|||
|
|
|||
|
<dd>
|
|||
|
<p>Get information about an RRD. Check <a href="././rrdinfo.html">the rrdinfo manpage</a>.</p>
|
|||
|
</dd>
|
|||
|
-<dt><strong><a name="rrdresize" class="item"><strong>rrdresize</strong></a></strong></dt>
|
|||
|
+<dt><strong><a name="resize" class="item"><strong>resize</strong></a></strong></dt>
|
|||
|
|
|||
|
<dd>
|
|||
|
<p>Change the size of individual RRAs. This is dangerous! Check <a href="././rrdresize.html">the rrdresize manpage</a>.</p>
|
|||
|
@@ -153,12 +170,6 @@ uses fetch to retrieve its data from an
|
|||
|
<dd>
|
|||
|
<p>Flush the values for a specific RRD file from memory. Check <a href="././rrdflushcached.html">the rrdflushcached manpage</a>.</p>
|
|||
|
</dd>
|
|||
|
-<dt><strong><a name="rrdcgi" class="item"><strong>rrdcgi</strong></a></strong></dt>
|
|||
|
-
|
|||
|
-<dd>
|
|||
|
-<p>This is a standalone tool for producing RRD graphs on the fly. Check
|
|||
|
-<a href="././rrdcgi.html">the rrdcgi manpage</a>.</p>
|
|||
|
-</dd>
|
|||
|
</dl>
|
|||
|
<p>
|
|||
|
</p>
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdtool.pod.orig4 rrdtool-1.4.8/doc/rrdtool.pod
|
|||
|
--- rrdtool-1.4.8/doc/rrdtool.pod.orig4 2013-05-23 09:55:07.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdtool.pod 2013-07-01 10:53:44.366207403 +0200
|
|||
|
@@ -58,6 +58,11 @@ Operationally equivalent to B<update> ex
|
|||
|
Create a graph from data stored in one or several RRDs. Apart from
|
|||
|
generating graphs, data can also be extracted to stdout. Check L<rrdgraph>.
|
|||
|
|
|||
|
+=item B<graphv>
|
|||
|
+
|
|||
|
+Create a graph from data stored in one or several RRDs. Same as graph, but
|
|||
|
+metadata are printed before the graph. Check L<rrdgraph>.
|
|||
|
+
|
|||
|
=item B<dump>
|
|||
|
|
|||
|
Dump the contents of an RRD in plain ASCII. In connection with restore
|
|||
|
@@ -77,15 +82,24 @@ uses fetch to retrieve its data from an
|
|||
|
|
|||
|
Alter setup of an RRD. Check L<rrdtune>.
|
|||
|
|
|||
|
+=item B<first>
|
|||
|
+
|
|||
|
+Find the first update time of an RRD. Check L<rrdfirst>.
|
|||
|
+
|
|||
|
=item B<last>
|
|||
|
|
|||
|
Find the last update time of an RRD. Check L<rrdlast>.
|
|||
|
|
|||
|
+=item B<lastupdate>
|
|||
|
+
|
|||
|
+Find the last update time of an RRD. It also returns the value stored
|
|||
|
+for each datum in the most recent update. Check L<rrdlastupdate>.
|
|||
|
+
|
|||
|
=item B<info>
|
|||
|
|
|||
|
Get information about an RRD. Check L<rrdinfo>.
|
|||
|
|
|||
|
-=item B<rrdresize>
|
|||
|
+=item B<resize>
|
|||
|
|
|||
|
Change the size of individual RRAs. This is dangerous! Check L<rrdresize>.
|
|||
|
|
|||
|
@@ -97,11 +111,6 @@ Export data retrieved from one or severa
|
|||
|
|
|||
|
Flush the values for a specific RRD file from memory. Check L<rrdflushcached>.
|
|||
|
|
|||
|
-=item B<rrdcgi>
|
|||
|
-
|
|||
|
-This is a standalone tool for producing RRD graphs on the fly. Check
|
|||
|
-L<rrdcgi>.
|
|||
|
-
|
|||
|
=back
|
|||
|
|
|||
|
=head2 HOW DOES RRDTOOL WORK?
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdtool.txt.orig4 rrdtool-1.4.8/doc/rrdtool.txt
|
|||
|
--- rrdtool-1.4.8/doc/rrdtool.txt.orig4 2013-05-23 09:55:56.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdtool.txt 2013-07-01 10:59:33.167060537 +0200
|
|||
|
@@ -48,6 +48,10 @@ DDEESSCCRRIIPPTTIIOONN
|
|||
|
from generating graphs, data can also be extracted to stdout.
|
|||
|
Check rrdgraph.
|
|||
|
|
|||
|
+ ggrraapphhvv Create a graph from data stored in one or several RRDs. Same as graph, but
|
|||
|
+ metadata are printed before the graph..
|
|||
|
+ Check rrdgraph.
|
|||
|
+
|
|||
|
dduummpp Dump the contents of an RRD in plain ASCII. In connection with
|
|||
|
restore you can use this to move an RRD from one computer
|
|||
|
architecture to another. Check rrddump.
|
|||
|
@@ -60,11 +64,17 @@ DDEESSCCRRIIPPTTIIOONN
|
|||
|
|
|||
|
ttuunnee Alter setup of an RRD. Check rrdtune.
|
|||
|
|
|||
|
+ ffiirrsstt Find the first update time of an RRD. Check rrdfirst.
|
|||
|
+
|
|||
|
llaasstt Find the last update time of an RRD. Check rrdlast.
|
|||
|
|
|||
|
+ llaassttuuppddaattee Find the last update time of an RRD.
|
|||
|
+ It also returns the value stored for each datum in the most recent update.
|
|||
|
+ Check rrdlastupdate.
|
|||
|
+
|
|||
|
iinnffoo Get information about an RRD. Check rrdinfo.
|
|||
|
|
|||
|
- rrrrddrreessiizzee
|
|||
|
+ rreessiizzee
|
|||
|
Change the size of individual RRAs. This is dangerous! Check
|
|||
|
rrdresize.
|
|||
|
|
|||
|
@@ -74,9 +84,6 @@ DDEESSCCRRIIPPTTIIOONN
|
|||
|
Flush the values for a specific RRD file from memory. Check
|
|||
|
rrdflushcached.
|
|||
|
|
|||
|
- rrrrddccggii This is a standalone tool for producing RRD graphs on the fly.
|
|||
|
- Check rrdcgi.
|
|||
|
-
|
|||
|
HHOOWW DDOOEESS RRRRDDTTOOOOLL WWOORRKK??
|
|||
|
Data Acquisition
|
|||
|
When monitoring the state of a system, it is convenient to have
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdtool.1.orig4 rrdtool-1.4.8/doc/rrdtool.1
|
|||
|
--- rrdtool-1.4.8/doc/rrdtool.1.orig4 2013-05-23 09:55:53.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdtool.1 2013-07-01 10:51:26.645269268 +0200
|
|||
|
@@ -178,6 +178,10 @@ Operationally equivalent to \fBupdate\fR
|
|||
|
.IX Item "graph"
|
|||
|
Create a graph from data stored in one or several RRDs. Apart from
|
|||
|
generating graphs, data can also be extracted to stdout. Check rrdgraph.
|
|||
|
+.IP "\fBgraphv\fR" 8
|
|||
|
+.IX Item "graphv"
|
|||
|
+Create a graph from data stored in one or several RRDs. Same as graph, but
|
|||
|
+metadata are printed before the graph. Check rrdgraph.
|
|||
|
.IP "\fBdump\fR" 8
|
|||
|
.IX Item "dump"
|
|||
|
Dump the contents of an \s-1RRD\s0 in plain \s-1ASCII\s0. In connection with restore
|
|||
|
@@ -193,13 +197,20 @@ uses fetch to retrieve its data from an
|
|||
|
.IP "\fBtune\fR" 8
|
|||
|
.IX Item "tune"
|
|||
|
Alter setup of an \s-1RRD\s0. Check rrdtune.
|
|||
|
+.IP "\fBfirst\fR" 8
|
|||
|
+.IX Item "first"
|
|||
|
+Find the first update time of an \s-1RRD\s0. Check rrdfirst.
|
|||
|
.IP "\fBlast\fR" 8
|
|||
|
.IX Item "last"
|
|||
|
Find the last update time of an \s-1RRD\s0. Check rrdlast.
|
|||
|
+.IP "\fBlastupdate\fR" 8
|
|||
|
+.IX Item "lastupdate"
|
|||
|
+Find the last update time of an \s-1RRD\s0. It also returns the value stored for each
|
|||
|
+datum in the most recent update. Check rrdlastupdate.
|
|||
|
.IP "\fBinfo\fR" 8
|
|||
|
.IX Item "info"
|
|||
|
Get information about an \s-1RRD\s0. Check rrdinfo.
|
|||
|
-.IP "\fBrrdresize\fR" 8
|
|||
|
+.IP "\fBresize\fR" 8
|
|||
|
.IX Item "rrdresize"
|
|||
|
Change the size of individual RRAs. This is dangerous! Check rrdresize.
|
|||
|
.IP "\fBxport\fR" 8
|
|||
|
@@ -208,10 +219,6 @@ Export data retrieved from one or severa
|
|||
|
.IP "\fBflushcached\fR" 8
|
|||
|
.IX Item "flushcached"
|
|||
|
Flush the values for a specific \s-1RRD\s0 file from memory. Check rrdflushcached.
|
|||
|
-.IP "\fBrrdcgi\fR" 8
|
|||
|
-.IX Item "rrdcgi"
|
|||
|
-This is a standalone tool for producing \s-1RRD\s0 graphs on the fly. Check
|
|||
|
-rrdcgi.
|
|||
|
.SS "\s-1HOW\s0 \s-1DOES\s0 \s-1RRDTOOL\s0 \s-1WORK\s0?"
|
|||
|
.IX Subsection "HOW DOES RRDTOOL WORK?"
|
|||
|
.IP "Data Acquisition" 8
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdupdate.html.orig4 rrdtool-1.4.8/doc/rrdupdate.html
|
|||
|
--- rrdtool-1.4.8/doc/rrdupdate.html.orig4 2013-05-23 09:55:50.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdupdate.html 2013-07-01 11:01:44.550003526 +0200
|
|||
|
@@ -41,7 +41,7 @@
|
|||
|
<h1><a name="synopsis">SYNOPSIS</a></h1>
|
|||
|
<p><strong>rrdtool</strong> {<strong>update</strong> | <strong>updatev</strong>} <em>filename</em>
|
|||
|
[<strong>--template</strong>|<strong>-t</strong> <em>ds-name</em>[<strong>:</strong><em>ds-name</em>]...]
|
|||
|
-[<strong>--daemon</strong> <em>address</em>] [<strong>--</strong>]
|
|||
|
+[<strong>--daemon</strong>|<strong>-d</strong> <em>address</em>] [<strong>--</strong>]
|
|||
|
<strong>N</strong>|<em>timestamp</em><strong>:</strong><em>value</em>[<strong>:</strong><em>value</em>...]
|
|||
|
<em>at-timestamp</em><strong>@</strong><em>value</em>[<strong>:</strong><em>value</em>...]
|
|||
|
[<em>timestamp</em><strong>:</strong><em>value</em>[<strong>:</strong><em>value</em>...] ...]</p>
|
|||
|
@@ -93,7 +93,7 @@ function. If this is done accidentally (
|
|||
|
using the template switch), <strong>RRDtool</strong> will ignore the value specified
|
|||
|
for the COMPUTE <strong>DST</strong>.</p>
|
|||
|
</dd>
|
|||
|
-<dt><strong><a name="daemon_address" class="item"><strong>--daemon</strong> <em>address</em></a></strong></dt>
|
|||
|
+<dt><strong><a name="daemon_address" class="item"><strong>--daemon</strong>|<strong>-d</strong> <em>address</em></a></strong></dt>
|
|||
|
|
|||
|
<dd>
|
|||
|
<p>If given, <strong>RRDTool</strong> will try to connect to the caching daemon <a href="././rrdcached.html">the rrdcached manpage</a>
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdupdate.pod.orig4 rrdtool-1.4.8/doc/rrdupdate.pod
|
|||
|
--- rrdtool-1.4.8/doc/rrdupdate.pod.orig4 2013-05-23 09:55:07.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdupdate.pod 2013-07-01 11:03:03.399968652 +0200
|
|||
|
@@ -6,7 +6,7 @@ rrdupdate - Store a new set of values in
|
|||
|
|
|||
|
B<rrdtool> {B<update> | B<updatev>} I<filename>
|
|||
|
S<[B<--template>|B<-t> I<ds-name>[B<:>I<ds-name>]...]>
|
|||
|
-S<[B<--daemon> I<address>]> [B<-->]
|
|||
|
+S<[B<--daemon>|B<-d> I<address>]> [B<-->]
|
|||
|
S<B<N>|I<timestamp>B<:>I<value>[B<:>I<value>...]>
|
|||
|
S<I<at-timestamp>B<@>I<value>[B<:>I<value>...]>
|
|||
|
S<[I<timestamp>B<:>I<value>[B<:>I<value>...] ...]>
|
|||
|
@@ -60,7 +60,7 @@ function. If this is done accidentally (
|
|||
|
using the template switch), B<RRDtool> will ignore the value specified
|
|||
|
for the COMPUTE B<DST>.
|
|||
|
|
|||
|
-=item B<--daemon> I<address>
|
|||
|
+=item B<--daemon>|B<-d> I<address>
|
|||
|
|
|||
|
If given, B<RRDTool> will try to connect to the caching daemon L<rrdcached>
|
|||
|
at I<address> and will fail if the connection cannot be established. If the
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdupdate.txt.orig4 rrdtool-1.4.8/doc/rrdupdate.txt
|
|||
|
--- rrdtool-1.4.8/doc/rrdupdate.txt.orig4 2013-05-23 09:55:55.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdupdate.txt 2013-07-01 11:05:34.620978121 +0200
|
|||
|
@@ -7,7 +7,7 @@ NNAAMMEE
|
|||
|
|
|||
|
SSYYNNOOPPSSIISS
|
|||
|
rrrrddttooooll {uuppddaattee | uuppddaatteevv} _f_i_l_e_n_a_m_e [----tteemmppllaattee|--tt _d_s_-_n_a_m_e[::_d_s_-
|
|||
|
- _n_a_m_e]...] [----ddaaeemmoonn _a_d_d_r_e_s_s] [----] NN|_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] _a_t_-
|
|||
|
+ _n_a_m_e]...] [----ddaaeemmoonn|--dd _a_d_d_r_e_s_s] [----] NN|_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] _a_t_-
|
|||
|
_t_i_m_e_s_t_a_m_p@@_v_a_l_u_e[::_v_a_l_u_e...] [_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] ...]
|
|||
|
|
|||
|
DDEESSCCRRIIPPTTIIOONN
|
|||
|
@@ -54,7 +54,7 @@ DDEESSCCRRIIPPTTIIOONN
|
|||
|
done using the template switch), RRRRDDttooooll will ignore the value
|
|||
|
specified for the COMPUTE DDSSTT.
|
|||
|
|
|||
|
- ----ddaaeemmoonn _a_d_d_r_e_s_s
|
|||
|
+ ----ddaaeemmoonn|--dd _a_d_d_r_e_s_s
|
|||
|
If given, RRRRDDTTooooll will try to connect to the caching daemon
|
|||
|
rrdcached at _a_d_d_r_e_s_s and will fail if the connection cannot be
|
|||
|
established. If the connection is successfully established the
|
|||
|
diff -up rrdtool-1.4.8/doc/rrdupdate.1.orig4 rrdtool-1.4.8/doc/rrdupdate.1
|
|||
|
--- rrdtool-1.4.8/doc/rrdupdate.1.orig4 2013-05-23 09:55:52.000000000 +0200
|
|||
|
+++ rrdtool-1.4.8/doc/rrdupdate.1 2013-07-01 10:43:39.179478104 +0200
|
|||
|
@@ -135,7 +135,7 @@ rrdupdate \- Store a new set of values i
|
|||
|
.IX Header "SYNOPSIS"
|
|||
|
\&\fBrrdtool\fR {\fBupdate\fR | \fBupdatev\fR} \fIfilename\fR
|
|||
|
[\fB\-\-template\fR|\fB\-t\fR\ \fIds-name\fR[\fB:\fR\fIds-name\fR]...]
|
|||
|
-[\fB\-\-daemon\fR\ \fIaddress\fR] [\fB\-\-\fR]
|
|||
|
+[\fB\-\-daemon\fR|\fB\-d\fR\ \fIaddress\fR] [\fB\-\-\fR]
|
|||
|
\&\fBN\fR|\fItimestamp\fR\fB:\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...]
|
|||
|
\&\fIat-timestamp\fR\fB@\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...]
|
|||
|
[\fItimestamp\fR\fB:\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...]\ ...]
|
|||
|
@@ -182,7 +182,7 @@ Do not specify a value for a \s-1COMPUTE
|
|||
|
function. If this is done accidentally (and this can only be done
|
|||
|
using the template switch), \fBRRDtool\fR will ignore the value specified
|
|||
|
for the \s-1COMPUTE\s0 \fB\s-1DST\s0\fR.
|
|||
|
-.IP "\fB\-\-daemon\fR \fIaddress\fR" 8
|
|||
|
+.IP "\fB\-\-daemon\fR|\fB\-d\fR \fIaddress\fR" 8
|
|||
|
.IX Item "--daemon address"
|
|||
|
If given, \fBRRDTool\fR will try to connect to the caching daemon rrdcached
|
|||
|
at \fIaddress\fR and will fail if the connection cannot be established. If the
|