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 8b00f5f07673e3a1bc00d71491aa509f3cc6e2f1..b12a56c57486cf558f23eec7b4812fa62e36b04f 100644 (file)
--- 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 49386d951abf1bf23cdedcfc0046348c180c49b1..c97fee6f9af32ba4b1b6c6c43f1ae5e06d12299e 100644 (file)
--- 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})