X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=doc%2Frrdxport.pod;h=bf9fd529bde53da81173fabf4e007caa34f77abd;hb=d85e6bdfe82fdc4d16898df43f8a5371503816ae;hp=ebfc479825dcbe79db46fe53e10588f29765fce9;hpb=cb092381724e4ba8a1f18712fefc541a3d370f99;p=rrdtool.git

diff --git a/doc/rrdxport.pod b/doc/rrdxport.pod
index ebfc479..bf9fd52 100644
--- a/doc/rrdxport.pod
+++ b/doc/rrdxport.pod
@@ -9,6 +9,8 @@ S<[B<-s>|B<--start> I<seconds>]>
 S<[B<-e>|B<--end> I<seconds>]>
 S<[B<-m>|B<--maxrows> I<rows>]>
 S<[B<--step> I<value>]>
+S<[B<--json>]>
+S<[B<--daemon> I<address>]>
 S<[B<DEF:>I<vname>B<=>I<rrd>B<:>I<ds-name>B<:>I<CF>]>
 S<[B<CDEF:>I<vname>B<=>I<rpn-expression>]>
 S<[B<XPORT>B<:>I<vname>[B<:>I<legend>]]>
@@ -48,6 +50,25 @@ for details.
 
 See L<rrdgraph> documentation.
 
+=item B<--daemon> I<address>
+
+Address of the L<rrdcached> daemon. If specified, a C<flush> command is sent
+to the server before reading the RRD files. This allows B<rrdtool> 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 B<-l> option in the L<rrdcached> manual.
+
+  rrdtool xport --daemon unix:/var/run/rrdcached.sock ...
+
+=item B<--json>
+
+produce json formated output (instead of xml)
+
+=item B<--enumds>
+
+The generated xml should contain the data values in enumerated tags.
+
+ <v0>val</v0><v1>val</v1>
+
 =item B<DEF:>I<vname>B<=>I<rrd>B<:>I<ds-name>B<:>I<CF>
 
 See I<rrdgraph> documentation.
@@ -131,8 +152,22 @@ The resulting data section is:
           XPORT:out2:"if2 out bytes" \
 	  XPORT:sum:"output sum"
 
+=head1 ENVIRONMENT VARIABLES
+
+The following environment variables may be used to change the behavior of
+C<rrdtoolE<nbsp>xport>:
+
+=over 4
+
+=item B<RRDCACHED_ADDRESS>
+
+If this environment variable is set it will have the same effect as specifying
+the C<--daemon> option on the command line. If both are present, the command
+line argument takes precedence.
+
+=back
 
 =head1 AUTHOR
 
-Tobias Oetiker E<lt>oetiker@ee.ethz.chE<gt>
+Tobias Oetiker E<lt>tobi@oetiker.chE<gt>