Hello community, here is the log from the commit of package ceph for openSUSE:Leap:15.2 checked in at 2020-04-08 12:48:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ceph (Old) and /work/SRC/openSUSE:Leap:15.2/.ceph.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Wed Apr 8 12:48:13 2020 rev:73 rq:790613 version:15.2.0.108+g8cf4f02b08 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ceph/ceph-test.changes 2020-03-31 07:22:27.406400290 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.ceph.new.3248/ceph-test.changes 2020-04-08 12:48:46.614354537 +0200 @@ -1,0 +2,7 @@ +Mon Mar 30 13:08:29 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.2.0-108-g8cf4f02b08: + + rebase on tip of upstream "octopus" branch, SHA1 9267cc03e1b1612109dd57cc6ce74c34ed1f1d00 + * cephadm: Fix truncated output of "ceph mgr dump" + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-15.2.0-29-g274f7bc2e7.tar.bz2 New: ---- ceph-15.2.0-108-g8cf4f02b08.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.JgZnOt/_old 2020-04-08 12:48:49.354355966 +0200 +++ /var/tmp/diff_new_pack.JgZnOt/_new 2020-04-08 12:48:49.354355966 +0200 @@ -104,7 +104,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.2.0.29+g274f7bc2e7 +Version: 15.2.0.108+g8cf4f02b08 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -120,7 +120,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.2.0-29-g274f7bc2e7.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.0-108-g8cf4f02b08.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -546,10 +546,8 @@ %endif %if 0%{?suse_version} %endif -%if 0%{?suse_version} -%endif %prep -%autosetup -p1 -n ceph-15.2.0-29-g274f7bc2e7 +%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -755,11 +753,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror +# prometheus alerts +install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml + %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 # hardlink duplicate files under /usr to save space %fdupes %{buildroot}%{_prefix} %endif @@ -1012,7 +1011,7 @@ 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 +rm -rf %{buildroot}%{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml dirs=`find %{buildroot} -type d -empty` while [[ -n $dirs ]]; do ++++++ ceph.spec ++++++ --- /var/tmp/diff_new_pack.JgZnOt/_old 2020-04-08 12:48:49.382355981 +0200 +++ /var/tmp/diff_new_pack.JgZnOt/_new 2020-04-08 12:48:49.386355982 +0200 @@ -104,7 +104,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.0.29+g274f7bc2e7 +Version: 15.2.0.108+g8cf4f02b08 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -120,7 +120,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.2.0-29-g274f7bc2e7.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.0-108-g8cf4f02b08.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -524,6 +524,7 @@ %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-jwt @@ -1110,20 +1111,18 @@ 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-15.2.0-29-g274f7bc2e7 +%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1329,11 +1328,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror +# prometheus alerts +install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml + %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 # hardlink duplicate files under /usr to save space %fdupes %{buildroot}%{_prefix} %endif @@ -2340,20 +2340,17 @@ %if 0%{?suse_version} %attr(0755,root,root) %dir %{_sysconfdir}/grafana %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards -%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard -%else -%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard %endif +%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* %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 +%if 0%{?suse_version} +%attr(0755,root,root) %dir %{_sysconfdir}/prometheus %endif - +%attr(0755,root,root) %dir %{_sysconfdir}/prometheus/ceph +%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog ++++++ ceph-15.2.0-29-g274f7bc2e7.tar.bz2 -> ceph-15.2.0-108-g8cf4f02b08.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/ceph/ceph-15.2.0-29-g274f7bc2e7.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.ceph.new.3248/ceph-15.2.0-108-g8cf4f02b08.tar.bz2 differ: char 11, line 1
