diff --git a/.ceph.metadata b/.ceph.metadata index cb4918b..8217975 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -94e58f4c16cd86d255a6a306181dd5050a3246fe SOURCES/ceph-16.2.7.tar.gz +8f99b1588833c5887495562fc99a088d591e26c1 SOURCES/ceph-16.2.8.tar.gz diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 9f2ff7b..8a8a199 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -128,7 +128,7 @@ # main package definition ################################################################################# Name: ceph -Version: 16.2.7 +Version: 16.2.8 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -352,6 +352,7 @@ BuildRequires: lz4-devel >= 1.7 %endif # distro-conditional make check dependencies %if 0%{with make_check} +BuildRequires: golang %if 0%{?fedora} || 0%{?rhel} BuildRequires: golang-github-prometheus BuildRequires: jsonnet @@ -372,7 +373,6 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif %if 0%{?suse_version} BuildRequires: golang-github-prometheus-prometheus -BuildRequires: jsonnet BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 @@ -1392,7 +1392,7 @@ cat ./CMakeFiles/CMakeError.log export VERBOSE=1 export V=1 export GCC_COLORS= -make "$CEPH_MFLAGS_JOBS" || (tar cjf - /tmp/cc*.out | base64 ; exit 1) +make "$CEPH_MFLAGS_JOBS" %if 0%{with make_check} %check @@ -1476,7 +1476,7 @@ 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 +install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml %if 0%{?suse_version} # create __pycache__ directories and their contents @@ -1597,7 +1597,7 @@ exit 0 %{_mandir}/man8/cephadm.8* %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh -%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys +%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys %endif %files common @@ -2522,8 +2522,6 @@ exit 0 %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 %files prometheus-alerts %if 0%{?suse_version} @@ -2533,6 +2531,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon May 16 2022 Kaleb S. KEITHLEY - 2:16.2.8-1 +- 16.2.8 GA + * Tue Dec 7 2021 Kaleb S. KEITHLEY - 2:16.2.7-1 - 16.2.7 GA