Hello community,
here is the log from the commit of package grafana-ha-cluster-dashboards for
openSUSE:Factory checked in at 2020-09-22 21:07:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grafana-ha-cluster-dashboards (Old)
and /work/SRC/openSUSE:Factory/.grafana-ha-cluster-dashboards.new.4249
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grafana-ha-cluster-dashboards"
Tue Sep 22 21:07:36 2020 rev:4 rq:835269 version:1.0.3+git.1600360477.8b8f9ce
Changes:
--------
---
/work/SRC/openSUSE:Factory/grafana-ha-cluster-dashboards/grafana-ha-cluster-dashboards.changes
2020-08-05 20:29:10.967091843 +0200
+++
/work/SRC/openSUSE:Factory/.grafana-ha-cluster-dashboards.new.4249/grafana-ha-cluster-dashboards.changes
2020-09-22 21:08:30.915789416 +0200
@@ -1,0 +2,8 @@
+Wed Sep 16 13:24:29 UTC 2020 - Dario Maiocchi <[email protected]>
+
+- Release 1.0.3 (jsc#SLE-10545)
+ * don't use require grafana, use recommends
+ * fix permissions accordingly
+ * fix minor typo on dashboard spec file
+
+-------------------------------------------------------------------
Old:
----
grafana-ha-cluster-dashboards-1.0.2+git.1596627252.62154d3.tar.gz
New:
----
grafana-ha-cluster-dashboards-1.0.3+git.1600360477.8b8f9ce.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grafana-ha-cluster-dashboards.spec ++++++
--- /var/tmp/diff_new_pack.82GpiV/_old 2020-09-22 21:08:32.611790899 +0200
+++ /var/tmp/diff_new_pack.82GpiV/_new 2020-09-22 21:08:32.615790903 +0200
@@ -18,7 +18,7 @@
Name: grafana-ha-cluster-dashboards
# Version will be processed via set_version source service
-Version: 1.0.2+git.1596627252.62154d3
+Version: 1.0.3+git.1600360477.8b8f9ce
Release: 0
Summary: Grafana Dashboards displaying metrics about a
Pacemaker/Corosync High Availability Cluster.
License: Apache-2.0
@@ -26,8 +26,13 @@
URL: https://github.com/ClusterLabs/ha_cluster_exporter
Source: %{name}-%{version}.tar.gz
BuildArch: noarch
-Requires: grafana
-BuildRequires: grafana
+Requires(pre): shadow
+Recommends: grafana
+
+# TECHNICAL NOTE:
+# Originally we used to require grafana but, for product management reasons,
we use recommends now.
+# This impacts how we do pkging here: requiring shadow, creating grafana
usr/group
+# and modifiying files attributes (this was done automagically when requiring
grafana).
%description
Grafana Dashboards displaying metrics about a Pacemaker/Corosync High
Availability Cluster.
@@ -35,21 +40,29 @@
%prep
%setup -q
+%pre
+echo "Creating grafana user and group if not present"
+getent group grafana > /dev/null || groupadd -r grafana
+getent passwd grafana > /dev/null || useradd -r -g grafana -d
%{_datadir}/grafana -s /sbin/nologin grafana
+
%build
%install
-%define dasboards_dir %{_localstatedir}/lib/grafana/dashboards
-%define provisioning_dir %{_sysconfdir}/grafana/provisioning/dashboards
-install -d -m0755 %{buildroot}%{dasboards_dir}/sleha
-install -m644 dashboards/*.json %{buildroot}%{dasboards_dir}/sleha
-install -Dm644 dashboards/provider-sleha.yaml
%{buildroot}%{provisioning_dir}/provider-sleha.yaml
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/grafana/dashboards/sleha
+install -m644 dashboards/*.json
%{buildroot}%{_localstatedir}/lib/grafana/dashboards/sleha
+install -Dm644 dashboards/provider-sleha.yaml
%{buildroot}%{_sysconfdir}/grafana/provisioning/dashboards/provider-sleha.yaml
%files
%defattr(-,root,root)
%doc dashboards/README.md
%license LICENSE
-%attr(0755,grafana,grafana) %dir %{dasboards_dir}/sleha
-%attr(0644,grafana,grafana) %config %{dasboards_dir}/sleha/*
-%attr(0644,root,root) %config %{provisioning_dir}/provider-sleha.yaml
+%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/grafana
+%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/grafana/dashboards
+%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/grafana/dashboards/sleha
+%attr(0644,grafana,grafana) %config
%{_localstatedir}/lib/grafana/dashboards/sleha/*
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/provisioning
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/provisioning/dashboards
+%attr(0644,root,root) %config
%{_sysconfdir}/grafana/provisioning/dashboards/provider-sleha.yaml
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.82GpiV/_old 2020-09-22 21:08:32.651790934 +0200
+++ /var/tmp/diff_new_pack.82GpiV/_new 2020-09-22 21:08:32.651790934 +0200
@@ -2,10 +2,10 @@
<service name="tar_scm" mode="disabled">
<param
name="url">git://github.com/ClusterLabs/ha_cluster_exporter.git</param>
<param name="scm">git</param>
- <param name="revision">62154d3616357133140ce9d8d69de0f53f021a1e</param>
+ <param name="revision">8b8f9ce126d013aca5e8ea1d4568b3db64d69db8</param>
<param name="include">dashboards</param>
<param name="include">LICENSE</param>
- <param name="versionformat">1.0.2+git.%ct.%h</param>
+ <param name="versionformat">1.0.3+git.%ct.%h</param>
<param name="filename">grafana-ha-cluster-dashboards</param>
</service>
<service name="set_version" mode="disabled">
++++++ grafana-ha-cluster-dashboards-1.0.2+git.1596627252.62154d3.tar.gz ->
grafana-ha-cluster-dashboards-1.0.3+git.1600360477.8b8f9ce.tar.gz ++++++
