From c942987a96449cc168c1b50397680c73998932ab Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 11 Apr 2017 00:07:56 +0200 Subject: Merging upstream version 20170410. Signed-off-by: Daniel Baumann --- share/ceph-info/web/bootstrap.min.css | 1 + share/ceph-info/web/bootstrap.min.js | 1 + share/ceph-info/web/font-awesome | 1 + share/ceph-info/web/index.html | 97 ++++++++++++++++++++++++++--------- share/ceph-info/web/navbar.css | 8 +++ share/cron/cephfs-snap | 1 + share/doc/examples/storage-tools | 20 ++++++++ share/man/ceph-log.1.txt | 2 +- share/man/cephfs-snap.1.txt | 39 +++++++++++++- share/man/storage-tools.7.txt | 4 ++ 10 files changed, 147 insertions(+), 27 deletions(-) create mode 120000 share/ceph-info/web/bootstrap.min.css create mode 120000 share/ceph-info/web/bootstrap.min.js create mode 120000 share/ceph-info/web/font-awesome create mode 100644 share/ceph-info/web/navbar.css create mode 100644 share/doc/examples/storage-tools (limited to 'share') diff --git a/share/ceph-info/web/bootstrap.min.css b/share/ceph-info/web/bootstrap.min.css new file mode 120000 index 0000000..ca97db2 --- /dev/null +++ b/share/ceph-info/web/bootstrap.min.css @@ -0,0 +1 @@ +/usr/share/javascript/bootstrap/css/bootstrap.min.css \ No newline at end of file diff --git a/share/ceph-info/web/bootstrap.min.js b/share/ceph-info/web/bootstrap.min.js new file mode 120000 index 0000000..22d433b --- /dev/null +++ b/share/ceph-info/web/bootstrap.min.js @@ -0,0 +1 @@ +/usr/share/javascript/bootstrap/js/bootstrap.min.js \ No newline at end of file diff --git a/share/ceph-info/web/font-awesome b/share/ceph-info/web/font-awesome new file mode 120000 index 0000000..3437336 --- /dev/null +++ b/share/ceph-info/web/font-awesome @@ -0,0 +1 @@ +/usr/share/fonts-font-awesome \ No newline at end of file diff --git a/share/ceph-info/web/index.html b/share/ceph-info/web/index.html index b55f637..95b059d 100644 --- a/share/ceph-info/web/index.html +++ b/share/ceph-info/web/index.html @@ -1,34 +1,81 @@ - - - ceph-info - - - - + + + + + + + + + + - -

ceph-info

+ storage-tools: ceph-info -

$ ceph --watch

- - 
Loading...
+ + -

$ ceph status

-

+ + + -

$ ceph df

-

+ + -

$ ceph osd df

-

+ -

$ ceph osd tree

-

+
-

$ ceph version

-

+ + -

Last Updated:

-

- + + +
Loading...
+ +

$ ceph status

+

+ +

$ ceph df

+

+ +

$ ceph osd df

+

+ +

$ ceph osd tree

+

+ +

$ ceph version

+

+ +

Last Updated:

+

