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>
(cherry picked from commit 4907c78bb732b613ae223d3a7d1a046da457d1cc)

Conflicts:
	ceph.spec.in (added jsonnet package)
	monitoring/grafana/dashboards/CMakeLists.txt (added grafana jsons code)
(cherry picked from commit 570160e291b9029c7998d4dd4fee33327da91312)

diff --git a/ceph.spec.in b/ceph.spec.in
index b62739cd2d10013970d0aa16a329d4e45e9e7989..1496ef238211ade19ec25631962441bdbb382080 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -333,7 +333,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: xmlsec1
 BuildRequires: xmlsec1-devel

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})

diff --git a/run-make-check.sh b/run-make-check.sh
index ca5b61d9d0479821087f3f742986a2a772671577..8d43aeeab14d11720c8c0af9c1a1db21fc3f2061 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -67,7 +67,7 @@ function main() {
     fi
     FOR_MAKE_CHECK=1 prepare
     # Init defaults after deps are installed.
-    local cmake_opts=" -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_CEPHFS_SHELL=ON -DWITH_GRAFANA=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF"
+    local cmake_opts=" -DWITH_PYTHON3=3 -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_CEPHFS_SHELL=ON -DWITH_GRAFANA=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF"
     if [ $WITH_SEASTAR ]; then
         cmake_opts+=" -DWITH_SEASTAR=ON"
     fi