From 92b39ca3217a0d3643e87553cd72bceac1158066 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 17 Oct 2017 16:11:56 +0200
Subject: Merging upstream version 20171017.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/ceph-info/web/ceph-version.txt  | 1 -
 share/ceph-info/web/ceph-versions.txt | 1 +
 share/ceph-info/web/index.html        | 8 ++++----
 share/logrotate/ceph-log              | 2 +-
 share/logrotate/cephfs-snap           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 120000 share/ceph-info/web/ceph-version.txt
 create mode 120000 share/ceph-info/web/ceph-versions.txt

(limited to 'share')

diff --git a/share/ceph-info/web/ceph-version.txt b/share/ceph-info/web/ceph-version.txt
deleted file mode 120000
index f440f1b..0000000
--- a/share/ceph-info/web/ceph-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-/var/log/storage-tools/ceph-info/ceph-version.txt
\ No newline at end of file
diff --git a/share/ceph-info/web/ceph-versions.txt b/share/ceph-info/web/ceph-versions.txt
new file mode 120000
index 0000000..cc77481
--- /dev/null
+++ b/share/ceph-info/web/ceph-versions.txt
@@ -0,0 +1 @@
+/var/log/storage-tools/ceph-log/ceph-versions.txt
\ No newline at end of file
diff --git a/share/ceph-info/web/index.html b/share/ceph-info/web/index.html
index 95b059d..eeea131 100644
--- a/share/ceph-info/web/index.html
+++ b/share/ceph-info/web/index.html
@@ -45,7 +45,7 @@
 <pre id="data">Loading...</pre>
 
       <h2>$ ceph status</h2>
-      <p><iframe src="ceph-status.txt" frameborder="0" height="250" width="95%"></iframe></p>
+      <p><iframe src="ceph-status.txt" frameborder="0" height="400" width="95%"></iframe></p>
 
       <h2>$ ceph df</h2>
       <p><iframe src="ceph-df.txt" frameborder="0" height="250" width="95%"></iframe></p>
@@ -56,10 +56,10 @@
       <h2>$ ceph osd tree</h2>
       <p><iframe src="ceph-osd-tree.txt" frameborder="0" height="250" width="95%"></iframe></p>
 
-      <h2>$ ceph version</h2>
-      <p><iframe src="ceph-version.txt" frameborder="0" height="25" width="95%"></iframe></p>
+      <h2>$ ceph versions</h2>
+      <p><iframe src="ceph-versions.txt" frameborder="0" height="325" width="95%"></iframe></p>
 
-      <h3>Last Updated:</h3>
+      <h3>Last Updated</h3>
       <p><iframe src="date.txt" frameborder="0" height="25" width="95%"></iframe></p>
       <!-- /Content -->
 
diff --git a/share/logrotate/ceph-log b/share/logrotate/ceph-log
index cdf8bc7..7bcaf3f 100644
--- a/share/logrotate/ceph-log
+++ b/share/logrotate/ceph-log
@@ -7,7 +7,7 @@
 	missingok
 	daily
 	notifempty
-	rotate 365
+	rotate 9999
 	prerotate
 		service ceph-log stop > /dev/null 2>&1
 	endscript
diff --git a/share/logrotate/cephfs-snap b/share/logrotate/cephfs-snap
index e948edf..21aae15 100644
--- a/share/logrotate/cephfs-snap
+++ b/share/logrotate/cephfs-snap
@@ -7,5 +7,5 @@
 	missingok
 	monthly
 	notifempty
-	rotate 12
+	rotate 9999
 }
-- 
cgit v1.2.3