ceph-15.2.1 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2020-04-10 08:33:14 -04:00
parent 1e83c5c029
commit 0654a1fdc4
2 changed files with 14 additions and 13 deletions

View File

@ -109,7 +109,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 15.2.0 Version: 15.2.1
Release: 1%{?dist} Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -534,6 +534,7 @@ Group: System/Filesystems
%endif %endif
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-grafana-dashboards = %{_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} %if 0%{?fedora} || 0%{?rhel}
Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-cherrypy
Requires: python%{python3_pkgversion}-jwt Requires: python%{python3_pkgversion}-jwt
@ -1115,14 +1116,12 @@ collecting data from Ceph Manager "prometheus" module and Prometheus
project "node_exporter" module. The dashboards are designed to be project "node_exporter" module. The dashboards are designed to be
integrated with the Ceph Manager Dashboard web UI. integrated with the Ceph Manager Dashboard web UI.
%if 0%{?suse_version}
%package prometheus-alerts %package prometheus-alerts
Summary: Prometheus alerts for a Ceph deplyoment Summary: Prometheus alerts for a Ceph deplyoment
BuildArch: noarch BuildArch: noarch
Group: System/Monitoring Group: System/Monitoring
%description prometheus-alerts %description prometheus-alerts
This package provides Cephs default alerts for Prometheus. This package provides Cephs default alerts for Prometheus.
%endif
################################################################################# #################################################################################
# common # common
@ -1336,11 +1335,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror 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} %if 0%{?suse_version}
# create __pycache__ directories and their contents # create __pycache__ directories and their contents
%py3_compile %{buildroot}%{python3_sitelib} %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 # hardlink duplicate files under /usr to save space
%fdupes %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}
%endif %endif
@ -2344,22 +2344,23 @@ exit 0
%if 0%{?suse_version} %if 0%{?suse_version}
%attr(0755,root,root) %dir %{_sysconfdir}/grafana %attr(0755,root,root) %dir %{_sysconfdir}/grafana
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards %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 %endif
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
%doc monitoring/grafana/dashboards/README %doc monitoring/grafana/dashboards/README
%doc monitoring/grafana/README.md %doc monitoring/grafana/README.md
%if 0%{?suse_version}
%files prometheus-alerts %files prometheus-alerts
%dir /etc/prometheus/SUSE/ %if 0%{?suse_version}
%dir /etc/prometheus/SUSE/default_rules/ %attr(0755,root,root) %dir %{_sysconfdir}/prometheus
%config /etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
%endif %endif
%attr(0755,root,root) %dir %{_sysconfdir}/prometheus/ceph
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Mon Apr 10 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.1-1
- ceph 15.2.1 GA
* Mon Mar 23 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.0-1 * Mon Mar 23 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.0-1
- ceph 15.2.0 GA - ceph 15.2.0 GA

View File

@ -1 +1 @@
SHA512 (ceph-15.2.0.tar.gz) = 07a3ff2ccf1a3abac652ff8c5f1611e7c628fcedcb280adc6cd49792b46fa50c7c29437dc57c2c4a6af708a6833abf8c1a386ef2142d30bd5e1f214ba7aec4f2 SHA512 (ceph-15.2.1.tar.gz) = 01589875078466321aaaeead8d7e21baf670e68c3d1f3168de188f3ad93eada745affb9da30217c8cb4938cbfdbe6bdf6bfd074fe8eb01863e1e8448f06a2304