From 388d939ed9851fbc53b316fc0143de97e14707ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Mon, 3 Aug 2020 14:24:20 +0200 Subject: [PATCH] Change prometheus exporter port to 9641 --- README.md | 2 +- README.turnserver | 2 +- examples/etc/turnserver.conf | 2 +- man/man1/turnadmin.1 | 2 +- man/man1/turnserver.1 | 4 ++-- man/man1/turnutils.1 | 2 +- src/apps/relay/mainrelay.c | 2 +- src/apps/relay/ns_ioalib_engine_impl.c | 2 +- src/apps/relay/prom_server.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ab5c4bf..448df3f 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Supported user databases (for user repository, with passwords or keys, if authen Redis can also be used for status and statistics storage and notification. -By default a [prometheus](https://prometheus.io/) exporter endpoint is disabled, if it is enabeled it will listen on port 9121 under path /metrics +By default a [prometheus](https://prometheus.io/) exporter endpoint is disabled, if it is enabeled it will listen on port 9641 under path /metrics Supported message integrity digest algorithms: diff --git a/README.turnserver b/README.turnserver index b2064d2..320021e 100644 --- a/README.turnserver +++ b/README.turnserver @@ -266,7 +266,7 @@ Flags: main ORIGIN attribute value (if the ORIGIN was initially used by the session). --no-prometheus Disable prometheus metrics. By default it is - enabled and listening on port 9121 unther the path /metrics + enabled and listening on port 9641 unther the path /metrics also the path / on this port can be used as a health check -h Help. diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf index f8ee3a4..515ed13 100644 --- a/examples/etc/turnserver.conf +++ b/examples/etc/turnserver.conf @@ -190,7 +190,7 @@ # If enabled the turnserver will expose an endpoint with stats on a prometheus format # this endpoint is listening on a different port to not conflict with other configurations. # -# You can simply run the turnserver and access the port 9121 and path /metrics +# You can simply run the turnserver and access the port 9641 and path /metrics # # For mor info on the prometheus exporter and metrics # https://prometheus.io/docs/introduction/overview/ diff --git a/man/man1/turnadmin.1 b/man/man1/turnadmin.1 index e24dc1e..5ef28f7 100644 --- a/man/man1/turnadmin.1 +++ b/man/man1/turnadmin.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "28 July 2020" "" "" +.TH TURN 1 "03 August 2020" "" "" .SH GENERAL INFORMATION \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1 index 9b97159..5b19c10 100644 --- a/man/man1/turnserver.1 +++ b/man/man1/turnserver.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "28 July 2020" "" "" +.TH TURN 1 "03 August 2020" "" "" .SH GENERAL INFORMATION The \fBTURN Server\fP project contains the source code of a TURN server and TURN client @@ -402,7 +402,7 @@ initially used by the session). .B \fB\-\-no\-prometheus\fP Disable prometheus metrics. By default it is -enabled and listening on port 9121 unther the path /metrics +enabled and listening on port 9641 unther the path /metrics also the path / on this port can be used as a health check .RE .TP diff --git a/man/man1/turnutils.1 b/man/man1/turnutils.1 index dcc4dbc..d379b92 100644 --- a/man/man1/turnutils.1 +++ b/man/man1/turnutils.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "28 July 2020" "" "" +.TH TURN 1 "03 August 2020" "" "" .SH GENERAL INFORMATION A set of turnutils_* programs provides some utility functionality to be used diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index fa6de44..c142599 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -537,7 +537,7 @@ static char Usage[] = "Usage: turnserver [options]\n" " The connection string has the same parameters as redis-userdb connection string.\n" #endif #if !defined(TURN_NO_PROMETHEUS) -" --prometheus Enable prometheus metrics. It is disabled by default. If it is enabled it will listen on port 9121 unther the path /metrics\n" +" --prometheus Enable prometheus metrics. It is disabled by default. If it is enabled it will listen on port 9641 unther the path /metrics\n" " also the path / on this port can be used as a health check\n" #endif " --use-auth-secret TURN REST API flag.\n" diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c index 9e80191..ba1e387 100644 --- a/src/apps/relay/ns_ioalib_engine_impl.c +++ b/src/apps/relay/ns_ioalib_engine_impl.c @@ -299,7 +299,7 @@ static stun_buffer_list_elem *new_blist_elem(ioa_engine_handle e) ret = (stun_buffer_list_elem *)malloc(sizeof(stun_buffer_list_elem)); if (ret) { ret->next = NULL; - } else { + } else { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: Cannot allocate memory for STUN buffer!\n", __FUNCTION__); } } diff --git a/src/apps/relay/prom_server.h b/src/apps/relay/prom_server.h index fcaa975..0211038 100644 --- a/src/apps/relay/prom_server.h +++ b/src/apps/relay/prom_server.h @@ -14,7 +14,7 @@ #include #include -#define DEFAULT_PROM_SERVER_PORT (9121) +#define DEFAULT_PROM_SERVER_PORT (9641) prom_gauge_t *turn_status;