【腾讯犀牛鸟开源课题实战】prometheus插件专项建设（PUSH模式支持等） #175
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #include <chrono> | ||
|
|
||
| #include <thread> | ||
| #include "trpc/metrics/prometheus/prometheus_metrics_api.h" | ||
| #include "trpc/log/trpc_log.h" | ||
|
|
||
|
|
||
|
|
||
| int main(int argc, char** argv) { | ||
|
|
||
| while (true) { | ||
| if (::trpc::prometheus::PushMetricsInfo()) | ||
| { | ||
| std::cout << "Successfully pushed metrics to Pushgateway" << std::endl; | ||
| } else { | ||
| std::cerr << "Failed to push metrics to Pushgateway" << std::endl; | ||
| } | ||
|
|
||
| std::this_thread::sleep_for(std::chrono::seconds(5)); // 每60秒推送一次 | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <div id="layer1"> | ||
|
|
||
| <p class="nonplot-variable">gcc_version: <span id="value-gcc_version">11.4.0</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">kernel: <span id="value-kernel">Linux 1dab1b7b0173 5.15.0-113-generic #123~20.04.1-Ubuntu SMP Wed Jun 12 17:33:13 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux | ||
| </span></p> | ||
| <br> | ||
| <p class="nonplot-variable">core_nums: <span id="value-core_nums">80</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">user_name: <span id="value-user_name">unknown</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">work_directory: <span id="value-work_directory">/home/TRPC/trpc-cpp</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">command_line: <span id="value-command_line">./bazel-bin/examples/features/prometheus/proxy/forward_server | ||
| --config=examples/features/prometheus/proxy/trpc_cpp_fiber.yaml | ||
| </span></p> | ||
| <br> | ||
| <p class="nonplot-variable">running_time: <span id="value-running_time">15.100000(hours)</span></p> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_loadavg_1m: <span id="value-proc_loadavg_1m">18.080000</span></u></font></p> | ||
| <div class="detail"><div id="proc_loadavg_1m" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_loadavg_5m: <span id="value-proc_loadavg_5m">33.330000</span></u></font></p> | ||
| <div class="detail"><div id="proc_loadavg_5m" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_loadavg_15m: <span id="value-proc_loadavg_15m">33.260000</span></u></font></p> | ||
| <div class="detail"><div id="proc_loadavg_15m" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_real_time: <span id="value-proc_real_time">1076(secs)</span></u></font></p> | ||
| <div class="detail"><div id="proc_real_time" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_sys_time: <span id="value-proc_sys_time">700(secs)</span></u></font></p> | ||
| <div class="detail"><div id="proc_sys_time" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_user_time: <span id="value-proc_user_time">376(secs)</span></u></font></p> | ||
| <div class="detail"><div id="proc_user_time" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="nonplot-variable">pgrp: <span id="value-pgrp">1271218</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">ppid: <span id="value-ppid">1262277</span></p> | ||
| <br> | ||
| <p class="nonplot-variable">pid: <span id="value-pid">1271218</span></p> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_faults_major: <span id="value-proc_faults_major">0</span></u></font></p> | ||
| <div class="detail"><div id="proc_faults_major" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_faults_minor_second: <span id="value-proc_faults_minor_second">567953</span></u></font></p> | ||
| <div class="detail"><div id="proc_faults_minor_second" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="nonplot-variable">fd_count: <span id="value-fd_count">21</span></p> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_io_read_bytes_second: <span id="value-proc_io_read_bytes_second">8192</span></u></font></p> | ||
| <div class="detail"><div id="proc_io_read_bytes_second" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_io_read_second: <span id="value-proc_io_read_second">257383</span></u></font></p> | ||
| <div class="detail"><div id="proc_io_read_second" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_io_write_bytes_second: <span id="value-proc_io_write_bytes_second">44539904</span></u></font></p> | ||
| <div class="detail"><div id="proc_io_write_bytes_second" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_io_write_second: <span id="value-proc_io_write_second">10908</span></u></font></p> | ||
| <div class="detail"><div id="proc_io_write_second" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_mem_drs: <span id="value-proc_mem_drs">171592</span></u></font></p> | ||
| <div class="detail"><div id="proc_mem_drs" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_mem_resident: <span id="value-proc_mem_resident">33043</span></u></font></p> | ||
| <div class="detail"><div id="proc_mem_resident" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_mem_share: <span id="value-proc_mem_share">3177</span></u></font></p> | ||
| <div class="detail"><div id="proc_mem_share" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_mem_trs: <span id="value-proc_mem_trs">3385</span></u></font></p> | ||
| <div class="detail"><div id="proc_mem_trs" class="flot-placeholder"></div></div> | ||
| <br> | ||
| <p class="variable"><font color='#0000FF'><u>proc_mem_size: <span id="value-proc_mem_size">486951</span></u></font></p> | ||
| <div class="detail"><div id="proc_mem_size" class="flot-placeholder"></div></div> | ||
| <br> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,66 @@ | |
|
|
||
| namespace trpc::admin { | ||
|
|
||
| PrometheusHandler::PrometheusHandler() { | ||
| description_ = "[GET /metrics] get prometheus metrics"; | ||
| bool ret = TrpcConfig::GetInstance()->GetPluginConfig<PrometheusConfig>( | ||
| "metrics", trpc::prometheus::kPrometheusMetricsName, prometheus_conf_); | ||
| if (!ret) { | ||
| TRPC_LOG_WARN( | ||
| "Failed to obtain Prometheus plugin configuration from the framework configuration file. Default configuration " | ||
| "will be used."); | ||
| } | ||
| auto& cfg = prometheus_conf_.auth_cfg; | ||
| if (cfg.count("username") && cfg.count("password")) { | ||
| username_ = cfg["username"]; | ||
| password_ = cfg["password"]; | ||
| has_cfg = true; | ||
| } else { | ||
| TRPC_LOG_INFO("can not found prometheus auth config"); | ||
| has_cfg = false; | ||
| } | ||
|
There was a problem hiding this comment. 构造函数做了太复杂的事情，可以定义一个Init函数，把这部分逻辑放在Init函数里 |
||
| } | ||
|
|
||
| void PrometheusHandler::CommandHandle(http::HttpRequestPtr req, rapidjson::Value& result, | ||
| rapidjson::Document::AllocatorType& alloc) { | ||
| static std::unique_ptr<::prometheus::Serializer> serializer = std::make_unique<::prometheus::TextSerializer>(); | ||
|
|
||
| if (has_cfg) { | ||
|
There was a problem hiding this comment. has_cfg变量名不好，看起来只跟鉴权判断相关，同时可以考虑把鉴权相关信息统一放在一个结构体里。 |
||
| std::string token = req->GetHeader("Authorization"); | ||
|
There was a problem hiding this comment. 这块逻辑有啥用？看起来只是判断用户名和密码是否匹配，判断之后有啥用？ There was a problem hiding this comment. 只有用户名密码都正确的情况下，才会返回metric数据，否则拒绝请求。 There was a problem hiding this comment. 用户名和密码，在prometheus的gateway服务哪里能配置呢？文档有给出吗？ There was a problem hiding this comment. 想起来了，这是pull模式的，那用户名和密码在prometheus服务器里哪里能配置呢？ There was a problem hiding this comment. 文档我还没有写，确认一下，Prometheus鉴权相关的使用方法是直接添加在prometheus_metrics.md吗？ |
||
| auto splited = Split(token, ' '); | ||
|
|
||
| if (splited.size() != 2) { | ||
| result.AddMember("message", "wrong request without authorization", alloc); | ||
| TRPC_LOG_INFO("error token: " << token); | ||
| return; | ||
| } | ||
| if (splited[0] != "Basic") { | ||
| result.AddMember("message", "wrong request without right auth", alloc); | ||
| TRPC_LOG_INFO("error token: " << token); | ||
| return; | ||
| } | ||
|
|
||
| std::string username_pwd = http::Base64Decode(std::begin(splited[1]), std::end(splited[1])); | ||
| auto sp = Split(username_pwd, ':'); | ||
| if (sp.size() != 2) { | ||
| result.AddMember("message", "wrong request without authorization", alloc); | ||
| TRPC_LOG_INFO("error token: " << token); | ||
|
|
||
| return; | ||
weimch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| auto username = sp[0]; | ||
| if (username != username_) { | ||
| result.AddMember("message", "wrong request without right username", alloc); | ||
| TRPC_LOG_INFO("error username: " << username << ",right username: " << username_); | ||
| return; | ||
| } | ||
| auto pwd = sp[1]; | ||
| if (pwd != password_) { | ||
| result.AddMember("message", "wrong request without right password", alloc); | ||
| TRPC_LOG_INFO("error password: " << pwd << ",right password: " << password_); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| std::string prometheus_str = serializer->Serialize(trpc::prometheus::Collect()); | ||
| result.AddMember(rapidjson::StringRef("trpc-html"), rapidjson::Value(prometheus_str, alloc).Move(), alloc); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
默认关闭prometheus，这行可以删掉