Accepting request 702653 from filesystems:ceph:nautilus

M15 candidate

OBS-URL: https://build.opensuse.org/request/show/702653
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=224

ceph-14.2.1-345-g040ffffe0e.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfa58eb205ebfd6f85979c1ea1f86bac1a576fc8c9208a83c48f62a71366aca3
-size 96800767

ceph-14.2.1-419-gb72ca927c1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa8d4eff90edae1cfc71dd1098a61a5c211c116bd6f39fa7d64a010dc9767b59
+size 96838499

ceph-test.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon May 13 09:55:39 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 14.2.1-419-gb72ca927c1:
+  + rebase on top of upstream nautilus branch, SHA1 8e188313cf2f790f131e21a3a02094e32cf02087
+  + replaced ~25 downstream ceph-volume lvmcache commits with a single squashed commit
+  + rgw: object expirer fixes (bsc#1133139)
+  + rgw_lc: use a new bl while encoding RGW_ATTR_LC (jsc#SES-327)
+  + rgw: beast IPv6 (jsc#SES-454)
+
+-------------------------------------------------------------------
+Tue May  7 15:38:51 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 14.2.1-426-g7a12897012:
+  + nautilus: core: Give recovery for inactive PGs a higher priority (bsc#1133461)
+  + spec: new subpackage ceph-prometheus-alerts
+  + nautilus: librbd: re-add support for nautilus clients talking to jewel clusters
+  + systemd: ceph-mgr: set MemoryDenyWriteExecute to false
+
 -------------------------------------------------------------------
 Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler <ncutler@suse.com>
 

ceph-test.spec

@@ -100,7 +100,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 14.2.1.345+g040ffffe0e
+Version: 14.2.1.419+gb72ca927c1
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -116,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-14.2.1-345-g040ffffe0e.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-14.2.1-419-gb72ca927c1.tar.bz2
 %if 0%{?suse_version}
 Source96: checkin.sh
 Source97: README-checkin.txt
@@ -252,6 +252,8 @@ BuildRequires:	python%{_python_buildid}-PrettyTable
 BuildRequires:	python%{_python_buildid}-Sphinx
 BuildRequires:  rdma-core-devel
 BuildRequires:	liblz4-devel >= 1.7
+# for prometheus-alerts
+BuildRequires:  golang-github-prometheus-prometheus
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 
@@ -494,8 +496,10 @@ This package contains Ceph benchmarks and test tools.
 %endif
 %if 0%{?suse_version}
 %endif
+%if 0%{?suse_version}
+%endif
 %prep
-%autosetup -p1 -n ceph-14.2.1-345-g040ffffe0e
+%autosetup -p1 -n ceph-14.2.1-419-gb72ca927c1
 
 %build
 
@@ -679,6 +683,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 %if 0%{?suse_version}
 # create __pycache__ directories and their contents
 %py3_compile %{buildroot}%{python3_sitelib}
+# prometheus alerts
+install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
 %endif
 %if 0%{?rhel} == 8
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
@@ -929,6 +935,7 @@ rm -rf %{buildroot}%doc
 rm -rf %{buildroot}monitoring/grafana/dashboards/README
 rm -rf %{buildroot}%doc
 rm -rf %{buildroot}monitoring/grafana/README.md
+rm -rf %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
 
 dirs=`find %{buildroot} -type d -empty`
 while [[ -n $dirs ]]; do
@@ -1111,5 +1118,7 @@ rm -rf %{buildroot}
 %endif
 %if 0%{?suse_version}
 %endif
+%if 0%{?suse_version}
+%endif
 %changelog
 # nospeccleaner

ceph.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon May 13 09:55:39 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 14.2.1-419-gb72ca927c1:
+  + rebase on top of upstream nautilus branch, SHA1 8e188313cf2f790f131e21a3a02094e32cf02087
+  + replaced ~25 downstream ceph-volume lvmcache commits with a single squashed commit
+  + rgw: object expirer fixes (bsc#1133139)
+  + rgw_lc: use a new bl while encoding RGW_ATTR_LC (jsc#SES-327)
+  + rgw: beast IPv6 (jsc#SES-454)
+
+-------------------------------------------------------------------
+Tue May  7 15:38:51 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 14.2.1-426-g7a12897012:
+  + nautilus: core: Give recovery for inactive PGs a higher priority (bsc#1133461)
+  + spec: new subpackage ceph-prometheus-alerts
+  + nautilus: librbd: re-add support for nautilus clients talking to jewel clusters
+  + systemd: ceph-mgr: set MemoryDenyWriteExecute to false
+
 -------------------------------------------------------------------
 Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler <ncutler@suse.com>
 

ceph.spec

@@ -100,7 +100,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	14.2.1.345+g040ffffe0e
+Version:	14.2.1.419+gb72ca927c1
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -116,7 +116,7 @@ License:	LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	%{?_remote_tarball_prefix}ceph-14.2.1-345-g040ffffe0e.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-14.2.1-419-gb72ca927c1.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -244,6 +244,8 @@ BuildRequires:	python%{_python_buildid}-PrettyTable
 BuildRequires:	python%{_python_buildid}-Sphinx
 BuildRequires:  rdma-core-devel
 BuildRequires:	liblz4-devel >= 1.7
+# for prometheus-alerts
+BuildRequires:  golang-github-prometheus-prometheus
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	systemd
@@ -1053,11 +1055,20 @@ collecting data from Ceph Manager "prometheus" module and Prometheus
 project "node_exporter" module. The dashboards are designed to be
 integrated with the Ceph Manager Dashboard web UI.
 
+%if 0%{?suse_version}
+%package prometheus-alerts
+Summary:        Prometheus alerts for a Ceph deplyoment
+BuildArch:      noarch
+Group:          System/Monitoring
+%description prometheus-alerts
+This package provides Ceph’s default alerts for Prometheus.
+%endif
+
 #################################################################################
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-14.2.1-345-g040ffffe0e
+%autosetup -p1 -n ceph-14.2.1-419-gb72ca927c1
 
 %build
 
@@ -1241,6 +1252,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 %if 0%{?suse_version}
 # create __pycache__ directories and their contents
 %py3_compile %{buildroot}%{python3_sitelib}
+# prometheus alerts
+install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
 %endif
 %if 0%{?rhel} == 8
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
@@ -2195,6 +2208,13 @@ exit 0
 %doc monitoring/grafana/dashboards/README
 %doc monitoring/grafana/README.md
 
+%if 0%{?suse_version}
+%files prometheus-alerts
+%dir /etc/prometheus/SUSE/
+%dir /etc/prometheus/SUSE/default_rules/
+%config /etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
+%endif
+
 
 %changelog
 # nospeccleaner

checkin.sh

@@ -89,7 +89,7 @@ if [ -n "$EXISTING" ] ; then
     CLONE="$EXISTING"
 else
     echo "Will make fresh clone of repo ->$REPO<- branch ->$BRANCH<-"
-    #TMPDIR=$(mktemp -d --tmpdir=$BASEDIR)
+    # TMPDIR=$(mktemp -d --tmpdir=$BASEDIR)  # does not work due to http://tracker.ceph.com/issues/39556
     TMPDIR=$(mktemp -d)
     echo "Created temporary temporary $TMPDIR"
     git clone --branch $BRANCH $REPO $TMPDIR