X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_prometheus.c;h=b9040223bcc0559855f4f2dd6f9e59cc473fcb53;hb=48efd3deb4c9139fd060ff3d289896e9031bcc7c;hp=fe6f1cc3a536d563de8fa45cbdb563c02fcad147;hpb=38617fa88d22997e91176ef901f842f384ff3711;p=collectd.git diff --git a/src/write_prometheus.c b/src/write_prometheus.c index fe6f1cc3..b9040223 100644 --- a/src/write_prometheus.c +++ b/src/write_prometheus.c @@ -26,9 +26,9 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_avltree.h" +#include "utils/avltree/avltree.h" +#include "utils/common/common.h" #include "utils_complain.h" #include "utils_time.h" @@ -54,12 +54,13 @@ static c_avl_tree_t *metrics; static pthread_mutex_t metrics_lock = PTHREAD_MUTEX_INITIALIZER; +static char *httpd_host = NULL; static unsigned short httpd_port = 9103; static struct MHD_Daemon *httpd; static cdtime_t staleness_delta = PROMETHEUS_DEFAULT_STALENESS_DELTA; -/* Unfortunately, protoc-c doesn't export it's implementation of varint, so we +/* Unfortunately, protoc-c doesn't export its implementation of varint, so we * need to implement our own. */ static size_t varint(uint8_t buffer[static VARINT_UINT32_BYTES], uint32_t value) { @@ -155,7 +156,8 @@ static char *format_labels(char *buffer, size_t buffer_size, #define LABEL_BUFFER_SIZE (LABEL_KEY_SIZE + LABEL_VALUE_SIZE + 4) char *labels[3] = { - (char[LABEL_BUFFER_SIZE]){0}, (char[LABEL_BUFFER_SIZE]){0}, + (char[LABEL_BUFFER_SIZE]){0}, + (char[LABEL_BUFFER_SIZE]){0}, (char[LABEL_BUFFER_SIZE]){0}, }; @@ -244,9 +246,8 @@ static int http_handler(void *cls, struct MHD_Connection *connection, char const *accept = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT); - _Bool want_proto = - (accept != NULL) && - (strstr(accept, "application/vnd.google.protobuf") != NULL); + bool want_proto = (accept != NULL) && + (strstr(accept, "application/vnd.google.protobuf") != NULL); uint8_t scratch[4096] = {0}; ProtobufCBufferSimple simple = PROTOBUF_C_BUFFER_SIMPLE_INIT(scratch); @@ -689,7 +690,7 @@ static char *metric_family_name(data_set_t const *ds, value_list_t const *vl, * necessary. */ static Io__Prometheus__Client__MetricFamily * metric_family_get(data_set_t const *ds, value_list_t const *vl, size_t ds_index, - _Bool allocate) { + bool allocate) { char *name = metric_family_name(ds, vl, ds_index); if (name == NULL) { ERROR("write_prometheus plugin: Allocating metric family name failed."); @@ -722,7 +723,7 @@ metric_family_get(data_set_t const *ds, value_list_t const *vl, size_t ds_index, int status = c_avl_insert(metrics, fam->name, fam); if (status != 0) { - ERROR("write_prometheus plugin: Adding \"%s\" failed.", name); + ERROR("write_prometheus plugin: Adding \"%s\" failed.", fam->name); metric_family_destroy(fam); return NULL; } @@ -731,63 +732,128 @@ metric_family_get(data_set_t const *ds, value_list_t const *vl, size_t ds_index, } /* }}} */ -static int prom_open_socket(int domain, struct sockaddr const *addr, - socklen_t addrlen) { - int fd = socket(domain, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (fd == -1) - return errno; - - if (bind(fd, addr, addrlen) != 0) { - close(fd); +static void prom_logger(__attribute__((unused)) void *arg, char const *fmt, + va_list ap) { + /* {{{ */ + char errbuf[1024]; + vsnprintf(errbuf, sizeof(errbuf), fmt, ap); + + ERROR("write_prometheus plugin: %s", errbuf); +} /* }}} prom_logger */ + +#if MHD_VERSION >= 0x00090000 +static int prom_open_socket(int addrfamily) { + /* {{{ */ + char service[NI_MAXSERV]; + ssnprintf(service, sizeof(service), "%hu", httpd_port); + + struct addrinfo *res; + int status = getaddrinfo(httpd_host, service, + &(struct addrinfo){ + .ai_flags = AI_PASSIVE | AI_ADDRCONFIG, + .ai_family = addrfamily, + .ai_socktype = SOCK_STREAM, + }, + &res); + if (status != 0) { return -1; } - if (listen(fd, /* backlog = */ 16) != 0) { - close(fd); - return -1; + int fd = -1; + for (struct addrinfo *ai = res; ai != NULL; ai = ai->ai_next) { + int flags = ai->ai_socktype; +#ifdef SOCK_CLOEXEC + flags |= SOCK_CLOEXEC; +#endif + + fd = socket(ai->ai_family, flags, 0); + if (fd == -1) + continue; + + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) != 0) { + WARNING("write_prometheus plugin: setsockopt(SO_REUSEADDR) failed: %s", + STRERRNO); + close(fd); + fd = -1; + continue; + } + + if (bind(fd, ai->ai_addr, ai->ai_addrlen) != 0) { + close(fd); + fd = -1; + continue; + } + + if (listen(fd, /* backlog = */ 16) != 0) { + close(fd); + fd = -1; + continue; + } + + char str_node[NI_MAXHOST]; + char str_service[NI_MAXSERV]; + + getnameinfo(ai->ai_addr, ai->ai_addrlen, str_node, sizeof(str_node), + str_service, sizeof(str_service), + NI_NUMERICHOST | NI_NUMERICSERV); + + INFO("write_prometheus plugin: Listening on [%s]:%s.", str_node, + str_service); + break; } + freeaddrinfo(res); + return fd; -} +} /* }}} int prom_open_socket */ static struct MHD_Daemon *prom_start_daemon() { - struct sockaddr_in6 sa6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(httpd_port), - .sin6_addr = IN6ADDR_ANY_INIT, - }; - int fd = prom_open_socket(PF_INET6, (void *)&sa6, sizeof(sa6)); - + /* {{{ */ + int fd = prom_open_socket(PF_INET6); + if (fd == -1) + fd = prom_open_socket(PF_INET); if (fd == -1) { - struct sockaddr_in sa4 = { - .sin_family = AF_INET, - .sin_port = htons(httpd_port), - .sin_addr = - { - .s_addr = INADDR_ANY, - }, - }; - fd = prom_open_socket(PF_INET, (void *)&sa4, sizeof(sa4)); + ERROR("write_prometheus plugin: Opening a listening socket for [%s]:%hu " + "failed.", + (httpd_host != NULL) ? httpd_host : "::", httpd_port); + return NULL; } - if (fd == -1) { - ERROR("write_prometheus plugin: Opening a listening socket failed."); + unsigned int flags = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG; +#if MHD_VERSION >= 0x00095300 + flags |= MHD_USE_INTERNAL_POLLING_THREAD; +#endif + + struct MHD_Daemon *d = MHD_start_daemon( + flags, httpd_port, + /* MHD_AcceptPolicyCallback = */ NULL, + /* MHD_AcceptPolicyCallback arg = */ NULL, http_handler, NULL, + MHD_OPTION_LISTEN_SOCKET, fd, MHD_OPTION_EXTERNAL_LOGGER, prom_logger, + NULL, MHD_OPTION_END); + if (d == NULL) { + ERROR("write_prometheus plugin: MHD_start_daemon() failed."); + close(fd); return NULL; } - struct MHD_Daemon *d = - MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION, 0, - /* MHD_AcceptPolicyCallback = */ NULL, - /* MHD_AcceptPolicyCallback arg = */ NULL, http_handler, - NULL, MHD_OPTION_LISTEN_SOCKET, fd, MHD_OPTION_END); + return d; +} /* }}} struct MHD_Daemon *prom_start_daemon */ +#else /* if MHD_VERSION < 0x00090000 */ +static struct MHD_Daemon *prom_start_daemon() { + /* {{{ */ + struct MHD_Daemon *d = MHD_start_daemon( + MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, httpd_port, + /* MHD_AcceptPolicyCallback = */ NULL, + /* MHD_AcceptPolicyCallback arg = */ NULL, http_handler, NULL, + MHD_OPTION_EXTERNAL_LOGGER, prom_logger, NULL, MHD_OPTION_END); if (d == NULL) { ERROR("write_prometheus plugin: MHD_start_daemon() failed."); - close(fd); return NULL; } return d; -} +} /* }}} struct MHD_Daemon *prom_start_daemon */ +#endif /* * collectd callbacks @@ -796,7 +862,15 @@ static int prom_config(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp("Port", child->key) == 0) { + if (strcasecmp("Host", child->key) == 0) { +#if MHD_VERSION >= 0x00090000 + cf_util_get_string(child, &httpd_host); +#else + ERROR("write_prometheus plugin: Option `Host' not supported. Please " + "upgrade libmicrohttpd to at least 0.9.0"); + return -1; +#endif + } else if (strcasecmp("Port", child->key) == 0) { int status = cf_util_get_port_number(child); if (status > 0) httpd_port = (unsigned short)status; @@ -824,7 +898,6 @@ static int prom_init() { if (httpd == NULL) { httpd = prom_start_daemon(); if (httpd == NULL) { - ERROR("write_prometheus plugin: MHD_start_daemon() failed."); return -1; } DEBUG("write_prometheus plugin: Successfully started microhttpd %s", @@ -840,7 +913,7 @@ static int prom_write(data_set_t const *ds, value_list_t const *vl, for (size_t i = 0; i < ds->ds_num; i++) { Io__Prometheus__Client__MetricFamily *fam = - metric_family_get(ds, vl, i, /* allocate = */ 1); + metric_family_get(ds, vl, i, /* allocate = */ true); if (fam == NULL) continue; @@ -867,7 +940,7 @@ static int prom_missing(value_list_t const *vl, for (size_t i = 0; i < ds->ds_num; i++) { Io__Prometheus__Client__MetricFamily *fam = - metric_family_get(ds, vl, i, /* allocate = */ 0); + metric_family_get(ds, vl, i, /* allocate = */ false); if (fam == NULL) continue; @@ -917,6 +990,8 @@ static int prom_shutdown() { } pthread_mutex_unlock(&metrics_lock); + sfree(httpd_host); + return 0; } @@ -929,5 +1004,3 @@ void module_register() { /* user data = */ NULL); plugin_register_shutdown("write_prometheus", prom_shutdown); } - -/* vim: set sw=2 sts=2 et fdm=marker : */