summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-18 07:00:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-18 07:00:59 +0000
commit3e6b5bf3b0e09e6bd27939267416d5b9c280082e (patch)
tree9fdac2bedcc6630d293bd7d0ea5705e7703e70d3 /share
parentReleasing debian version 20171101-3. (diff)
downloadopen-infrastructure-storage-tools-3e6b5bf3b0e09e6bd27939267416d5b9c280082e.tar.xz
open-infrastructure-storage-tools-3e6b5bf3b0e09e6bd27939267416d5b9c280082e.zip
Merging upstream version 20180915.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share')
l---------share/ceph-info/web/ceph-health-detail.txt1
-rw-r--r--share/ceph-info/web/index.html3
-rw-r--r--share/cron/ceph-info2
-rw-r--r--share/man/Makefile2
-rw-r--r--share/man/ceph-info.1.txt2
-rw-r--r--share/man/ceph-log.1.txt2
-rw-r--r--share/man/ceph-remove-osd.1.txt2
-rw-r--r--share/man/cephfs-snap.1.txt2
-rw-r--r--share/man/storage-tools.7.txt2
9 files changed, 17 insertions, 1 deletions
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 @@
<h2>$ ceph status</h2>
<p><iframe src="ceph-status.txt" frameborder="0" height="400" width="95%"></iframe></p>
+ <h2>$ ceph health detail</h2>
+ <p><iframe src="ceph-df.txt" frameborder="0" height="250" width="95%"></iframe></p>
+
<h2>$ ceph df</h2>
<p><iframe src="ceph-df.txt" frameborder="0" height="250" width="95%"></iframe></p>
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 <daniel.baumann@open-infrastructure.net>
#
+# 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 <daniel.baumann@open-infrastructure.net>
//
+// 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 <daniel.baumann@open-infrastructure.net>
//
+// 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 <daniel.baumann@open-infrastructure.net>
//
+// 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 <daniel.baumann@open-infrastructure.net>
//
+// 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 <daniel.baumann@open-infrastructure.net>
//
+// 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