summaryrefslogtreecommitdiffstats
path: root/src/collectors/network-viewer.plugin
diff options
context:
space:
mode:
Diffstat (limited to 'src/collectors/network-viewer.plugin')
-rw-r--r--src/collectors/network-viewer.plugin/network-viewer.c48
1 files changed, 27 insertions, 21 deletions
diff --git a/src/collectors/network-viewer.plugin/network-viewer.c b/src/collectors/network-viewer.plugin/network-viewer.c
index 06dde738..c0ea8af5 100644
--- a/src/collectors/network-viewer.plugin/network-viewer.c
+++ b/src/collectors/network-viewer.plugin/network-viewer.c
@@ -23,20 +23,18 @@ static SPAWN_SERVER *spawn_srv = NULL;
} aggregated_key; \
} network_viewer;
-#include "libnetdata/maps/local-sockets.h"
-#include "libnetdata/maps/system-users.h"
-#include "libnetdata/maps/system-services.h"
+#include "libnetdata/local-sockets/local-sockets.h"
+#include "libnetdata/os/system-maps/system-services.h"
#define NETWORK_CONNECTIONS_VIEWER_FUNCTION "network-connections"
#define NETWORK_CONNECTIONS_VIEWER_HELP "Network connections explorer"
#define SIMPLE_HASHTABLE_VALUE_TYPE LOCAL_SOCKET
#define SIMPLE_HASHTABLE_NAME _AGGREGATED_SOCKETS
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
netdata_mutex_t stdout_mutex = NETDATA_MUTEX_INITIALIZER;
static bool plugin_should_exit = false;
-static USERNAMES_CACHE *uc;
static SERVICENAMES_CACHE *sc;
ENUM_STR_MAP_DEFINE(SOCKET_DIRECTION) = {
@@ -80,7 +78,7 @@ struct sockets_stats {
} max;
};
-static void local_socket_to_json_array(struct sockets_stats *st, LOCAL_SOCKET *n, uint64_t proc_self_net_ns_inode, bool aggregated) {
+static void local_socket_to_json_array(struct sockets_stats *st, const LOCAL_SOCKET *n, uint64_t proc_self_net_ns_inode, bool aggregated) {
if(n->direction == SOCKET_DIRECTION_NONE)
return;
@@ -151,12 +149,12 @@ static void local_socket_to_json_array(struct sockets_stats *st, LOCAL_SOCKET *n
}
else {
// buffer_json_add_array_item_uint64(wb, n->uid);
- STRING *u = system_usernames_cache_lookup_uid(uc, n->uid);
- buffer_json_add_array_item_string(wb, string2str(u));
- string_freez(u);
+ CACHED_USERNAME cu = cached_username_get_by_uid(n->uid);
+ buffer_json_add_array_item_string(wb, string2str(cu.username));
+ cached_username_release(cu);
}
- struct socket_endpoint *server_endpoint;
+ const struct socket_endpoint *server_endpoint;
const char *server_address;
const char *client_address_space;
const char *server_address_space;
@@ -240,7 +238,9 @@ static void local_socket_to_json_array(struct sockets_stats *st, LOCAL_SOCKET *n
buffer_json_array_close(wb);
}
-static void populate_aggregated_key(LOCAL_SOCKET *n) {
+static void populate_aggregated_key(const LOCAL_SOCKET *nn) {
+ LOCAL_SOCKET *n = (LOCAL_SOCKET *)nn;
+
n->network_viewer.count = 1;
n->network_viewer.aggregated_key.pid = n->pid;
@@ -269,7 +269,7 @@ static void populate_aggregated_key(LOCAL_SOCKET *n) {
n->network_viewer.aggregated_key.remote_address_space = local_sockets_address_space(&n->remote);
}
-static void local_sockets_cb_to_json(LS_STATE *ls, LOCAL_SOCKET *n, void *data) {
+static void local_sockets_cb_to_json(LS_STATE *ls, const LOCAL_SOCKET *n, void *data) {
struct sockets_stats *st = data;
populate_aggregated_key(n);
local_socket_to_json_array(st, n, ls->proc_self_net_ns_inode, false);
@@ -280,12 +280,12 @@ static void local_sockets_cb_to_json(LS_STATE *ls, LOCAL_SOCKET *n, void *data)
#define SUM_THEM_ALL(a, b) (a) += (b)
#define OR_THEM_ALL(a, b) (a) |= (b)
-static void local_sockets_cb_to_aggregation(LS_STATE *ls __maybe_unused, LOCAL_SOCKET *n, void *data) {
+static void local_sockets_cb_to_aggregation(LS_STATE *ls __maybe_unused, const LOCAL_SOCKET *n, void *data) {
SIMPLE_HASHTABLE_AGGREGATED_SOCKETS *ht = data;
populate_aggregated_key(n);
XXH64_hash_t hash = XXH3_64bits(&n->network_viewer.aggregated_key, sizeof(n->network_viewer.aggregated_key));
- SIMPLE_HASHTABLE_SLOT_AGGREGATED_SOCKETS *sl = simple_hashtable_get_slot_AGGREGATED_SOCKETS(ht, hash, n, true);
+ SIMPLE_HASHTABLE_SLOT_AGGREGATED_SOCKETS *sl = simple_hashtable_get_slot_AGGREGATED_SOCKETS(ht, hash, (LOCAL_SOCKET *)n, true);
LOCAL_SOCKET *t = SIMPLE_HASHTABLE_SLOT_DATA(sl);
if(t) {
t->network_viewer.count++;
@@ -464,7 +464,7 @@ void network_viewer_function(const char *transaction, char *function __maybe_unu
char function_copy[strlen(function) + 1];
memcpy(function_copy, function, sizeof(function_copy));
char *words[1024];
- size_t num_words = quoted_strings_splitter_pluginsd(function_copy, words, 1024);
+ size_t num_words = quoted_strings_splitter_whitespace(function_copy, words, 1024);
for(size_t i = 1; i < num_words ;i++) {
char *param = get_word(words, num_words, i);
if(strcmp(param, "sockets:aggregated") == 0) {
@@ -511,7 +511,9 @@ void network_viewer_function(const char *transaction, char *function __maybe_unu
.max_errors = 10,
.max_concurrent_namespaces = 5,
},
+#if defined(LOCAL_SOCKETS_USE_SETNS)
.spawn_server = spawn_srv,
+#endif
.stats = { 0 },
.sockets_hashtable = { 0 },
.local_ips_hashtable = { 0 },
@@ -945,7 +947,10 @@ close_and_send:
buffer_json_finalize(wb);
netdata_mutex_lock(&stdout_mutex);
- pluginsd_function_result_to_stdout(transaction, HTTP_RESP_OK, "application/json", now_s + 1, wb);
+ wb->response_code = HTTP_RESP_OK;
+ wb->content_type = CT_APPLICATION_JSON;
+ wb->expires = now_s + 1;
+ pluginsd_function_result_to_stdout(transaction, wb);
netdata_mutex_unlock(&stdout_mutex);
}
@@ -953,20 +958,22 @@ close_and_send:
// main
int main(int argc __maybe_unused, char **argv __maybe_unused) {
- clocks_init();
nd_thread_tag_set("NETWORK-VIEWER");
nd_log_initialize_for_external_plugins("network-viewer.plugin");
netdata_configured_host_prefix = getenv("NETDATA_HOST_PREFIX");
if(verify_netdata_host_prefix(true) == -1) exit(1);
+#if defined(LOCAL_SOCKETS_USE_SETNS)
spawn_srv = spawn_server_create(SPAWN_SERVER_OPTION_CALLBACK, "setns", local_sockets_spawn_server_callback, argc, (const char **)argv);
if(spawn_srv == NULL) {
fprintf(stderr, "Cannot create spawn server.\n");
exit(1);
}
+#endif
- uc = system_usernames_cache_init();
+ cached_usernames_init();
+ update_cached_host_users();
sc = system_servicenames_cache_init();
// ----------------------------------------------------------------------------------------------------------------
@@ -1008,15 +1015,14 @@ int main(int argc __maybe_unused, char **argv __maybe_unused) {
// ----------------------------------------------------------------------------------------------------------------
- usec_t step_ut = 100 * USEC_PER_MS;
usec_t send_newline_ut = 0;
bool tty = isatty(fileno(stdout)) == 1;
heartbeat_t hb;
- heartbeat_init(&hb);
+ heartbeat_init(&hb, USEC_PER_SEC);
while(!plugin_should_exit) {
- usec_t dt_ut = heartbeat_next(&hb, step_ut);
+ usec_t dt_ut = heartbeat_next(&hb);
send_newline_ut += dt_ut;
if(!tty && send_newline_ut > USEC_PER_SEC) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 22:18:32 +0000