Merge branch 'master' into add-nginx-stats-endpoint

docker/nginx/conf.d/server/server.api

@@ -71,6 +71,29 @@ location /skynet/stats {
     proxy_pass http://sia:9980/skynet/stats;
 }
 
+location /nginx/stats {
+    include /etc/nginx/conf.d/include/cors;
+
+    charset utf-8;
+    charset_types application/json;
+    default_type application/json;
+
+    content_by_lua_block {
+        local json = require('cjson')
+        ngx.say(json.encode{
+            -- current number of active client connections including waiting connections
+            connections_active = tonumber(ngx.var.connections_active),
+            -- current number of connections where nginx is reading the request header
+            connections_reading = tonumber(ngx.var.connections_reading),
+            -- current number of connections where nginx is writing the response back to the client
+            connections_writing = tonumber(ngx.var.connections_writing),
+            -- current number of idle client connections waiting for a request
+            connections_waiting = tonumber(ngx.var.connections_waiting),
+        })
+        return ngx.exit(ngx.HTTP_OK)
+    }
+}
+
 # Define path for server load endpoint
 location /serverload {
     # Define root directory in the nginx container to load file from