5c673d27f8
Resolves: rhbz#1147901 - Dropped imginfo-check patch (upstreamed) - De-fuzzified patches
299 lines
13 KiB
Diff
299 lines
13 KiB
Diff
diff --git a/doc/rrdtool.1 b/doc/rrdtool.1
|
||
index 0e9c3ca..10079cc 100644
|
||
--- a/doc/rrdtool.1
|
||
+++ b/doc/rrdtool.1
|
||
@@ -187,6 +187,10 @@ Operationally equivalent to \fBupdate\fR except for output. Check rrdupdate.
|
||
.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
|
||
@@ -202,13 +206,20 @@ uses fetch to retrieve its data from an \s-1RRD.\s0 Check rrdfetch.
|
||
.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
|
||
@@ -217,10 +228,6 @@ Export data retrieved from one or several RRDs. Check rrdxport.
|
||
.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 DOES RRDTOOL WORK\s0?"
|
||
.IX Subsection "HOW DOES RRDTOOL WORK?"
|
||
.IP "Data Acquisition" 8
|
||
diff --git a/doc/rrdtool.html b/doc/rrdtool.html
|
||
index 404b140..5c40029 100644
|
||
--- a/doc/rrdtool.html
|
||
+++ b/doc/rrdtool.html
|
||
@@ -59,6 +59,13 @@
|
||
<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">rrdgraph</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 id="dump"><b>dump</b></dt>
|
||
<dd>
|
||
|
||
@@ -83,19 +90,31 @@
|
||
<p>Alter setup of an RRD. Check <a href="./rrdtune.html">rrdtune</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 id="last"><b>last</b></dt>
|
||
<dd>
|
||
|
||
<p>Find the last update time of an RRD. Check <a href="./rrdlast.html">rrdlast</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 id="info"><b>info</b></dt>
|
||
<dd>
|
||
|
||
<p>Get information about an RRD. Check <a href="./rrdinfo.html">rrdinfo</a>.</p>
|
||
|
||
</dd>
|
||
-<dt id="rrdresize"><b>rrdresize</b></dt>
|
||
+<dt id="resize"><b>rrdresize</b></dt>
|
||
<dd>
|
||
|
||
<p>Change the size of individual RRAs. This is dangerous! Check <a href="./rrdresize.html">rrdresize</a>.</p>
|
||
@@ -113,12 +132,6 @@
|
||
<p>Flush the values for a specific RRD file from memory. Check <a href="./rrdflushcached.html">rrdflushcached</a>.</p>
|
||
|
||
</dd>
|
||
-<dt id="rrdcgi"><b>rrdcgi</b></dt>
|
||
-<dd>
|
||
-
|
||
-<p>This is a standalone tool for producing RRD graphs on the fly. Check <a href="./rrdcgi.html">rrdcgi</a>.</p>
|
||
-
|
||
-</dd>
|
||
</dl>
|
||
|
||
<h2 id="HOW-DOES-RRDTOOL-WORK">HOW DOES RRDTOOL WORK?</h2>
|
||
diff --git a/doc/rrdtool.pod b/doc/rrdtool.pod
|
||
index 14394cf..fc31478 100644
|
||
--- a/doc/rrdtool.pod
|
||
+++ b/doc/rrdtool.pod
|
||
@@ -58,6 +58,11 @@ Operationally equivalent to B<update> except for output. Check L<rrdupdate>.
|
||
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 RRD. Check L<rrdfetch>.
|
||
|
||
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 several RRDs. Check L<rrdxport>.
|
||
|
||
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 --git a/doc/rrdtool.txt b/doc/rrdtool.txt
|
||
index 1505291..e90d29b 100644
|
||
--- a/doc/rrdtool.txt
|
||
+++ b/doc/rrdtool.txt
|
||
@@ -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 --git a/doc/rrdupdate.1 b/doc/rrdupdate.1
|
||
index 85e19c8..6fb87b2 100644
|
||
--- a/doc/rrdupdate.1
|
||
+++ b/doc/rrdupdate.1
|
||
@@ -144,7 +144,7 @@ rrdupdate \- Store a new set of values into the RRD
|
||
.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...]\ ...]
|
||
@@ -191,7 +191,7 @@ Do not specify a value for a \s-1COMPUTE \s0\fB\s-1DST\s0\fR in the \fBupdate\fR
|
||
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
|
||
diff --git a/doc/rrdupdate.html b/doc/rrdupdate.html
|
||
index 4f88d02..b5161e3 100644
|
||
--- a/doc/rrdupdate.html
|
||
+++ b/doc/rrdupdate.html
|
||
@@ -17,7 +17,7 @@
|
||
|
||
<h1 id="SYNOPSIS">SYNOPSIS</h1>
|
||
|
||
-<p><b>rrdtool</b> {<b>update</b> | <b>updatev</b>} <i>filename</i> <span style="white-space: nowrap;">[<b>--template</b>|<b>-t</b> <i>ds-name</i>[<b>:</b><i>ds-name</i>]...]</span> <span style="white-space: nowrap;">[<b>--daemon</b> <i>address</i>]</span> [<b>--</b>] <span style="white-space: nowrap;"><b>N</b>|<i>timestamp</i><b>:</b><i>value</i>[<b>:</b><i>value</i>...]</span> <span style="white-space: nowrap;"><i>at-timestamp</i><b>@</b><i>value</i>[<b>:</b><i>value</i>...]</span> <span style="white-space: nowrap;">[<i>timestamp</i><b>:</b><i>value</i>[<b>:</b><i>value</i>...] ...]</span></p>
|
||
+<p><b>rrdtool</b> {<b>update</b> | <b>updatev</b>} <i>filename</i> <span style="white-space: nowrap;">[<b>--template</b>|<b>-t</b> <i>ds-name</i>[<b>:</b><i>ds-name</i>]...]</span> <span style="white-space: nowrap;">[<b>--daemon</b>|<b>-d</b> <i>address</i>]</span> [<b>--</b>] <span style="white-space: nowrap;"><b>N</b>|<i>timestamp</i><b>:</b><i>value</i>[<b>:</b><i>value</i>...]</span> <span style="white-space: nowrap;"><i>at-timestamp</i><b>@</b><i>value</i>[<b>:</b><i>value</i>...]</span> <span style="white-space: nowrap;">[<i>timestamp</i><b>:</b><i>value</i>[<b>:</b><i>value</i>...] ...]</span></p>
|
||
|
||
<h1 id="DESCRIPTION">DESCRIPTION</h1>
|
||
|
||
@@ -51,7 +51,7 @@
|
||
<p>Do not specify a value for a COMPUTE <b>DST</b> in the <b>update</b> function. If this is done accidentally (and this can only be done using the template switch), <b>RRDtool</b> will ignore the value specified for the COMPUTE <b>DST</b>.</p>
|
||
|
||
</dd>
|
||
-<dt id="daemon-address"><b>--daemon</b> <i>address</i></dt>
|
||
+<dt id="daemon-address"><b>--daemon</b>|<b>-d</b> <i>address</i></dt>
|
||
<dd>
|
||
|
||
<p>If given, <b>RRDTool</b> will try to connect to the caching daemon <a href="./rrdcached.html">rrdcached</a> at <i>address</i> and will fail if the connection cannot be established. If the connection is successfully established the values will be sent to the daemon instead of accessing the files directly.</p>
|
||
diff --git a/doc/rrdupdate.pod b/doc/rrdupdate.pod
|
||
index d09e5f0..ffdbdbc 100644
|
||
--- a/doc/rrdupdate.pod
|
||
+++ b/doc/rrdupdate.pod
|
||
@@ -6,7 +6,7 @@ rrdupdate - Store a new set of values into the RRD
|
||
|
||
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 (and this can only be done
|
||
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 --git a/doc/rrdupdate.txt b/doc/rrdupdate.txt
|
||
index 083c13f..dc66440 100644
|
||
--- a/doc/rrdupdate.txt
|
||
+++ b/doc/rrdupdate.txt
|
||
@@ -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
|