add configuration for prometheus export

pbench · Mar 28, 2018 · bbe92ee · bbe92ee
1 parent adfbe18
commit bbe92ee
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/build_navitia.sh b/build_navitia.sh
@@ -138,7 +138,7 @@ mkdir -p "$run_dir"
 sed -i 's,git\@github.com:\([^/]*\)/\(.*\).git,https://github.com/\1/\2,' .gitmodules
 
 #we need to get the submodules
-git submodule update --init
+git submodule update --init --recursive
 
 #========
 #Building

diff --git a/source/kraken/configuration.cpp b/source/kraken/configuration.cpp
@@ -72,6 +72,8 @@ po::options_description get_options_description(const boost::optional<std::strin
         ("GENERAL.log_level", po::value<std::string>(), "log level of kraken")
         ("GENERAL.log_format", po::value<std::string>()->default_value("[%D{%y-%m-%d %H:%M:%S,%q}] [%p] [%x] - %m %b:%L  %n"), "log format")
 
+        ("GENERAL.metrics_binding", po::value<std::string>(), "IP:PORT to serving metrics in http")
+
         ("BROKER.host", po::value<std::string>()->default_value("localhost"), "host of rabbitmq")
         ("BROKER.port", po::value<int>()->default_value(5672), "port of rabbitmq")
         ("BROKER.username", po::value<std::string>()->default_value("guest"), "username for rabbitmq")
@@ -235,4 +237,12 @@ boost::optional<std::string> Configuration::log_format() const{
     }
     return result;
 }
+
+boost::optional<std::string> Configuration::metrics_binding() const{
+    boost::optional<std::string> result;
+    if (this->vm.count("GENERAL.metrics_binding") > 0) {
+        result = this->vm["GENERAL.metrics_binding"].as<std::string>();
+    }
+    return result;
+}
 }}//namespace
diff --git a/source/kraken/configuration.h b/source/kraken/configuration.h
@@ -63,6 +63,7 @@ namespace navitia { namespace kraken{
             int slow_request_duration() const;
             boost::optional<std::string> log_level() const;
             boost::optional<std::string> log_format() const;
+            boost::optional<std::string> metrics_binding() const;
 
             std::vector<std::string> rt_topics() const;
     };

diff --git a/source/kraken/kraken_zmq.cpp b/source/kraken/kraken_zmq.cpp
@@ -101,9 +101,10 @@ int main(int argn, char** argv){
         return 1;
     }
 
+    navitia::Metrics metrics(conf.metrics_binding());
+
     threads.create_thread(navitia::MaintenanceWorker(data_manager, conf));
 
-    navitia::Metrics metrics(boost::make_optional(std::string("127.0.0.1:8080")));
 
     int nb_threads = conf.nb_threads();
     // Launch pool of worker threads

diff --git a/source/kraken/metrics.h b/source/kraken/metrics.h
@@ -37,6 +37,8 @@ www.navitia.io
 #include "type/type.pb.h"
 #include <boost/optional.hpp>
 
+#include <boost/utility.hpp>
+
 //forward declare
 namespace prometheus{
     class Registry;
@@ -45,7 +47,7 @@ namespace prometheus{
 }
 
 namespace navitia {
-class Metrics{
+class Metrics: boost::noncopyable {
     protected:
         std::unique_ptr<prometheus::Exposer> exposer;
         std::shared_ptr<prometheus::Registry> registry;