Sfoglia il codice sorgente

[Minor] Add average scan time metric

Issue: #4096
tags/3.2
Vsevolod Stakhov 2 anni fa
parent
commit
8bd5500b3f
Nessun account collegato all'indirizzo email del committer
1 ha cambiato i file con 11 aggiunte e 0 eliminazioni
  1. 11
    0
      src/controller.c

+ 11
- 0
src/controller.c Vedi File

@@ -2563,6 +2563,7 @@ rspamd_controller_handle_savemap (struct rspamd_http_connection_entry *conn_ent,

struct rspamd_stat_cbdata {
struct rspamd_http_connection_entry *conn_ent;
struct rspamd_controller_worker_ctx *ctx;
ucl_object_t *top;
ucl_object_t *stat;
struct rspamd_task *task;
@@ -2655,6 +2656,7 @@ rspamd_controller_handle_stat_common (
cbdata = rspamd_mempool_alloc0 (session->pool, sizeof (*cbdata));
cbdata->conn_ent = conn_ent;
cbdata->task = task;
cbdata->ctx = ctx;
top = ucl_object_typed_new (UCL_OBJECT);
cbdata->top = top;

@@ -2719,6 +2721,7 @@ rspamd_controller_handle_stat_common (
ucl_object_fromint (stat->control_connections_count),
"control_connections", 0, false);


ucl_object_insert_key (top,
ucl_object_fromint (mem_st.pools_allocated), "pools_allocated", 0,
false);
@@ -2834,6 +2837,13 @@ rspamd_controller_metrics_fin_task (void *ud) {
rspamd_printf_fstring (&output, "rspamd_config{id=\"%s\"} 1\n",
ucl_object_tostring (ucl_object_lookup (top, "config_id")));

gsize cnt = MAX_AVG_TIME_SLOTS;
float sum = rspamd_sum_floats (cbdata->ctx->worker->srv->stat->avg_time.avg_time, &cnt);
rspamd_printf_fstring (&output, "# HELP rspamd_scan_time_average Average messages scan time.\n");
rspamd_printf_fstring (&output, "# TYPE rspamd_scan_time_average gauge\n");
rspamd_printf_fstring (&output, "rspamd_scan_time_average %f\n",
cnt > 0 ? (double)sum / cnt : 0.0);

rspamd_controller_metrics_add_integer(&output, top,
"process_start_time_seconds",
"gauge",
@@ -3085,6 +3095,7 @@ rspamd_controller_handle_metrics_common (
cbdata = rspamd_mempool_alloc0 (session->pool, sizeof (*cbdata));
cbdata->conn_ent = conn_ent;
cbdata->task = task;
cbdata->ctx = ctx;
top = ucl_object_typed_new (UCL_OBJECT);
cbdata->top = top;


Loading…
Annulla
Salva