Unverified Commit 2e62a052 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #332 from youny626/0.6.0 

Add option  to enable / disable prometheus
parents 651f5e91 8ae3a839

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#260 - C++ SDK README

- \#314 - add Find FAISS in CMake

- \#310 - Add Q&A for 'protocol https not supported or disable in libcurl' issue

- \#322 - Add option to enable / disable prometheus 



## Task

core/CMakeLists.txt

+18 −14
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ else () 
    add_compile_definitions("MILVUS_CPU_VERSION")

endif ()



if (MILVUS_WITH_PROMETHEUS)

    add_compile_definitions("MILVUS_WITH_PROMETHEUS")

endif ()



if (CMAKE_BUILD_TYPE STREQUAL "Release")

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -DELPP_THREAD_SAFE -fopenmp")

    if (MILVUS_GPU_VERSION)

core/build.sh

+10 −4
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ CUSTOMIZATION="OFF" # default use ori faiss 
CUDA_COMPILER=/usr/local/cuda/bin/nvcc

GPU_VERSION="OFF" #defaults to CPU version

WITH_MKL="OFF"

FAISS_ROOT=""

FAISS_ROOT="" #FAISS root path

FAISS_SOURCE="BUNDLED"

WITH_PROMETHEUS="ON"



while getopts "p:d:t:f:ulrcgjhxzm" arg

while getopts "p:d:t:f:ulrcgjhxzme" arg

do

        case $arg in

             p)
@@ -64,6 +65,9 @@ do 
             m)

                WITH_MKL="ON"

                ;;

             e)

               WITH_PROMETHEUS="OFF"

                ;;

             h) # help

                echo "
@@ -80,10 +84,11 @@ parameter: 
-j: use jfrog cache build directory(default: OFF)

-g: build GPU version(default: OFF)

-m: build with MKL(default: OFF)

-e: build without prometheus

-h: help



usage:

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-h]

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-e] [-h]

                "

                exit 0

                ;;
@@ -118,6 +123,7 @@ CMAKE_CMD="cmake \ 
-DCUSTOMIZATION=${CUSTOMIZATION} \

-DMILVUS_GPU_VERSION=${GPU_VERSION} \

-DFAISS_WITH_MKL=${WITH_MKL} \

-DMILVUS_WITH_PROMETHEUS=${WITH_PROMETHEUS} \

../"

echo ${CMAKE_CMD}

${CMAKE_CMD}

core/src/CMakeLists.txt

+24 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ endforeach () 
aux_source_directory(${MILVUS_ENGINE_SRC}/cache cache_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/config config_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/metrics metrics_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/metrics/prometheus metrics_prometheus_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db db_main_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db/engine db_engine_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db/insert db_insert_files)
@@ -91,6 +92,11 @@ set(engine_files 
        ${wrapper_files}

        )



if (MILVUS_WITH_PROMETHEUS)

    set(engine_files ${engine_files}

            ${metrics_prometheus_files})

endif ()



set(client_grpc_lib

        grpcpp_channelz

        grpc++
@@ -115,7 +121,6 @@ set(third_party_libs 
        sqlite

        ${client_grpc_lib}

        yaml-cpp

        ${prometheus_lib}

        mysqlpp

        zlib

        ${boost_lib}
@@ -138,13 +143,19 @@ if (MILVUS_GPU_VERSION) 
            )

endif ()



if (MILVUS_ENABLE_PROFILING STREQUAL "ON")

if (MILVUS_ENABLE_PROFILING)

    set(third_party_libs ${third_party_libs}

            gperftools

            libunwind

            )

endif ()



if (MILVUS_WITH_PROMETHEUS)

    set(third_party_libs ${third_party_libs}

            ${prometheus_lib}

            )

endif ()



set(engine_libs

        pthread

        libgomp.a
@@ -166,12 +177,21 @@ target_link_libraries(milvus_engine 
        ${engine_libs}

        )



if (MILVUS_WITH_PROMETHEUS)

    add_library(metrics STATIC ${metrics_files} ${metrics_prometheus_files})

else ()

    add_library(metrics STATIC ${metrics_files})

endif ()



set(metrics_lib

        yaml-cpp

        )



if (MILVUS_WITH_PROMETHEUS)

    set(metrics_lib ${metrics_lib}

            ${prometheus_lib}

            )

endif ()



target_link_libraries(metrics ${metrics_lib})

core/src/metrics/Metrics.cpp

+7 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 
// under the License.



#include "metrics/Metrics.h"

#include "PrometheusMetrics.h"

#include "server/Config.h"

#ifdef MILVUS_WITH_PROMETHEUS

#include "metrics/prometheus/PrometheusMetrics.h"

#endif



#include <string>
@@ -37,11 +39,15 @@ Metrics::CreateMetricsCollector() { 


    config.GetMetricConfigCollector(collector_type_str);



#ifdef MILVUS_WITH_PROMETHEUS

    if (collector_type_str == "prometheus") {

        return PrometheusMetrics::GetInstance();

    } else {

        return MetricsBase::GetInstance();

    }

#else

    return MetricsBase::GetInstance();

#endif

}



}  // namespace server