summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-05-26 04:56:46 +0000
committerJeroen Roovers <jer@gentoo.org>2015-05-26 04:56:46 +0000
commitf2b5daa234c444cfe90762a9494faf8462816687 (patch)
tree9bb9a4cf6be73524b36931a664b3efe98ad1a0d0 /net-analyzer
parentBump (diff)
downloadgentoo-2-f2b5daa234c444cfe90762a9494faf8462816687.tar.gz
gentoo-2-f2b5daa234c444cfe90762a9494faf8462816687.tar.bz2
gentoo-2-f2b5daa234c444cfe90762a9494faf8462816687.zip
Add one more missing file by Andrew Miller (bug #548818).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/rrdtool/ChangeLog6
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod68
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild7
3 files changed, 78 insertions, 3 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index b8232213d23b..e525303e5bbe 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/rrdtool
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.292 2015/05/17 09:22:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.293 2015/05/26 04:56:46 jer Exp $
+
+ 26 May 2015; Jeroen Roovers <jer@gentoo.org> rrdtool-1.5.3-r1.ebuild,
+ +files/rrdtool-1.5.3-rrdrados.pod:
+ Add one more missing file by Andrew Miller (bug #548818).
17 May 2015; Jeroen Roovers <jer@gentoo.org> rrdtool-1.5.3-r1.ebuild:
Mark ~hppa (bug #549516).
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
new file mode 100644
index 000000000000..0c645548a202
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
@@ -0,0 +1,68 @@
+=head1 NAME
+
+rrdrados - Creating, updating and retrieving RRD files from Ceph
+
+=head1 SYNOPSIS
+
+E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
+
+
+=head1 DESCRIPTION
+
+This module adds support for creating, updating and retrieving RRD files
+directly from a Ceph cluster using librados.
+
+It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
+operate on a file that is stored in Ceph.
+
+Currently the module expects to find the Ceph configuration file in the default
+location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
+Ceph pool named "rrd".
+
+
+=head1 ENVIRONMENT VARIABLES
+
+=over 4
+
+=item B<CEPH_ID>
+
+Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
+is used.
+
+=item B<CEPH_POOL>
+
+Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
+used.
+
+=back
+
+
+=head1 EXAMPLES
+
+B<Creating an RRD file on Ceph>
+
+ rrdtool create ceph//temperature.rrd --step 300 \
+ DS:temp:GAUGE:600:-273:5000 \
+ RRA:AVERAGE:0.5:1:1200 \
+ RRA:MIN:0.5:12:2400 \
+ RRA:MAX:0.5:12:2400 \
+ RRA:AVERAGE:0.5:12:2400
+
+
+B<Importing an existing RRD into Ceph>
+
+ rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
+
+Or you could also copy the RRD file directly into Ceph using the rados command
+line utility.
+
+
+B<Retrieving RRD data from Ceph>
+
+ rrdtool fetch ceph//file.rrd AVERAGE
+
+
+=head1 AUTHOR
+
+Simon Boulet E<lt>simon@nostalgeek.comE<gt>
+
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild
index abf0a211c613..efe2e7277cd7 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild,v 1.3 2015/05/17 09:22:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild,v 1.4 2015/05/26 04:56:46 jer Exp $
EAPI="5"
@@ -62,7 +62,10 @@ python_install() {
}
src_prepare() {
- cp "${FILESDIR}"/${PN}-1.5.3-rrd_rados.h src/rrd_rados.h || die
+ # At the next version bump, please see if you actually still need these
+ # before adding versions
+ cp "${FILESDIR}"/${P}-rrd_rados.h src/rrd_rados.h || die
+ cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
epatch \
"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \