Merge pull request #1701 from eeff/eeff/dev

feat: add license tag metrics
This commit is contained in:
fengzeroz
2023-11-27 16:42:36 +08:00
committed by GitHub
3 changed files with 16 additions and 7 deletions
+2
View File
@@ -179,6 +179,8 @@ typedef struct {
size_t disk_used_gibibytes;
size_t disk_avail_gibibytes;
bool core_dumped;
uint64_t license_max_tags;
uint64_t license_used_tags;
uint64_t uptime_seconds;
size_t north_nodes;
size_t north_running_nodes;
+11 -4
View File
@@ -68,6 +68,12 @@
"# HELP uptime_seconds Uptime in seconds\n" \
"# TYPE uptime_seconds counter\n" \
"uptime_seconds %" PRIu64 "\n" \
"# HELP license_max_tags License tags limit\n" \
"# TYPE license_max_tags gauge\n" \
"license_max_tags %" PRIu64 "\n" \
"# HELP license_used_tags License total used tags\n" \
"# TYPE license_used_tags gauge\n" \
"license_used_tags %" PRIu64 "\n" \
"# HELP north_nodes_total Number of north nodes\n" \
"# TYPE north_nodes_total gauge\n" \
"north_nodes_total %zu\n" \
@@ -151,10 +157,11 @@ static inline void gen_global_metrics(const neu_metrics_t *metrics,
metrics->mem_used_bytes, metrics->mem_cache_bytes,
metrics->mem_used_bytes, metrics->disk_size_gibibytes,
metrics->disk_used_gibibytes, metrics->disk_avail_gibibytes,
metrics->core_dumped, metrics->uptime_seconds, metrics->north_nodes,
metrics->north_running_nodes, metrics->north_disconnected_nodes,
metrics->south_nodes, metrics->south_running_nodes,
metrics->south_disconnected_nodes);
metrics->core_dumped, metrics->uptime_seconds,
metrics->license_max_tags, metrics->license_used_tags,
metrics->north_nodes, metrics->north_running_nodes,
metrics->north_disconnected_nodes, metrics->south_nodes,
metrics->south_running_nodes, metrics->south_disconnected_nodes);
}
static inline void
+3 -3
View File
@@ -33,9 +33,9 @@
#include "utils/log.h"
#include "utils/time.h"
static pthread_rwlock_t g_metrics_mtx_ = PTHREAD_RWLOCK_INITIALIZER;
static neu_metrics_t g_metrics_;
static uint64_t g_start_ts_;
pthread_rwlock_t g_metrics_mtx_ = PTHREAD_RWLOCK_INITIALIZER;
neu_metrics_t g_metrics_;
static uint64_t g_start_ts_;
static void find_os_info()
{