From 6b77062c6e2c7efa58fced03a6e3c03e7475138932c5de3075b0ae44b2807eaa Mon Sep 17 00:00:00 2001
From: Jan Fajerski <jan.fajerski@suse.com>
Date: Fri, 11 Jan 2019 15:50:03 +0000
Subject: [PATCH] Accepting request 664691 from
 home:witekbedyk:branches:Cloud:OpenStack:Rocky

- Provide default dashboard provider from upstream

OBS-URL: https://build.opensuse.org/request/show/664691
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=9
---
 grafana.changes | 5 +++++
 grafana.spec    | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/grafana.changes b/grafana.changes
index 3da4b31..1676c9f 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  8 14:15:12 UTC 2019 - witold.bedyk@suse.com
+
+- Provide default dashboard provider from upstream
+
 -------------------------------------------------------------------
 Mon Oct 29 14:14:34 UTC 2018 - moio@suse.com
 
diff --git a/grafana.spec b/grafana.spec
index 1aa253e..c9b8dd2 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package grafana
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -90,11 +90,14 @@ install -d -m0750 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d -m0750 %{buildroot}%{_localstatedir}/log/%{name}
 install -d -m0755 %{buildroot}/%{_localstatedir}/lib/%{name}/plugins
 install -d -m0755 %{buildroot}/%{_localstatedir}/lib/%{name}/dashboards
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/dashboards
 
 install -Dm640 conf/sample.ini %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini
 install -Dm640 {conf/,%{buildroot}%{_sysconfdir}/%{name}/}ldap.toml
 install -Dm644 {conf/,%{buildroot}%{_datadir}/%{name}/conf/}defaults.ini
 install -m644 {conf/,%{buildroot}%{_datadir}/%{name}/conf/}sample.ini
+install -Dm644 {conf/provisioning/dashboards/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/dashboards/}sample.yaml
+install -Dm644 {conf/provisioning/datasources/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/datasources/}sample.yaml
 cp -pr public %{buildroot}%{_datadir}/%{name}/
 install -d -m755 %{buildroot}%{_datadir}/%{name}/vendor
 install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
@@ -141,6 +144,8 @@ getent passwd %{GRAFANA_GROUP} > /dev/null || useradd -r -g %{GRAFANA_GROUP} \
 %{_unitdir}/%{name}-server.service
 %{_fillupdir}/sysconfig.%{name}-server
 %attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}
+%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning
+%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
 %attr(0750,root,%{GRAFANA_GROUP}) %dir %{_datadir}/%{name}/conf
 %attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
 %attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml
@@ -149,6 +154,8 @@ getent passwd %{GRAFANA_GROUP} > /dev/null || useradd -r -g %{GRAFANA_GROUP} \
 %attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/dashboards
 %attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/log/%{name}
 %doc %{_datadir}/%{name}/conf/sample.ini
+%doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml
+%doc %{_datadir}/%{name}/conf/provisioning/datasources/sample.yaml
 %config %{_datadir}/%{name}/conf/defaults.ini
 %{_datadir}/%{name}