From 6edb446321bb6773c60a424c136d79d5c3b5b6f4 Mon Sep 17 00:00:00 2001 From: "linuxrc@163.com" Date: Wed, 8 Jan 2020 17:33:04 +0800 Subject: 增加fieldstat2输出到grafana MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SSL_Analyze.c | 7 +++++++ src/SSL_Analyze.h | 3 +++ 2 files changed, 10 insertions(+) (limited to 'src') diff --git a/src/SSL_Analyze.c b/src/SSL_Analyze.c index 73dbbad..b646220 100644 --- a/src/SSL_Analyze.c +++ b/src/SSL_Analyze.c @@ -124,6 +124,10 @@ int ssl_readMainConf(const char* filename) MESA_load_profile_string_def(filename, "FUNCTION", "stat_file", g_ssl_prog_para.stat_filename, sizeof(g_ssl_prog_para.stat_filename),"./log/ssl/ssl_stat.log"); MESA_load_profile_short_def(filename, "FUNCTION", "switch_no_biz", (short*)&g_ssl_prog_para.ssl_switch_no_biz,0); + MESA_load_profile_string_def(filename, "FUNCTION", "STAT_FIELD_APPNAME", g_ssl_prog_para.stat_appname, 16, "MAIL"); + MESA_load_profile_string_def(filename, "FUNCTION", "STAT_FIELD_DST_IP", g_ssl_prog_para.stat_dst_ip, 64, "127.0.0.1"); + MESA_load_profile_int_def(filename, "FUNCTION", "STAT_FIELD_DST_PORT", &g_ssl_prog_para.stat_dst_port, 8125); + return 0; } @@ -152,6 +156,9 @@ int SSL_INIT(void) FS_set_para(g_ssl_prog_para.stat_handler, PRINT_TRIGGER, &value, sizeof(value)); value = 1; FS_set_para(g_ssl_prog_para.stat_handler, CREATE_THREAD, &value, sizeof(value)); + FS_set_para(g_ssl_prog_para.stat_handler, APP_NAME, g_ssl_prog_para.stat_appname, strlen(g_ssl_prog_para.stat_appname)+1); + FS_set_para(g_ssl_prog_para.stat_handler, STATS_SERVER_IP, g_ssl_prog_para.stat_dst_ip, strlen(g_ssl_prog_para.stat_dst_ip)+1); + FS_set_para(g_ssl_prog_para.stat_handler, STATS_SERVER_PORT, &g_ssl_prog_para.stat_dst_port, sizeof(g_ssl_prog_para.stat_dst_port)); g_ssl_prog_para.stat_field[SSL_STAT_PKTS_C2S] = FS_register(g_ssl_prog_para.stat_handler,FS_STYLE_FIELD,FS_CALC_CURRENT,"ssl_c2s_pkts"); g_ssl_prog_para.stat_field[SSL_STAT_PKTS_S2C] = FS_register(g_ssl_prog_para.stat_handler,FS_STYLE_FIELD,FS_CALC_CURRENT,"ssl_s2c_pkts"); g_ssl_prog_para.stat_field[SSL_STAT_BITS_C2S] = FS_register(g_ssl_prog_para.stat_handler,FS_STYLE_FIELD,FS_CALC_CURRENT,"ssl_c2s_bytes"); diff --git a/src/SSL_Analyze.h b/src/SSL_Analyze.h index 58718ba..0637789 100644 --- a/src/SSL_Analyze.h +++ b/src/SSL_Analyze.h @@ -65,8 +65,11 @@ typedef struct ssl_prog_runtime_parameter_t int ssl_switch_no_biz; int stat_field[SSL_MAX_STAT_FIELD]; + int stat_dst_port; uint64_t stat_value[SSL_MAX_STAT_FIELD]; char stat_filename[256]; + char stat_dst_ip[64]; + char stat_appname[16]; }ssl_prog_runtime_parameter_t; -- cgit v1.2.3