spec: debian: monitoring: build jsonnet from source to use 0.18.0

As this new version is recently released it's still not in every distro
we use. We now build jsonnet from source so that we can use this new
version of jsonnet. This commit could be reverted later on when the new
version would be available everywhere.

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit ecaf9070aed955c5a7ec7818cd9e2c45ddacc545)

diff --git a/ceph.spec.in b/ceph.spec.in
index fba77950cf422b1299d141af337d77d362f683d1..e18c881783bef4d609429f72ca04367e9f1d7e0a 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -345,7 +345,6 @@ BuildRequires:      lz4-devel >= 1.7
 BuildRequires: golang
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: golang-github-prometheus
-BuildRequires: jsonnet
 BuildRequires: libtool-ltdl-devel
 BuildRequires: ninja-build
 BuildRequires: xmlsec1
@@ -364,7 +363,6 @@ BuildRequires:      python%{python3_pkgversion}-pyOpenSSL
 %endif
 %if 0%{?suse_version}
 BuildRequires: golang-github-prometheus-prometheus
-BuildRequires: jsonnet
 BuildRequires: libxmlsec1-1
 BuildRequires: libxmlsec1-nss1
 BuildRequires: libxmlsec1-openssl1

diff --git a/debian/control b/debian/control
index 8eb011c006b14ade5c575b50090603a49bbc3f4e..a49e44f96d88db78fc4e2ec8bb9fa23a0becd694 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends: automake,
                hostname <pkg.ceph.check>,
                javahelper,
                jq <pkg.ceph.check>,
-               jsonnet <pkg.ceph.check>,
                junit4,
                libaio-dev,
                libbabeltrace-ctf-dev,

diff --git a/monitoring/ceph-mixin/CMakeLists.txt b/monitoring/ceph-mixin/CMakeLists.txt
index 8621c267342506cad29b62b80470346df61421aa..26b05e2659b76f8f1dd54727bafa20322fee99ce 100644 (file)
--- a/monitoring/ceph-mixin/CMakeLists.txt
+++ b/monitoring/ceph-mixin/CMakeLists.txt
@@ -17,6 +17,17 @@ if(WITH_GRAFANA)
       BUILD_IN_SOURCE 1
       INSTALL_COMMAND cp <SOURCE_DIR>/_output/jb <INSTALL_DIR>)
 
+    ExternalProject_Add(jsonnet
+      GIT_REPOSITORY "https://github.com/google/go-jsonnet.git"
+      GIT_TAG "v0.18.0"
+      GIT_SHALLOW TRUE
+      SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
+      CONFIGURE_COMMAND ""
+      DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
+      BUILD_COMMAND make build
+      BUILD_IN_SOURCE 1
+      INSTALL_COMMAND cp <SOURCE_DIR>/_output/jsonnet <INSTALL_DIR>)
+
     set(CEPH_BUILD_VIRTUALENV $ENV{TMPDIR})
     if(NOT CEPH_BUILD_VIRTUALENV)
       include(AddCephTest)

diff --git a/monitoring/ceph-mixin/README.md b/monitoring/ceph-mixin/README.md
index 164b73b881c668bd26a34ad051b261dd57bac73b..7c0cd064c67a04e09ac0fe66f820b15f1669588d 100644 (file)
--- a/monitoring/ceph-mixin/README.md
+++ b/monitoring/ceph-mixin/README.md
@@ -40,7 +40,7 @@ file, developers should include any necessary changes to the MIB.
 
 ### Building from Jsonnet
 
-- Install [jsonnet](https://jsonnet.org/)
+- Install [jsonnet](https://jsonnet.org/) (at least v0.18.0)
     - By installing the package `jsonnet` in most of the distro and
       `golang-github-google-jsonnet` in fedora
 - Install [jsonnet-bundler](https://github.com/jsonnet-bundler/jsonnet-bundler)