Touch up on the nginx config template (#21757)

* touch up on the nginx config template

* changelog

Author: steveny91

nginx/assets/configuration/spec.yaml

@@ -10,14 +10,15 @@ files:
     options:
     - name: nginx_status_url
       required: true
+      display_priority: 2
       description: |
         For every instance, you need an `nginx_status_url` and can optionally
         supply a list of tags.  This plugin requires nginx to be compiled with
         the nginx stub status module option, and activated with the correct
         configuration stanza.  On debian/ubuntu, this is included in the
         `nginx-extras` package.  For more details, see:
 
-          http://docs.datadoghq.com/integrations/nginx/
+          https://docs.datadoghq.com/integrations/nginx/
 
         For NGINX Plus API Release 13+ users using the http_api_module,
         set nginx_status_url to the location of the `/api` endpoint.
@@ -27,10 +28,10 @@ files:
         type: string
     - name: use_plus_api
       description: |
-        If you are using the commercial version of nginx, for releases R13 and above,
-        there is a new API to replace the extended status API.
-        See https://www.nginx.com/blog/nginx-plus-r13-released/
-        To use it set `use_plus_api` to true
+        If you are using the commercial version of NGINX for releases R13 and above,
+        there is a new API that replaces the extended status API.
+        See https://www.nginx.com/blog/nginx-plus-r13-released/.
+        To use it, set `use_plus_api` to `true`.
       value:
         type: boolean
         example: false
@@ -69,12 +70,14 @@ files:
     - template: instances/http
     - template: instances/default
       overrides:
+        disable_generic_tags.display_priority: 1
         disable_generic_tags.hidden: False
         disable_generic_tags.enabled: True
         disable_generic_tags.description: |
-          Generic tags such as `cluster` will be replaced by <integration_name>_cluster to avoid
-          getting mixed with other integration tags.
-          Note that this is only relevant to service check submissions. Metrics do not include any generic tags.
+          Generic tags such as `cluster` will be replaced by nginx_cluster to avoid
+          getting mixed with other integration tags. Note that this is only relevant 
+          to service check submissions. Metrics do not include any generic tags. 
+          Datadog recommends setting this to `true` to avoid confusion.
 
   - template: logs
     example:

nginx/changelog.d/21757.fixed

@@ -0,0 +1 @@
+Touch up on the nginx config template

nginx/datadog_checks/nginx/data/conf.yaml.example

@@ -52,19 +52,27 @@ instances:
     ## configuration stanza.  On debian/ubuntu, this is included in the
     ## `nginx-extras` package.  For more details, see:
     ##
-    ##   http://docs.datadoghq.com/integrations/nginx/
+    ##   https://docs.datadoghq.com/integrations/nginx/
     ##
     ## For NGINX Plus API Release 13+ users using the http_api_module,
     ## set nginx_status_url to the location of the `/api` endpoint.
     ## E.g. `nginx_status_url: http://localhost:8080/api`
     #
   - nginx_status_url: http://localhost:81/nginx_status/
 
+    ## @param disable_generic_tags - boolean - optional - default: false
+    ## Generic tags such as `cluster` will be replaced by nginx_cluster to avoid
+    ## getting mixed with other integration tags. Note that this is only relevant 
+    ## to service check submissions. Metrics do not include any generic tags. 
+    ## Datadog recommends setting this to `true` to avoid confusion.
+    #
+    disable_generic_tags: true
+
     ## @param use_plus_api - boolean - optional - default: false
-    ## If you are using the commercial version of nginx, for releases R13 and above,
-    ## there is a new API to replace the extended status API.
-    ## See https://www.nginx.com/blog/nginx-plus-r13-released/
-    ## To use it set `use_plus_api` to true
+    ## If you are using the commercial version of NGINX for releases R13 and above,
+    ## there is a new API that replaces the extended status API.
+    ## See https://www.nginx.com/blog/nginx-plus-r13-released/.
+    ## To use it, set `use_plus_api` to `true`.
     #
     # use_plus_api: false
 
@@ -444,13 +452,6 @@ instances:
     #
     # empty_default_hostname: false
 
-    ## @param disable_generic_tags - boolean - optional - default: false
-    ## Generic tags such as `cluster` will be replaced by <integration_name>_cluster to avoid
-    ## getting mixed with other integration tags.
-    ## Note that this is only relevant to service check submissions. Metrics do not include any generic tags.
-    #
-    disable_generic_tags: true
-
     ## @param metric_patterns - mapping - optional
     ## A mapping of metrics to include or exclude, with each entry being a regular expression.
     ##