Don’t bail early if we fail to build cloud deps with required cloud. (#11446)
* Don’t bail early if we fail to build cloud deps with required cloud. Due to having two ACLK implementations, failing to build any arbitrary set of cloud dependencies is not guaranteed to prevent us from building a working cloud implementation, so we should fall back to relying on the configure script for determining if the cloud can be built. * add check in case both ACLKs fail Co-authored-by: Timotej Šiškovič <timotej@netdata.cloud>
Austin S. Hemmelgarn committed
Aug 25, 2021 at 07:10 UTC
3848e97548063a8f8da057a0e067d30d87440b7b
2 files changed
+12
-40
configure.ac
+4
@@ -879,6 +879,10 @@ if test "$enable_cloud" != "no" -a "$aclk_legacy" != "no"; then
879
fi
880
fi
881
882
+if test "$enable_cloud" = "yes" -a "$enable_aclk" != "yes"; then
883
+ AC_MSG_ERROR([Neither ACLK-NG nor ACLK-Legacy can be built but --enable-cloud was requested])
884
+fi
885
+
886
AC_SUBST([enable_cloud])
887
AC_SUBST([enable_aclk])
888
AM_CONDITIONAL([ACLK_NG], [test "${aclk_ng}" = "yes"])
netdata-installer.sh
+8
-40
@@ -601,19 +601,11 @@ bundle_libmosquitto() {
601
run_ok "libmosquitto built and prepared."
602
else
603
run_failed "Failed to build libmosquitto."
604
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
605
- exit 1
606
- else
607
- defer_error_highlighted "Unable to fetch sources for libmosquitto. You will not be able to connect this node to Netdata Cloud."
608
- fi
604
+ defer_error_highlighted "Unable to fetch sources for libmosquitto. You will not be able to connect this node to Netdata Cloud."
605
fi
606
else
607
run_failed "Unable to fetch sources for libmosquitto."
612
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
613
- exit 1
614
- else
615
- defer_error_highlighted "Unable to fetch sources for libmosquitto. You will not be able to connect this node to Netdata Cloud."
616
- fi
608
+ defer_error_highlighted "Unable to fetch sources for libmosquitto. You will not be able to connect this node to Netdata Cloud."
609
fi
610
}
611
@@ -710,19 +702,11 @@ bundle_libwebsockets() {
702
NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-bundled-lws"
703
else
704
run_failed "Failed to build libwebsockets."
713
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
714
- exit 1
715
- else
716
- defer_error_highlighted "Failed to build libwebsockets. You may not be able to connect this node to Netdata Cloud."
717
- fi
705
+ defer_error_highlighted "Failed to build libwebsockets. You may not be able to connect this node to Netdata Cloud."
706
fi
707
else
708
run_failed "Unable to fetch sources for libwebsockets."
721
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
722
- exit 1
723
- else
724
- defer_error_highlighted "Unable to fetch sources for libwebsockets. You may not be able to connect this node to Netdata Cloud."
725
- fi
709
+ defer_error_highlighted "Unable to fetch sources for libwebsockets. You may not be able to connect this node to Netdata Cloud."
710
fi
711
}
712
@@ -788,19 +772,11 @@ bundle_protobuf() {
772
NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-bundled-protobuf"
773
else
774
run_failed "Failed to build protobuf."
791
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
792
- exit 1
793
- else
794
- defer_error_highlighted "Failed to build protobuf. You may not be able to connect this node to Netdata Cloud."
795
- fi
775
+ defer_error_highlighted "Failed to build protobuf. You may not be able to connect this node to Netdata Cloud."
776
fi
777
else
778
run_failed "Unable to fetch sources for protobuf."
799
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
800
- exit 1
801
- else
802
- defer_error_highlighted "Unable to fetch sources for protobuf. You may not be able to connect this node to Netdata Cloud."
803
- fi
779
+ defer_error_highlighted "Unable to fetch sources for protobuf. You may not be able to connect this node to Netdata Cloud."
780
fi
781
}
782
@@ -949,19 +925,11 @@ bundle_jsonc() {
925
run_ok "JSON-C built and prepared."
926
else
927
run_failed "Failed to build JSON-C."
952
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
953
- exit 1
954
- else
955
- defer_error_highlighted "Failed to build JSON-C. Netdata Cloud support will be disabled."
956
- fi
928
+ defer_error_highlighted "Failed to build JSON-C. Netdata Cloud support will be disabled."
929
fi
930
else
931
run_failed "Unable to fetch sources for JSON-C."
960
- if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
961
- exit 1
962
- else
963
- defer_error_highlighted "Unable to fetch sources for JSON-C. Netdata Cloud support will be disabled."
964
- fi
932
+ defer_error_highlighted "Unable to fetch sources for JSON-C. Netdata Cloud support will be disabled."
933
fi
934
}
935