From c12cbf34834ab6f4b72caef37c0db9ce63cc20a4 Mon Sep 17 00:00:00 2001
From: Markus Reinhold <markusreinhold@icloud.com>
Date: Wed, 25 Oct 2023 23:53:44 +0200
Subject: [PATCH] Update Nchan

Additionally expose new metrics.
---
 docker/nchan/Dockerfile   |  2 +-
 docker/nchan/default.conf | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docker/nchan/Dockerfile b/docker/nchan/Dockerfile
index ef6ca183..82ca50ee 100644
--- a/docker/nchan/Dockerfile
+++ b/docker/nchan/Dockerfile
@@ -1,4 +1,4 @@
-FROM safesecurity/nginx-nchan:1.2.15
+FROM darkflib/nginx-nchan:1.24.0
 
 ENV NCHAN_SHARED_MEMORY_SIZE=256M \
     NCHAN_MESSAGE_BUFFER_LENGTH=10 \
diff --git a/docker/nchan/default.conf b/docker/nchan/default.conf
index b40ec516..4e9f16f4 100644
--- a/docker/nchan/default.conf
+++ b/docker/nchan/default.conf
@@ -65,17 +65,9 @@ server {
         set $CONTENT '${CONTENT}# TYPE nchan_redis_connected_servers gauge\n';
         set $CONTENT '${CONTENT}nchan_redis_connected_servers{} ${nchan_stub_status_redis_connected_servers}\n';
 
-#       The following variable isn't yet available in the current Nchan version.
-#       Follow-up issue: https://github.com/marein/php-gaming-website/issues/150.
-#       set $CONTENT '${CONTENT}# HELP nchan_redis_unhealthy_upstreams Number of redis upstreams (individual server or cluster mode) that are currently not usable for publishing and subscribing.\n';
-#       set $CONTENT '${CONTENT}# TYPE nchan_redis_unhealthy_upstreams gauge\n';
-#       set $CONTENT '${CONTENT}nchan_redis_unhealthy_upstreams{} ${nchan_stub_status_redis_unhealthy_upstreams}\n';
-
-#       The following variable isn't yet available in the current Nchan version.
-#       Follow-up issue: https://github.com/marein/php-gaming-website/issues/150.
-#       set $CONTENT '${CONTENT}# HELP nchan_total_redis_commands_send Total number of commands this Nchan instance sent to Redis.\n';
-#       set $CONTENT '${CONTENT}# TYPE nchan_total_redis_commands_send counter\n';
-#       set $CONTENT '${CONTENT}nchan_total_redis_commands_send{} ${nchan_stub_status_total_redis_commands_send}\n';
+        set $CONTENT '${CONTENT}# HELP nchan_redis_unhealthy_upstreams Number of redis upstreams (individual server or cluster mode) that are currently not usable for publishing and subscribing.\n';
+        set $CONTENT '${CONTENT}# TYPE nchan_redis_unhealthy_upstreams gauge\n';
+        set $CONTENT '${CONTENT}nchan_redis_unhealthy_upstreams{} ${nchan_stub_status_redis_unhealthy_upstreams}\n';
 
         set $CONTENT '${CONTENT}# HELP nchan_total_ipc_alerts_received Number of interprocess communication packets transmitted between Nginx workers processes for Nchan. Can grow at 100-10000 per second at high load.\n';
         set $CONTENT '${CONTENT}# TYPE nchan_total_ipc_alerts_received counter\n';