+ + +
+ + + +
+ + + + + + + + diff --git a/share/ceph-info/web/navbar.css b/share/ceph-info/web/navbar.css new file mode 100644 index 0000000..d219524 --- /dev/null +++ b/share/ceph-info/web/navbar.css @@ -0,0 +1,8 @@ +body { + padding-top: 20px; + padding-bottom: 20px; +} + +.navbar { + margin-bottom: 20px; +} diff --git a/share/cron/cephfs-snap b/share/cron/cephfs-snap index 40340b6..ced26c7 100644 --- a/share/cron/cephfs-snap +++ b/share/cron/cephfs-snap @@ -2,3 +2,4 @@ 0 0 * * * root [ -e /usr/bin/cephfs-snap ] && /usr/bin/cephfs-snap daily 0 0 * * 1 root [ -e /usr/bin/cephfs-snap ] && /usr/bin/cephfs-snap weekly 0 0 * 1 * root [ -e /usr/bin/cephfs-snap ] && /usr/bin/cephfs-snap monthly +0 0 1 1 * root [ -e /usr/bin/cephfs-snap ] && /usr/bin/cephfs-snap yearly diff --git a/share/doc/examples/storage-tools b/share/doc/examples/storage-tools new file mode 100644 index 0000000..c74cb78 --- /dev/null +++ b/share/doc/examples/storage-tools @@ -0,0 +1,20 @@ +# /etc/default/storage-tools + +CEPH_INFO="true" +CEPH_LOG="true" + +CEPHFS_SNAP="true" +CEPHFS_SNAP_DIRECTORIES="" + +# keep hourly snapshots for 1 week: (24 * 7) + 1 +CEPHFS_SNAP_HOURLY="169" +# keep daily snapshots for 1 month: (31) + 1 +CEPHFS_SNAP_DAILY="32" +# keep weekly snapshots for 6 months: (4 * 6) + 1 +CEPHFS_SNAP_WEEKLY="25" +# keep monthly snapshots for 1 year: (12) + 1 +CEPHFS_SNAP_MONTHLY="13" +# keep yearly snapshots for 10 year: (10) + 1 +CEPHFS_SNAP_YEARLY="11" + +IRK_TARGETS="" diff --git a/share/man/ceph-log.1.txt b/share/man/ceph-log.1.txt index c3fe237..997db04 100644 --- a/share/man/ceph-log.1.txt +++ b/share/man/ceph-log.1.txt @@ -39,7 +39,7 @@ administrator watch everything that is happening in a ceph cluster, such as the health state of the cluster, any cluster changes and any commands and mounts from clients that are happening. -Unfortunatly the 'ceph -w' command is a tool that a system administrator uses +Unfortunately the 'ceph -w' command is a tool that a system administrator uses for real time information, means there is no history or looking backward what happened at a given time. diff --git a/share/man/cephfs-snap.1.txt b/share/man/cephfs-snap.1.txt index 972bcd0..06b1ab7 100644 --- a/share/man/cephfs-snap.1.txt +++ b/share/man/cephfs-snap.1.txt @@ -29,7 +29,9 @@ cephfs-snap - create CephFS snapshots periodically SYNOPSIS -------- -*cephfs-snap* {hourly|daily|weekly|monthly} +*cephfs-snap* + +*cephfs-snap* [hourly|daily|weekly|monthly] DESCRIPTION @@ -40,13 +42,48 @@ backups. The cephfs-snap program is a simple tool to do this periodically. +CONFIGURATION +------------- +cephfs-snap is configured in /etc/default/storage-tools. The following variables are used: + +*CEPHFS_SNAP*:: + Boolean, either true or false. If set to false (default), cephfs will do nothing. + +*CEPHFS_SNAP_DIRECTORIES*:: + List of one or more space separated directories. If no directory is specified, cephfs-snap will do nothing. + +*CEPHFS_SNAP_HOURLY*:: + Integer, number of how many most recent hourly snapshots are to be kept at any given time. Any older snapshots will be removed. Note: specify one more than you wan to keep, e.g. 25 for one day of hourly snapshots alongside the most current one. + +*CEPHFS_SNAP_DAILY*:: + Integer, number of how many most recent daily snapshots are to be kept at any given time. + +*CEPHFS_SNAP_WEEKLY*:: + Integer, number of how many most recent weekly snapshots are to be kept at any given time. + +*CEPHFS_SNAP_MONTHLY*:: + Integer, number of how many most recent monthly snapshots are to be kept at any given time. + +*CEPHFS_SNAP_YEARLY*:: + Integer, number of how many most recent yearly snapshots are to be kept at any given time. + +*IRK_TARGETS*:: + List of space separated IRC channels to send notifications to, e.g.: irc://irc.oftc.net:6668/open-infrastructure + + FILES ----- The following files are used: +*/etc/cron.d/cephfs-snap*:: + Cron file. + */etc/default/storage-tools*:: Configuration file. +*/var/log/storage-tools/cephfs-snap*:: + Log files. + SEE ALSO -------- diff --git a/share/man/storage-tools.7.txt b/share/man/storage-tools.7.txt index 20bae0b..a5133d1 100644 --- a/share/man/storage-tools.7.txt +++ b/share/man/storage-tools.7.txt @@ -54,6 +54,10 @@ SOURCE 2. git clone https://sources.open-infrastructure.net/software/storage-tools 3. cd storage-tools && sudo make install +DEBIAN 10 (BUSTER) AND NEWER +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * sudo apt install storage-tools + DEVELOPMENT ----------- -- cgit v1.2.3