From: Aashish Sharma <aashishsharma@localhost.localdomain>
Date: Thu, 12 Aug 2021 08:58:23 +0000 (+0530)
Subject: mgr/dashboard: fix grafonnet build error
X-Git-Tag: v17.1.0~1130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4907c78bb732b613ae223d3a7d1a046da457d1cc;p=ceph.git

mgr/dashboard: fix grafonnet build error

This PR tends to fix the issue caused by #42194

Fixes:https://tracker.ceph.com/issues/52238
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8b00f5f07673..b12a56c57486 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -350,7 +350,7 @@ BuildRequires:	lz4-devel >= 1.7
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	golang-github-prometheus
-BuildRequires:	golang-github-google-jsonnet
+BuildRequires:	jsonnet
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	ninja-build
 BuildRequires:	xmlsec1
diff --git a/monitoring/grafana/dashboards/CMakeLists.txt b/monitoring/grafana/dashboards/CMakeLists.txt
index 49386d951abf..c97fee6f9af3 100644
--- a/monitoring/grafana/dashboards/CMakeLists.txt
+++ b/monitoring/grafana/dashboards/CMakeLists.txt
@@ -1,3 +1,10 @@
+set(CEPH_GRAFANA_DASHBOARDS_DIR "${CMAKE_INSTALL_SYSCONFDIR}/grafana/dashboards/ceph-dashboard"
+  CACHE PATH "Location for grafana dashboards")
+file(GLOB CEPH_GRAFANA_DASHBOARDS "*.json")
+install(FILES
+  ${CEPH_GRAFANA_DASHBOARDS}
+  DESTINATION ${CEPH_GRAFANA_DASHBOARDS_DIR})
+
 set(CEPH_BUILD_VIRTUALENV $ENV{TMPDIR})
 if(NOT CEPH_BUILD_VIRTUALENV)
   set(CEPH_BUILD_VIRTUALENV ${CMAKE_BINARY_DIR})