Review feedback

Author: ciarams87

deploy/helm-chart/README.md

@@ -296,7 +296,7 @@ The following tables lists the configurable parameters of the NGINX Gateway Fabr
 | `nginx.image.repository`                          | The repository for the NGINX image.                                                                                                                                                                      | ghcr.io/nginxinc/nginx-gateway-fabric/nginx                                                                     |
 | `nginx.image.tag`                                 | The tag for the NGINX image.                                                                                                                                                                             | edge                                                                                                            |
 | `nginx.image.pullPolicy`                          | The `imagePullPolicy` for the NGINX image.                                                                                                                                                               | Always                                                                                                          |
-| `nginx.plus`                                      | Is NGINX Plus enabled                                                                                                                                                                                    | false                                                                                                           |
+| `nginx.plus`                                      | Is NGINX Plus image being used                                                                                                                                                                           | false                                                                                                           |
 | `nginx.lifecycle`                                 | The `lifecycle` of the nginx container.                                                                                                                                                                  | {}                                                                                                              |
 | `nginx.extraVolumeMounts`                         | Extra `volumeMounts` for the nginx container.                                                                                                                                                            | {}                                                                                                              |
 | `terminationGracePeriodSeconds`                   | The termination grace period of the NGINX Gateway Fabric pod.                                                                                                                                            | 30                                                                                                              |

docs/developer/quickstart.md

@@ -123,7 +123,7 @@ This will build the docker images `nginx-gateway-fabric:<your-user>` and `nginx-
       helm install my-release ./deploy/helm-chart --create-namespace --wait --set service.type=NodePort --set nginxGateway.image.repository=nginx-gateway-fabric --set nginxGateway.image.tag=$(whoami) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=nginx-gateway-fabric/nginxplus --set nginx.image.tag=$(whoami) --set nginx.image.pullPolicy=Never --set nginx.plus=true -n nginx-gateway
       ```
 
-   > For more information on helm configuration options see the Helm [README](../../deploy/helm-chart/README.md).
+   > For more information on Helm configuration options see the Helm [README](../../deploy/helm-chart/README.md).
 
    - To install with manifests:
 

internal/mode/static/metrics/collectors/nginx.go

@@ -23,15 +23,6 @@ const (
 	nginxStatusSockTimeout = 10 * time.Second
 )
 
-var (
-	upstreamServerVariableLabels               = []string{}
-	upstreamServerPeerVariableLabelNames       = []string{}
-	streamUpstreamServerVariableLabels         = []string{}
-	streamUpstreamServerPeerVariableLabelNames = []string{}
-	serverZoneVariableLabels                   = []string{}
-	streamServerZoneVariableLabels             = []string{}
-)
-
 // NewNginxMetricsCollector creates an NginxCollector which fetches stats from NGINX over a unix socket
 func NewNginxMetricsCollector(constLabels map[string]string) (prometheus.Collector, error) {
 	httpClient := getSocketClient(nginxStatusSock)
@@ -43,20 +34,13 @@ func NewNginxMetricsCollector(constLabels map[string]string) (prometheus.Collect
 	return nginxCollector.NewNginxCollector(client, metrics.Namespace, constLabels), nil
 }
 
-// NewNginxMetricsCollector creates an NginxCollector which fetches stats from NGINX over a unix socket
+// NewNginxPlusMetricsCollector creates an NginxCollector which fetches stats from NGINX Plus API over a unix socket
 func NewNginxPlusMetricsCollector(constLabels map[string]string) (prometheus.Collector, error) {
 	plusClient, err := createPlusClient()
 	if err != nil {
 		return nil, err
 	}
-	variableLabelNames := nginxCollector.NewVariableLabelNames(
-		upstreamServerVariableLabels,
-		serverZoneVariableLabels,
-		upstreamServerPeerVariableLabelNames,
-		streamUpstreamServerVariableLabels,
-		streamServerZoneVariableLabels,
-		streamUpstreamServerPeerVariableLabelNames,
-	)
+	variableLabelNames := nginxCollector.VariableLabelNames{}
 	return nginxCollector.NewNginxPlusCollector(plusClient, metrics.Namespace, variableLabelNames, constLabels), nil
 }