From dcc6752495e8b07e8d4ee6c97190572caba03896 Mon Sep 17 00:00:00 2001
From: yu yunfeng <yunfeng.yu@zilliz.com>
Date: Thu, 30 May 2019 15:01:07 +0800
Subject: [PATCH] add task in changelog

Former-commit-id: a88c6ecd7b97dccadb492c5df94729da2e52f136
---
 cpp/CHANGELOG.md                   | 1 +
 cpp/CMakeLists.txt                 | 6 +++---
 cpp/cmake/ThirdPartyPackages.cmake | 2 ++
 cpp/conf/server_config.yaml        | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index efb810e2..0088389a 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -23,3 +23,4 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-4 - Refactor the vecwise_engine code structure
 - MS-20 - Clean Code Part 1
 - MS-30 - Use faiss v1.5.2
+- MS-34 - Fix prometheus-cpp thirdparty
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index f4e32948..b6b8ad1a 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -70,9 +70,9 @@ endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-#if (BUILD_UNIT_TEST)
-#    option(MEGASEARCH_BUILD_TESTS "Build the megasearch test suite" ON)
-#endif(BUILD_UNIT_TEST)
+if (BUILD_UNIT_TEST)
+    option(MEGASEARCH_BUILD_TESTS "Build the megasearch test suite" ON)
+endif(BUILD_UNIT_TEST)
 
 include(ExternalProject)
 include(DefineOptions)
diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 0b08cd35..cd367262 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -977,6 +977,8 @@ if(MEGASEARCH_WITH_PROMETHEUS)
 
     link_directories(SYSTEM ${PROMETHEUS_PREFIX}/core/)
     include_directories(SYSTEM ${PROMETHEUS_PREFIX}/core/include)
+
+    link_directories(${PROMETHEUS_PREFIX}/civetweb_ep-prefix/src/civetweb_ep)
 endif()
 
 # ----------------------------------------------------------------------
diff --git a/cpp/conf/server_config.yaml b/cpp/conf/server_config.yaml
index 523b1f99..781a77dd 100644
--- a/cpp/conf/server_config.yaml
+++ b/cpp/conf/server_config.yaml
@@ -16,6 +16,7 @@ metric_config:
   collector: prometheus # prometheus, now we only have prometheus
   prometheus_config:
     collect_type: pull # pull means prometheus pull the message from megasearch, push means megasearch push metric to push gateway
+    port: 8080
     push_gateway_ip_address: 127.0.0.1
     push_gateway_port: 9091
 
-- 
GitLab