From 3e6b5bf3b0e09e6bd27939267416d5b9c280082e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 18 Sep 2018 09:00:51 +0200 Subject: Merging upstream version 20180915. Signed-off-by: Daniel Baumann --- share/ceph-info/web/ceph-health-detail.txt | 1 + share/ceph-info/web/index.html | 3 +++ share/cron/ceph-info | 2 +- share/man/Makefile | 2 ++ share/man/ceph-info.1.txt | 2 ++ share/man/ceph-log.1.txt | 2 ++ share/man/ceph-remove-osd.1.txt | 2 ++ share/man/cephfs-snap.1.txt | 2 ++ share/man/storage-tools.7.txt | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) create mode 120000 share/ceph-info/web/ceph-health-detail.txt (limited to 'share') diff --git a/share/ceph-info/web/ceph-health-detail.txt b/share/ceph-info/web/ceph-health-detail.txt new file mode 120000 index 0000000..e78c3e7 --- /dev/null +++ b/share/ceph-info/web/ceph-health-detail.txt @@ -0,0 +1 @@ +/var/log/storage-tools/ceph-info/ceph-health-detail.txt \ No newline at end of file diff --git a/share/ceph-info/web/index.html b/share/ceph-info/web/index.html index eeea131..491db2d 100644 --- a/share/ceph-info/web/index.html +++ b/share/ceph-info/web/index.html @@ -47,6 +47,9 @@

$ ceph status

+

$ ceph health detail

+

+

$ ceph df

diff --git a/share/cron/ceph-info b/share/cron/ceph-info index 9041e34..37c4312 100644 --- a/share/cron/ceph-info +++ b/share/cron/ceph-info @@ -1 +1 @@ -*/10 * * * * root [ -e /usr/bin/ceph-info ] && /usr/bin/ceph-info +*/2 * * * * root [ -e /usr/bin/ceph-info ] && /usr/bin/ceph-info diff --git a/share/man/Makefile b/share/man/Makefile index 03b5914..101186e 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -3,6 +3,8 @@ # storage-tools - Additional utilities to manage storage related tasks # Copyright (C) 2014-2017 Daniel Baumann # +# SPDX-License-Identifier: GPL-3.0+ +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/ceph-info.1.txt b/share/man/ceph-info.1.txt index 72c50b1..cf9088a 100644 --- a/share/man/ceph-info.1.txt +++ b/share/man/ceph-info.1.txt @@ -1,6 +1,8 @@ // storage-tools - Additional utilities to manage storage related tasks // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/ceph-log.1.txt b/share/man/ceph-log.1.txt index 997db04..16c39d8 100644 --- a/share/man/ceph-log.1.txt +++ b/share/man/ceph-log.1.txt @@ -1,6 +1,8 @@ // storage-tools - Additional utilities to manage storage related tasks // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/ceph-remove-osd.1.txt b/share/man/ceph-remove-osd.1.txt index 28b6062..81d35ae 100644 --- a/share/man/ceph-remove-osd.1.txt +++ b/share/man/ceph-remove-osd.1.txt @@ -1,6 +1,8 @@ // storage-tools - Additional utilities to manage storage related tasks // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/cephfs-snap.1.txt b/share/man/cephfs-snap.1.txt index 06b1ab7..2e98bf3 100644 --- a/share/man/cephfs-snap.1.txt +++ b/share/man/cephfs-snap.1.txt @@ -1,6 +1,8 @@ // storage-tools - Additional utilities to manage storage related tasks // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/storage-tools.7.txt b/share/man/storage-tools.7.txt index a5133d1..78a9182 100644 --- a/share/man/storage-tools.7.txt +++ b/share/man/storage-tools.7.txt @@ -1,6 +1,8 @@ // storage-tools - Additional utilities to manage storage related tasks // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or -- cgit v1.2.3