1aacfdf460
The API req->param["name"] to access parameters in the path part of the URL was buggy - it forgot to do URL decoding and the result of our use of it in Scylla was bugs like #5883 - where special characters in certain REST API requests got botched up (encoded by the client, then not decoded by the server). The solution is to replace all uses of req->param["name"] by the new req->get_path_param("name"), which does the decoding correctly. Unfortunately we needed to change 104 (!) callers in this patch, but the transformation is mostly mechanical and there is no functional changes in this patch. Another set of changes was to bring req, not req->param, to a few functions that want to get the path param. This patch avoids the numerous deprecation warnings we had before, and more importantly, it fixes #5883. Signed-off-by: Nadav Har'El <nyh@scylladb.com>
127 lines
4.2 KiB
C++
127 lines
4.2 KiB
C++
/*
|
|
* Copyright (C) 2015-present ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
|
*/
|
|
|
|
#include "collectd.hh"
|
|
#include "api/api-doc/collectd.json.hh"
|
|
#include <seastar/core/scollectd.hh>
|
|
#include <seastar/core/scollectd_api.hh>
|
|
#include <boost/range/irange.hpp>
|
|
#include <regex>
|
|
#include "api/api_init.hh"
|
|
|
|
namespace api {
|
|
|
|
using namespace scollectd;
|
|
using namespace httpd;
|
|
|
|
using namespace json;
|
|
namespace cd = httpd::collectd_json;
|
|
|
|
static auto transformer(const std::vector<collectd_value>& values) {
|
|
cd::collectd_value collected_value;
|
|
for (auto v: values) {
|
|
switch (v._type) {
|
|
case scollectd::data_type::GAUGE:
|
|
collected_value.values.push(v.d());
|
|
break;
|
|
case scollectd::data_type::COUNTER:
|
|
collected_value.values.push(v.ui());
|
|
break;
|
|
case scollectd::data_type::REAL_COUNTER:
|
|
collected_value.values.push(v.d());
|
|
break;
|
|
default:
|
|
collected_value.values.push(v.ui());
|
|
break;
|
|
}
|
|
}
|
|
return collected_value;
|
|
}
|
|
|
|
|
|
static const char* str_to_regex(const sstring& v) {
|
|
if (v != "") {
|
|
return v.c_str();
|
|
}
|
|
return ".*";
|
|
}
|
|
|
|
void set_collectd(http_context& ctx, routes& r) {
|
|
cd::get_collectd.set(r, [](std::unique_ptr<request> req) {
|
|
|
|
auto id = ::make_shared<scollectd::type_instance_id>(req->get_path_param("pluginid"),
|
|
req->get_query_param("instance"), req->get_query_param("type"),
|
|
req->get_query_param("type_instance"));
|
|
|
|
|
|
return do_with(std::vector<cd::collectd_value>(), [id] (auto& vec) {
|
|
vec.resize(smp::count);
|
|
return parallel_for_each(boost::irange(0u, smp::count), [&vec, id] (auto cpu) {
|
|
return smp::submit_to(cpu, [id = *id] {
|
|
return scollectd::get_collectd_value(id);
|
|
}).then([&vec, cpu] (auto res) {
|
|
vec[cpu] = transformer(res);
|
|
});
|
|
}).then([&vec] {
|
|
return make_ready_future<json::json_return_type>(vec);
|
|
});
|
|
});
|
|
});
|
|
|
|
cd::get_collectd_items.set(r, [](const_req req) {
|
|
std::vector<cd::collectd_metric_status> res;
|
|
auto ids = scollectd::get_collectd_ids();
|
|
for (auto i: ids) {
|
|
cd::type_instance_id id;
|
|
id.plugin = i.plugin();
|
|
id.plugin_instance = i.plugin_instance();
|
|
id.type = i.type();
|
|
id.type_instance = i.type_instance();
|
|
cd::collectd_metric_status it;
|
|
it.id = id;
|
|
it.enable = scollectd::is_enabled(i);
|
|
res.push_back(it);
|
|
}
|
|
return res;
|
|
});
|
|
|
|
cd::enable_collectd.set(r, [](std::unique_ptr<request> req) -> future<json::json_return_type> {
|
|
std::regex plugin(req->get_path_param("pluginid").c_str());
|
|
std::regex instance(str_to_regex(req->get_query_param("instance")));
|
|
std::regex type(str_to_regex(req->get_query_param("type")));
|
|
std::regex type_instance(str_to_regex(req->get_query_param("type_instance")));
|
|
bool enable = strcasecmp(req->get_query_param("enable").c_str(), "true") == 0;
|
|
return smp::invoke_on_all([enable, plugin, instance, type, type_instance]() {
|
|
for (auto id: scollectd::get_collectd_ids()) {
|
|
if (std::regex_match(std::string(id.plugin()), plugin) &&
|
|
std::regex_match(std::string(id.plugin_instance()), instance) &&
|
|
std::regex_match(std::string(id.type()), type) &&
|
|
std::regex_match(std::string(id.type_instance()), type_instance)) {
|
|
scollectd::enable(id, enable);
|
|
}
|
|
}
|
|
}).then([] {
|
|
return json::json_return_type(json_void());
|
|
});
|
|
});
|
|
|
|
cd::enable_all_collectd.set(r, [](std::unique_ptr<request> req) -> future<json::json_return_type> {
|
|
bool enable = strcasecmp(req->get_query_param("enable").c_str(), "true") == 0;
|
|
return smp::invoke_on_all([enable] {
|
|
for (auto id: scollectd::get_collectd_ids()) {
|
|
scollectd::enable(id, enable);
|
|
}
|
|
}).then([] {
|
|
return json::json_return_type(json_void());
|
|
});
|
|
});
|
|
}
|
|
|
|
}
|
|
|