vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-07-09 16:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add --clickhouse-server-cn option
Some checks are pending
Build / build (push) Waiting to run
Details
CIFuzz / Fuzzing (address) (push) Waiting to run
Details
CodeQL / Analyze (push) Waiting to run
Details
CodeQL / Analyze-1 (push) Waiting to run
Details

Browse source
This commit is contained in:
Alfredo Cardigliano 2026-07-09 06:30:39 +02:00
parent 30961dd5e9
commit d1762b5f6f
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Prefs.h
View file

@ -195,6 +195,7 @@ class Prefs {
char* clickhouse_pw;
char* clickhouse_ro_user;
char* clickhouse_ro_pw;
char* clickhouse_server_cn;
#if defined(HAVE_CLICKHOUSE) && defined(NTOPNG_PRO)
char* clickhouse_cluster_user; /* In case of ch cloud, 2 users are needed,
one for mysql and one for ch */
@ -553,6 +554,7 @@ class Prefs {
inline char* get_clickhouse_pw() { return (clickhouse_pw); };
inline char* get_clickhouse_ro_user() { return (clickhouse_ro_user); };
inline char* get_clickhouse_ro_pw() { return (clickhouse_ro_pw); };
inline char* get_clickhouse_server_cn() { return (clickhouse_server_cn); };
#if !defined(WIN32) && !defined(__APPLE__)
inline int get_flows_syslog_facility() { return (flows_syslog_facility); };

28
src/Prefs.cpp
View file

@ -232,6 +232,7 @@ Prefs::Prefs(Ntop* _ntop) {
clickhouse_host = clickhouse_dbname = clickhouse_user = clickhouse_pw = NULL;
clickhouse_ro_user = clickhouse_ro_pw = NULL;
clickhouse_server_cn = NULL;
#if defined(HAVE_CLICKHOUSE) && defined(NTOPNG_PRO)
clickhouse_cluster_user = NULL;
ntopng_assets_inventory_enabled = true;
@ -347,6 +348,7 @@ Prefs::~Prefs() {
if (clickhouse_pw) free(clickhouse_pw);
if (clickhouse_ro_user) free(clickhouse_ro_user);
if (clickhouse_ro_pw) free(clickhouse_ro_pw);
if (clickhouse_server_cn) free(clickhouse_server_cn);
if (ls_host) free(ls_host);
if (ls_port) free(ls_port);
if (ls_proto) free(ls_proto);
@ -717,7 +719,6 @@ void usage() {
#ifndef HAVE_NEDGE
#if defined(HAVE_KAFKA) && defined(NTOPNG_PRO)
printf(
" |\n"
" | kafka Dump to Kafka (Enterprise "
"M/L/XL/XXL)\n"
" | Format:\n"
@ -736,16 +737,13 @@ void usage() {
#endif
#endif
#ifdef NTOPNG_PRO
#if defined(HAVE_CLICKHOUSE) && defined(NTOPNG_PRO)
printf(
"[--dump-queue-len] <len> | Set the in-memory ClickHouse dump "
"queue length (Default: %u)\n"
"[--dump-queue-block-size] <size> | Set the in-memory ClickHouse data "
"block size (Default: %u)\n"
"[--direct-flows-dump] | Dump collected flows directly "
"before any additional processing\n"
"[--readonly-flows-dump] | Keep ClickHouse connected for "
"reading but disable flow dump (writing)\n",
"[--clickhouse-server-cn] <name> | Server name (CN) to use for TLS certificate verification when connecting to ClickHouse\n"
"[--dump-queue-len] <len> | Set the in-memory ClickHouse dump queue length (Default: %u)\n"
"[--dump-queue-block-size] <size> | Set the in-memory ClickHouse data block size (Default: %u)\n"
"[--direct-flows-dump] | Dump collected flows directly before any additional processing\n"
"[--readonly-flows-dump] | Keep ClickHouse connected for reading but disable flow dump (writing)\n",
CLICKHOUSE_MAX_DUMP_BLOCKS, CLICKHOUSE_MAX_DUMP_ROWS_PER_BLOCK);
#endif
printf(
@ -1438,6 +1436,9 @@ static const struct option long_options[] = {
{"redis-tls-skip-verify", no_argument, NULL, 233},
#endif
#ifdef NTOPNG_PRO
#if defined(HAVE_CLICKHOUSE)
{"clickhouse-server-cn", required_argument, NULL, 247},
#endif
{"dump-queue-len", no_argument, NULL, 248},
{"dump-queue-block-size", no_argument, NULL, 249},
{"direct-flows-dump", no_argument, NULL, 250},
@ -2611,6 +2612,13 @@ int Prefs::setOption(int optkey, char* optarg) {
#endif
#ifdef NTOPNG_PRO
#if defined(HAVE_CLICKHOUSE)
case 247:
if (clickhouse_server_cn) free(clickhouse_server_cn);
clickhouse_server_cn = strdup(optarg);
break;
#endif
case 248:
dump_queue_len = atoi(optarg);
break;