Merge pull request #354 from sy-c/dev

v3.19.5

Author: sy-c

CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.19.3
+  VERSION 3.19.5
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

examples/15-ODC.cxx

@@ -54,17 +54,17 @@ void httpServer(tcp::acceptor& acceptor, tcp::socket& socket) {
        response.set(http::field::content_type, "application/json");
        beast::ostream(response.body()) << R"({"results":[{"statement_id":0,"series":[{"name":"measurements","columns":["name"],"values":[["odc"]]}]}]}\n)";
      });
-     connection->addCallback("SHOW+TAG+VALUES+FROM+calibs+WHERE+partitionid",
+     connection->addCallback("SHOW+TAG+VALUES+FROM+calibs+WITH+KEY",
      [](http::request<http::dynamic_body>& request, http::response<http::dynamic_body>& response) {
-       std::string jsonPrefix = R"({"results": [{"statement_id": 0, "series": [{"name": "odc_calibs", "columns": ["key", "value"], "values": [)";
+       std::string jsonPrefix = R"({"results": [{"statement_id": 0, "series": [{"name": "odc_calibs", "columns": ["value"], "values": [)";
        std::string jsonSuffix = R"(]}]}]})";
        response.set(http::field::content_type, "application/json");
        std::string calibJson;
        std::string id = std::string(request.target().substr(request.target().find("WHERE+partitionid+%3D+") + 22));
        const std::lock_guard<std::mutex> lock(gMapAccess);
        if (gStats.find(id) != gStats.end()) {
          for (auto const& calib : gStats.at(id).TasksPerCalib) {
-           calibJson += "[\"calib\", \"" + calib.first + "\"],";
+           calibJson += "[\"" + calib.first + "\"],";
          }
        }
        if (!calibJson.empty()) {