Merge branch 'main' into docs/rewrite-client-ip-settings

Author: ADubhlaoich

internal/mode/static/nginx/config/servers_template.go

@@ -149,10 +149,10 @@ server {
     {{- end }}
 {{ end }}
 server {
-    listen unix:/var/run/nginx/nginx-502-server.sock;
+    listen unix:/var/run/nginx/nginx-503-server.sock;
     access_log off;
 
-    return 502;
+    return 503;
 }
 
 server {

internal/mode/static/nginx/config/upstreams.go

@@ -13,8 +13,8 @@ import (
 var upstreamsTemplate = gotemplate.Must(gotemplate.New("upstreams").Parse(upstreamsTemplateText))
 
 const (
-	// nginx502Server is used as a backend for services that cannot be resolved (have no IP address).
-	nginx502Server = "unix:/var/run/nginx/nginx-502-server.sock"
+	// nginx503Server is used as a backend for services that cannot be resolved (have no IP address).
+	nginx503Server = "unix:/var/run/nginx/nginx-503-server.sock"
 	// nginx500Server is used as a server for the invalid backend ref upstream.
 	nginx500Server = "unix:/var/run/nginx/nginx-500-server.sock"
 	// invalidBackendRef is used as an upstream name for invalid backend references.
@@ -112,7 +112,7 @@ func (g GeneratorImpl) createUpstream(up dataplane.Upstream) http.Upstream {
 			ZoneSize: zoneSize,
 			Servers: []http.UpstreamServer{
 				{
-					Address: nginx502Server,
+					Address: nginx503Server,
 				},
 			},
 		}

internal/mode/static/nginx/config/upstreams_test.go

@@ -58,7 +58,7 @@ func TestExecuteUpstreams(t *testing.T) {
 		"server 10.0.0.0:80;",
 		"server 11.0.0.0:80;",
 		"server [2001:db8::1]:80",
-		"server unix:/var/run/nginx/nginx-502-server.sock;",
+		"server unix:/var/run/nginx/nginx-503-server.sock;",
 	}
 
 	upstreamResults := gen.executeUpstreams(dataplane.Configuration{Upstreams: stateUpstreams})
@@ -148,7 +148,7 @@ func TestCreateUpstreams(t *testing.T) {
 			ZoneSize: ossZoneSize,
 			Servers: []http.UpstreamServer{
 				{
-					Address: nginx502Server,
+					Address: nginx503Server,
 				},
 			},
 		},
@@ -194,7 +194,7 @@ func TestCreateUpstream(t *testing.T) {
 				ZoneSize: ossZoneSize,
 				Servers: []http.UpstreamServer{
 					{
-						Address: nginx502Server,
+						Address: nginx503Server,
 					},
 				},
 			},
@@ -210,7 +210,7 @@ func TestCreateUpstream(t *testing.T) {
 				ZoneSize: ossZoneSize,
 				Servers: []http.UpstreamServer{
 					{
-						Address: nginx502Server,
+						Address: nginx503Server,
 					},
 				},
 			},

site/content/how-to/monitoring/troubleshooting.md

@@ -139,7 +139,7 @@ You can see logs for a crashed or killed container by adding the `-p` flag to th
 Understanding the NGINX configuration is key for fixing issues because it shows how NGINX handles requests. This helps tweak settings to make sure NGINX behaves the way you want it to for your application. To see your current configuration, you can open a shell in the _nginx_ container by following these [steps](#get-shell-access-to-nginx-container) and run `nginx -T`. To understand the usage of NGINX directives in the configuration file, consult this list of [NGINX directives](https://nginx.org/en/docs/dirindex.html).
 
 In this section, we will see how the configuration gets updated as we configure different Services, Deployments and HTTPRoutes with NGINX Gateway Fabric. In the configuration file, you'll often find several server blocks, each assigned to specific ports and server names. NGINX selects the appropriate server for a request and evaluates the URI against the location directives within that block.
-When only a Gateway resource is defined, but no Services or HTTPRoutes are configured, NGINX generates a basic configuration. This includes a default server listening on the ports specified in the Gateway listeners, handling all incoming requests. Additionally, there are blocks to manage errors with status codes 500 or 502.
+When only a Gateway resource is defined, but no Services or HTTPRoutes are configured, NGINX generates a basic configuration. This includes a default server listening on the ports specified in the Gateway listeners, handling all incoming requests. Additionally, there are blocks to manage errors with status codes 500 or 503.
 
 This is a default `server` block listening on port 80:
 

tests/results/dp-perf/edge/edge-oss.md

@@ -6,41 +6,40 @@ NGINX Plus: false
 
 NGINX Gateway Fabric:
 
-- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
-- Date: 2024-09-30T23:47:54Z
+- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
+- Date: 2024-10-15T13:45:52Z
 - Dirty: false
 
 GKE Cluster:
 
 - Node count: 12
-- k8s version: v1.30.3-gke.1969001
+- k8s version: v1.30.5-gke.1014001
 - vCPUs per node: 16
-- RAM per node: 65853964Ki
+- RAM per node: 65853972Ki
 - Max pods per node: 110
 - Zone: us-west1-b
 - Instance Type: n2d-standard-16
 
 ## Test1: Running latte path based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 999.50
-Duration      [total, attack, wait]             30s, 29.999s, 779.26µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  401.546µs, 729.594µs, 696.171µs, 808.825µs, 853.548µs, 993.26µs, 12.557ms
-Bytes In      [total, mean]                     4769865, 159.00
+Requests      [total, rate, throughput]         30000, 1000.02, 1000.00
+Duration      [total, attack, wait]             30s, 29.999s, 724.131µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  506.273µs, 701.347µs, 679.076µs, 779.282µs, 819.797µs, 976.515µs, 12.161ms
+Bytes In      [total, mean]                     4830000, 161.00
 Bytes Out     [total, mean]                     0, 0.00
-Success       [ratio]                           99.95%
-Status Codes  [code:count]                      200:29985  502:15  
+Success       [ratio]                           100.00%
+Status Codes  [code:count]                      200:30000  
 Error Set:
-502 Bad Gateway
 ```
 
 ## Test2: Running coffee header based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.00
-Duration      [total, attack, wait]             30s, 29.999s, 707.055µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  535.388µs, 765.759µs, 741.731µs, 856.44µs, 900.22µs, 1.028ms, 12.624ms
-Bytes In      [total, mean]                     4800000, 160.00
+Requests      [total, rate, throughput]         30000, 1000.04, 1000.01
+Duration      [total, attack, wait]             30s, 29.999s, 692.989µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  532.886µs, 721.993µs, 706.02µs, 812.366µs, 860.289µs, 1.018ms, 4.297ms
+Bytes In      [total, mean]                     4860000, 162.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -50,10 +49,10 @@ Error Set:
 ## Test3: Running coffee query based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.01, 999.98
-Duration      [total, attack, wait]             30.001s, 30s, 825.751µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  562.053µs, 766.667µs, 744.972µs, 859.534µs, 901.417µs, 1.02ms, 11.739ms
-Bytes In      [total, mean]                     5040000, 168.00
+Requests      [total, rate, throughput]         30000, 1000.04, 1000.01
+Duration      [total, attack, wait]             30s, 29.999s, 713.827µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  538.212µs, 722.813µs, 705.872µs, 813.629µs, 859.743µs, 1.009ms, 7.374ms
+Bytes In      [total, mean]                     5100000, 170.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -63,10 +62,10 @@ Error Set:
 ## Test4: Running tea GET method based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.02, 999.99
-Duration      [total, attack, wait]             30s, 29.999s, 794.715µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  550.188µs, 749.652µs, 735.445µs, 851.278µs, 896.326µs, 1.024ms, 5.942ms
-Bytes In      [total, mean]                     4710000, 157.00
+Requests      [total, rate, throughput]         30000, 1000.01, 999.98
+Duration      [total, attack, wait]             30s, 30s, 690.398µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  530.942µs, 709.483µs, 690.422µs, 800.878µs, 843.812µs, 975.935µs, 9.135ms
+Bytes In      [total, mean]                     4770000, 159.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -76,10 +75,10 @@ Error Set:
 ## Test5: Running tea POST method based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.01
-Duration      [total, attack, wait]             30s, 29.999s, 776.178µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  555.668µs, 750.151µs, 736.996µs, 847.199µs, 890.538µs, 1.003ms, 9.982ms
-Bytes In      [total, mean]                     4710000, 157.00
+Requests      [total, rate, throughput]         30000, 1000.04, 1000.01
+Duration      [total, attack, wait]             30s, 29.999s, 773.112µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  512.273µs, 709.133µs, 692.254µs, 793.501µs, 832.049µs, 968.373µs, 11.168ms
+Bytes In      [total, mean]                     4770000, 159.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  

tests/results/dp-perf/edge/edge-plus.md

@@ -6,14 +6,14 @@ NGINX Plus: true
 
 NGINX Gateway Fabric:
 
-- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
-- Date: 2024-09-30T23:47:54Z
+- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
+- Date: 2024-10-15T13:45:52Z
 - Dirty: false
 
 GKE Cluster:
 
 - Node count: 12
-- k8s version: v1.30.3-gke.1969001
+- k8s version: v1.30.5-gke.1014001
 - vCPUs per node: 16
 - RAM per node: 65853972Ki
 - Max pods per node: 110
@@ -23,23 +23,23 @@ GKE Cluster:
 ## Test1: Running latte path based routing
 
 ```text
-Requests      [total, rate, throughput]         29999, 1000.00, 999.98
-Duration      [total, attack, wait]             30s, 29.999s, 613.524µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  493.667µs, 661.552µs, 643.908µs, 726.654µs, 763.9µs, 862.035µs, 16.392ms
-Bytes In      [total, mean]                     4829839, 161.00
+Requests      [total, rate, throughput]         30000, 1000.02, 1000.00
+Duration      [total, attack, wait]             30s, 29.999s, 621.777µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  493.496µs, 682.208µs, 666.971µs, 771.821µs, 812.592µs, 935.803µs, 9.613ms
+Bytes In      [total, mean]                     4800000, 160.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
-Status Codes  [code:count]                      200:29999  
+Status Codes  [code:count]                      200:30000  
 Error Set:
 ```
 
 ## Test2: Running coffee header based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.00
-Duration      [total, attack, wait]             30s, 29.999s, 688.713µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  522.959µs, 689.862µs, 672.734µs, 764.478µs, 797.131µs, 890.809µs, 12.189ms
-Bytes In      [total, mean]                     4860000, 162.00
+Requests      [total, rate, throughput]         30000, 1000.02, 1000.00
+Duration      [total, attack, wait]             30s, 29.999s, 696.203µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  529.204µs, 709.079µs, 694.929µs, 791.712µs, 834.953µs, 960.962µs, 9.219ms
+Bytes In      [total, mean]                     4830000, 161.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -49,23 +49,23 @@ Error Set:
 ## Test3: Running coffee query based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.00
-Duration      [total, attack, wait]             30s, 29.999s, 670.956µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  531.378µs, 688.422µs, 674.945µs, 759.955µs, 793.679µs, 885.247µs, 14.82ms
-Bytes In      [total, mean]                     5100000, 170.00
+Requests      [total, rate, throughput]         29999, 1000.00, 999.98
+Duration      [total, attack, wait]             30s, 29.999s, 659.516µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  542.362µs, 719.357µs, 701.71µs, 805.054µs, 848.72µs, 980.33µs, 11.954ms
+Bytes In      [total, mean]                     5069831, 169.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
-Status Codes  [code:count]                      200:30000  
+Status Codes  [code:count]                      200:29999  
 Error Set:
 ```
 
 ## Test4: Running tea GET method based routing
 
 ```text
 Requests      [total, rate, throughput]         30000, 1000.03, 1000.01
-Duration      [total, attack, wait]             30s, 29.999s, 750.387µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  530.656µs, 682.96µs, 663.291µs, 755.22µs, 792.507µs, 882.755µs, 20.103ms
-Bytes In      [total, mean]                     4770000, 159.00
+Duration      [total, attack, wait]             30s, 29.999s, 677.532µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  509.01µs, 703.22µs, 689.619µs, 790.875µs, 832.349µs, 970.323µs, 7.744ms
+Bytes In      [total, mean]                     4740000, 158.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -75,10 +75,10 @@ Error Set:
 ## Test5: Running tea POST method based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.04, 1000.01
-Duration      [total, attack, wait]             30s, 29.999s, 648.522µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  519.81µs, 675.008µs, 658.634µs, 742.332µs, 782.502µs, 869.715µs, 12.734ms
-Bytes In      [total, mean]                     4770000, 159.00
+Requests      [total, rate, throughput]         30000, 1000.01, 999.99
+Duration      [total, attack, wait]             30s, 30s, 687.367µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  520.251µs, 696.116µs, 682.682µs, 780.437µs, 820.818µs, 945.164µs, 8.67ms
+Bytes In      [total, mean]                     4740000, 158.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  

tests/results/ngf-upgrade/edge/edge-oss.md

@@ -6,46 +6,46 @@ NGINX Plus: false
 
 NGINX Gateway Fabric:
 
-- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
-- Date: 2024-09-30T23:47:54Z
+- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
+- Date: 2024-10-15T13:45:52Z
 - Dirty: false
 
 GKE Cluster:
 
 - Node count: 12
-- k8s version: v1.30.3-gke.1969001
+- k8s version: v1.30.5-gke.1014001
 - vCPUs per node: 16
-- RAM per node: 65853964Ki
+- RAM per node: 65853972Ki
 - Max pods per node: 110
 - Zone: us-west1-b
 - Instance Type: n2d-standard-16
 
-## Test: Send https /tea traffic
+## Test: Send http /coffee traffic
 
 ```text
 Requests      [total, rate, throughput]         6000, 100.02, 100.01
-Duration      [total, attack, wait]             59.991s, 59.991s, 868µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  673.831µs, 905.163µs, 871.482µs, 1.007ms, 1.058ms, 1.21ms, 12.461ms
-Bytes In      [total, mean]                     926034, 154.34
+Duration      [total, attack, wait]             59.991s, 59.99s, 879.857µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  472.733µs, 846.68µs, 831.757µs, 948.108µs, 989.426µs, 1.13ms, 12.461ms
+Bytes In      [total, mean]                     968005, 161.33
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:6000  
 Error Set:
 ```
 
-![https-oss.png](https-oss.png)
+![http-oss.png](http-oss.png)
 
-## Test: Send http /coffee traffic
+## Test: Send https /tea traffic
 
 ```text
 Requests      [total, rate, throughput]         6000, 100.02, 100.01
-Duration      [total, attack, wait]             59.991s, 59.99s, 738.617µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  611.455µs, 861.834µs, 832.286µs, 967.223µs, 1.017ms, 1.204ms, 12.717ms
-Bytes In      [total, mean]                     960000, 160.00
+Duration      [total, attack, wait]             59.991s, 59.99s, 802.597µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  646.501µs, 872.011µs, 851.784µs, 961.79µs, 1.006ms, 1.137ms, 12.519ms
+Bytes In      [total, mean]                     930000, 155.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:6000  
 Error Set:
 ```
 
-![http-oss.png](http-oss.png)
+![https-oss.png](https-oss.png)

tests/results/ngf-upgrade/edge/edge-plus.md

@@ -6,46 +6,46 @@ NGINX Plus: true
 
 NGINX Gateway Fabric:
 
-- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
-- Date: 2024-09-30T23:47:54Z
+- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
+- Date: 2024-10-15T13:45:52Z
 - Dirty: false
 
 GKE Cluster:
 
 - Node count: 12
-- k8s version: v1.30.3-gke.1969001
+- k8s version: v1.30.5-gke.1014001
 - vCPUs per node: 16
 - RAM per node: 65853972Ki
 - Max pods per node: 110
 - Zone: us-west1-b
 - Instance Type: n2d-standard-16
 
-## Test: Send https /tea traffic
+## Test: Send http /coffee traffic
 
 ```text
 Requests      [total, rate, throughput]         6000, 100.02, 100.02
-Duration      [total, attack, wait]             59.991s, 59.99s, 837.681µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  653.705µs, 925.365µs, 897.43µs, 1.065ms, 1.118ms, 1.26ms, 12.393ms
-Bytes In      [total, mean]                     931990, 155.33
+Duration      [total, attack, wait]             59.991s, 59.99s, 913.585µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  660.737µs, 910.81µs, 889.797µs, 1.034ms, 1.093ms, 1.262ms, 14.865ms
+Bytes In      [total, mean]                     968001, 161.33
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:6000  
 Error Set:
 ```
 
-![https-plus.png](https-plus.png)
+![http-plus.png](http-plus.png)
 
-## Test: Send http /coffee traffic
+## Test: Send https /tea traffic
 
 ```text
 Requests      [total, rate, throughput]         6000, 100.02, 100.02
-Duration      [total, attack, wait]             59.991s, 59.99s, 937.076µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  429.788µs, 877.933µs, 876.522µs, 1.03ms, 1.08ms, 1.189ms, 12.246ms
-Bytes In      [total, mean]                     966000, 161.00
+Duration      [total, attack, wait]             59.991s, 59.99s, 939.801µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  484.682µs, 898.425µs, 890.482µs, 1.025ms, 1.079ms, 1.209ms, 13.209ms
+Bytes In      [total, mean]                     932025, 155.34
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:6000  
 Error Set:
 ```
 
-![http-plus.png](http-plus.png)
+![https-plus.png](https-plus.png)