example nginx-agent.conf
-{{example dynamic-agent.conf
-{{- -{{
Can also be set in the repo Makefile.| | OS_VERSION | The version of the Linux distribution to use as the base image.
Can also be set in the repo Makefile.| | AGENT_VERSION | The versions of NGINX agent that you want installed on the image.| -{{
or
```sudo /etc/init.d/nginx-agent start``` | | FreeBSD | ```sudo service nginx-agent start``` | -{{
9 | 3.16
3.17
3.18
3.19| 2023| LTS| 7.4+| 11
12| +| | AlmaLinux | Alpine Linux | Amazon Linux | Amazon Linux 2| Debian | +|-|-----------|--------------|--------------|----------------|--------| +|**Version**|8
9
10| 3.19
3.20
3.21
3.22| 2023| LTS| 11
12| |**Architecture**| x86_84
aarch64| x86_64
aarch64 | x86_64
aarch64 | x86_64
aarch64 | x86_64
aarch64 | x86_64
aarch64 | -{{< /bootstrap-table >}} -{{< bootstrap-table "table table-striped table-bordered" >}} | |FreeBSD | Oracle Linux | Red Hat
Enterprise Linux
(RHEL) | Rocky Linux | SUSE Linux
Enterprise Server
(SLES) | Ubuntu | |-|--------|--------------|---------------------------------|-------------|-------------------------------------|--------| -|**Version**|13
14|7.4+
8.1+
9|7.4+
8.1+
9.0+|8
9|12 SP5
15 SP2|20.04 LTS
22.04 LTS| +|**Version**|13
14|8.1+
9
10|8.1+
9.0+
10|8
9
10|15 SP2|22.04 LTS
24.04 LTS
25.04 LTS| |**Architecture**|amd64|x86_64|x86_64
aarch64|x86_64
aarch64|x86_64|x86_64
aarch64| -{{< /bootstrap-table >}} ## Supported deployment environments @@ -57,11 +52,10 @@ NGINX Agent works with all supported versions of NGINX Open Source and NGINX Plu ## Sizing recommendations Minimum system sizing recommendations for NGINX Agent: -{{< bootstrap-table "table table-striped table-bordered" >}} + | CPU | Memory | Network | Storage | |------------|----------|-----------|---------| | 1 CPU core | 1 GB RAM | 1 GbE NIC | 20 GB | -{{< /bootstrap-table >}} ## Logging diff --git a/content/amplify/faq/metrics-and-metadata.md b/content/amplify/faq/metrics-and-metadata.md index f91ae8dd8..6e1b43a79 100644 --- a/content/amplify/faq/metrics-and-metadata.md +++ b/content/amplify/faq/metrics-and-metadata.md @@ -10,4 +10,4 @@ nd-docs: DOCS-957 [NGINX Amplify Agent Metrics and Metadata]({{< ref "/amplify/nginx-amplify-agent/metadata-metrics-collection" >}}) -{{< note >}}For a complete list of metrics, refer to the [Metrics and Metadata documentation]({{< ref "/amplify/metrics-metadata" >}}).{{< /note >}} \ No newline at end of file +{{< call-out "note" >}}For a complete list of metrics, refer to the [Metrics and Metadata documentation]({{< ref "/amplify/metrics-metadata" >}}).{{< /call-out >}} \ No newline at end of file diff --git a/content/amplify/faq/user-interface.md b/content/amplify/faq/user-interface.md index 5bad6022b..547fadcbb 100644 --- a/content/amplify/faq/user-interface.md +++ b/content/amplify/faq/user-interface.md @@ -29,4 +29,4 @@ To completely delete a previously monitored object follow these steps: To delete a system using the web interface — find it in the [Inventory]({{< ref "/amplify/user-interface/inventory" >}}), and select the [i] icon. You can delete objects from the popup window that appears next. -{{< important >}}Deleting objects in the User Interface will not stop NGINX Amplify Agent. To completely remove a system from monitoring, please stop or uninstall NGINX Amplify Agent, clean it up in the web interface, and clean up any alerts.{{< /important >}} +{{< call-out "important" >}}Deleting objects in the User Interface will not stop NGINX Amplify Agent. To completely remove a system from monitoring, please stop or uninstall NGINX Amplify Agent, clean it up in the web interface, and clean up any alerts.{{< /call-out >}} diff --git a/content/amplify/known-issues.md b/content/amplify/known-issues.md index 38b7db320..2d2bf2a79 100644 --- a/content/amplify/known-issues.md +++ b/content/amplify/known-issues.md @@ -6,17 +6,13 @@ toc: true nd-docs: DOCS-1692 --- -{{
@@ -37,7 +37,7 @@ The NGINX Controller Agent attempts to detect and monitor all unique NGINX proce NGINX Controller, the NGINX Controller Agent, and the NGINX Controller Application Security Add-on support the following distributions and architectures. -{{< see-also >}}Refer to the [NGINX Plus Technical Specifications](https://docs.nginx.com/nginx/technical-specs/) guide for the distributions that NGINX Plus supports.{{< /see-also >}} +{{< call-out "note" >}}Refer to the [NGINX Plus Technical Specifications](https://docs.nginx.com/nginx/technical-specs/) guide for the distributions that NGINX Plus supports.{{< /call-out>}} {{< bootstrap-table "table table-striped table-bordered" >}} @@ -65,9 +65,9 @@ NGINX Controller, the NGINX Controller Agent, and the NGINX Controller Applicati NGINX Controller v3.1 and later use an Analytics, Visibility, and Reporting daemon (AVRD) to aggregate and report app-centric metrics, which you can use to track and check the health of your apps. To learn more about these metrics, see the [NGINX Metrics Catalog]({{< ref "/controller/analytics/catalogs/metrics.md" >}}) topic. -{{< see-also >}} +{{< call-out "note" >}} See the [NGINX Controller Technical Specifications]({{< ref "/controller/admin-guides/install/nginx-controller-tech-specs.md" >}}) for the complete list of system requirements for NGINX Controller and the NGINX Controller Agent. -{{< /see-also >}} +{{< /call-out>}} ## Supported Python Versions diff --git a/content/controller/admin-guides/config-agent/configure-metrics-collection.md b/content/controller/admin-guides/config-agent/configure-metrics-collection.md index 6fadc382c..c88443035 100644 --- a/content/controller/admin-guides/config-agent/configure-metrics-collection.md +++ b/content/controller/admin-guides/config-agent/configure-metrics-collection.md @@ -40,9 +40,9 @@ NGINX Controller uses the `/api` location on the NGINX Plus instance to collect When you push a configuration to an NGINX Plus instance, NGINX Controller automatically enables the `/api` location for that instance. -{{< note >}} +{{< call-out "note" >}} The `/api` location settings that NGINX Controller creates will override any settings that you have previously defined. -{{< /note >}} +{{< /call-out >}} If you use NGINX Controller solely to monitor your NGINX Plus instances, you may need to enable the `/api` location on your instances manually. Refer to the [Configuring the API](https://docs.nginx.com/nginx/admin-guide/monitoring/live-activity-monitoring/#configuring-the-api) section of the NGINX Plus Admin Guide for instructions. @@ -63,12 +63,12 @@ The Agent will try to detect the [log format](https://nginx.org/en/docs/http/ngx Some metrics included in the [NGINX Metrics reference]({{< ref "/controller/analytics/catalogs/metrics.md" >}}) are not available unless the corresponding variables are included in a custom [access.log](https://nginx.org/en/docs/http/ngx_http_log_module.html) format in the NGINX config. -{{< see-also >}} +{{< call-out "note" >}} - Read [Configuring Logging](https://docs.nginx.com/nginx/admin-guide/monitoring/logging/#setting-up-the-access-log) in the NGINX Admin Guide. - View the complete list of [NGINX log variables](https://nginx.org/en/docs/varindex.html). -{{< /see-also >}}. +{{< /call-out>}}. Take the steps in this section to enable the NGINX Controller Agent to collect metrics from custom `access.log` variables. @@ -93,9 +93,9 @@ Take the steps in this section to enable the NGINX Controller Agent to collect m access_log /var/log/nginx/access.log main_ext; ``` - {{< note >}} + {{< call-out "note" >}} By default, the Controller Agent processes all access logs that it finds in your log directory. If you define a new log file with the extended log format that contains entries that are already being logged to another access log, your metrics might be counted twice. Refer to the [Agent configuration]({{< ref "/controller/admin-guides/config-agent/configure-the-agent.md" >}}) guide to learn how to exclude specific log files from processing. - {{< /note >}} + {{< /call-out >}} 4. Set the [error.log](https://nginx.org/en/docs/ngx_core_module.html#error_log) log level to `warn`. @@ -135,9 +135,9 @@ Take the steps below to enable metrics collection from Syslog: For more information, see [Controlling NGINX](https://nginx.org/en/docs/control.html). -{{< note >}} +{{< call-out "note" >}} To send the NGINX logs to both the existing logging facility and the NGINX Controller Agent, include a separate [access.log](https://nginx.org/en/docs/http/ngx_http_log_module.html) directive for each destination. -{{< /note >}} +{{< /call-out >}} ## What's Next diff --git a/content/controller/admin-guides/config-agent/configure-the-agent.md b/content/controller/admin-guides/config-agent/configure-the-agent.md index 468755759..9963d0e80 100644 --- a/content/controller/admin-guides/config-agent/configure-the-agent.md +++ b/content/controller/admin-guides/config-agent/configure-the-agent.md @@ -32,9 +32,9 @@ NGINX Controller uses the `/api` location on the NGINX Plus instance to collect When you push a configuration to an NGINX Plus instance, NGINX Controller automatically enables the `/api` location for that instance. -{{< note >}} +{{< call-out "note" >}} The `/api` location settings that NGINX Controller creates will override any settings that you have previously defined. -{{< /note >}} +{{< /call-out >}} If you use NGINX Controller solely to monitor your NGINX Plus instances, you may need to enable the `/api` location on your instances manually. Refer to the [Configuring the API](https://docs.nginx.com/nginx/admin-guide/monitoring/live-activity-monitoring/#configuring-the-api) section of the NGINX Plus Admin Guide for instructions. @@ -71,13 +71,13 @@ The hostname should be real. The NGINX Controller Agent won't start unless a val - localhost6.localdomain6 - ip6-localhost -{{< note >}} +{{< call-out "note" >}} You can use the above method to replace the system's hostname with an arbitrary alias. Keep in mind that if you redefine the hostname for a live object, the existing object will be marked as failed in the NGINX Controller user interface. Redefining the hostname in the NGINX Controller Agent's configuration creates a new UUID and a new system for monitoring. Alternatively, you can define an alias for the host in the NGINX Controller user interface. Go to the **Graphs** page, select the system that you want to update, and click the gear icon. -{{< /note >}} +{{< /call-out >}} ## Preserving the UUID across OS upgrades @@ -97,7 +97,7 @@ After restarting the Controller Agent -- `service controller-agent restart` -- t The NGINX Controller Agent detects the NGINX configuration file automatically. You shouldn't need to point the NGINX Controller Agent to the `nginx.conf` file explicitly. -{{< caution >}}You should not make manual changes to the `nginx.conf` file on NGINX Plus instances that are managed by NGINX Controller. Manually updating the `nginx.conf` file on managed instances may adversely affect system performance. In most cases, NGINX Controller will revert or overwrite manual updates made to `nginx.conf`.{{< /caution >}} +{{< call-out "caution" >}}You should not make manual changes to the `nginx.conf` file on NGINX Plus instances that are managed by NGINX Controller. Manually updating the `nginx.conf` file on managed instances may adversely affect system performance. In most cases, NGINX Controller will revert or overwrite manual updates made to `nginx.conf`.{{< /call-out >}} If, for some reason, the NGINX Controller Agent cannot find the NGINX configuration, you can use the following option in `/etc/controller-agent/agent.conf` to point to the configuration file: @@ -106,7 +106,7 @@ If, for some reason, the NGINX Controller Agent cannot find the NGINX configurat configfile = /etc/nginx/nginx.conf ``` -{{< note >}} We recommend using this option only as a workaround if needed. If you do need to add the path to the NGINX config file, we ask that you [contact NGINX Support]({{< ref "/controller/support/contact-support.md" >}}) so they can help troubleshoot the issue.{{< /note >}} +{{< call-out "note" >}} We recommend using this option only as a workaround if needed. If you do need to add the path to the NGINX config file, we ask that you [contact NGINX Support]({{< ref "/controller/support/contact-support.md" >}}) so they can help troubleshoot the issue.{{< /call-out >}} ## Set Host Tags @@ -117,15 +117,15 @@ You can define arbitrary tags on a "per-host" basis. Tags can be configured in t tags = foo bar foo:bar ``` -{{< note >}} Any changes to instance Tags made in the Controller user interface will overwrite the values stored in `agent.conf`.{{< /note >}} +{{< call-out "note" >}} Any changes to instance Tags made in the Controller user interface will overwrite the values stored in `agent.conf`.{{< /call-out >}} You can use tags to build custom graphs, configure alerts, and filter the systems on the **Graphs** page in the Controller user interface. ## Logging to Syslog -{{< see-also >}} +{{< call-out "note" >}} [NGINX Admin Guide - Logging to Syslog](https://docs.nginx.com/nginx/admin-guide/monitoring/logging/#logging-to-syslog) -{{< /see-also >}} +{{< /call-out>}} The NGINX Controller Agent can collect NGINX log files using `syslog`. This could be useful when you don't keep the NGINX logs on disk, or when monitoring a container environment such as Docker with NGINX Controller. @@ -147,9 +147,9 @@ To configure the NGINX Controller Agent to send logs to `syslog`: # service controller-agent restart ``` - {{< important >}} + {{< call-out "important" >}} Make sure you [add the `syslog` settings to your NGINX configuration file]({{< ref "/controller/admin-guides/config-agent/configure-metrics-collection.md#collect-metrics-from-syslog" >}}) as well. - {{< /important >}} + {{< /call-out >}} ## Exclude Certain NGINX Log Files @@ -182,9 +182,9 @@ Upon installation, the NGINX Controller Agent's log rotation schedule is added t The normal level of logging for the NGINX Controller Agent is `INFO`. If you ever need to debug the NGINX Controller Agent, change the level to `DEBUG` as described below. -{{< caution >}} +{{< call-out "caution" >}} The size of the NGINX Controller Agent's log file can proliferate in `DEBUG` mode. You should use `DEBUG` mode only for troubleshooting purposes. -{{< /caution >}} +{{< /call-out >}} ### Change the Agent Log Level diff --git a/content/controller/admin-guides/install/get-n-plus-cert-and-key.md b/content/controller/admin-guides/install/get-n-plus-cert-and-key.md index 55a141570..9b980d52f 100644 --- a/content/controller/admin-guides/install/get-n-plus-cert-and-key.md +++ b/content/controller/admin-guides/install/get-n-plus-cert-and-key.md @@ -19,9 +19,9 @@ This topic explains how to use the [F5 NGINX Controller REST API](https://docs.n The NGINX Controller API uses session cookies to authenticate requests. The session cookie is returned in response to a `GET /api/v1/platform/login` request. See the Login endpoint in the [NGINX Controller API Reference]({{< ref "/controller/api/_index.md" >}}) documentation for information about session cookie timeouts and invalidation. -{{< tip >}} +{{< call-out "tip" >}} You can send a GET request to the login endpoint to find the status of the session token. -{{< /tip >}} +{{< /call-out >}} For example: @@ -60,9 +60,9 @@ For example: curl -b cookie.txt -c cookie.txt -X GET --url 'https://192.0.2.0/api/v1/platform/licenses/nginx-plus-licenses/controller-provided' --output nginx-plus-certs.gz ``` -{{< note >}} +{{< call-out "note" >}} If you are using a self-signed certificate you will need to add `-k` (allow insecure connections) to your curl command to be able to download your NGINX Plus certificate and key bundle. -{{< /note >}} +{{< /call-out >}} Once you have downloaded your certificate and key bundle you will need to expand the `.gz` file to get your certificate and key pair. diff --git a/content/controller/admin-guides/install/install-agent-non-root.md b/content/controller/admin-guides/install/install-agent-non-root.md index 7d4dd31bf..8c58211cd 100644 --- a/content/controller/admin-guides/install/install-agent-non-root.md +++ b/content/controller/admin-guides/install/install-agent-non-root.md @@ -36,9 +36,9 @@ Take the following steps to add an instance to NGINX Controller: 1. Add a name for the instance. If you don't provide a name, the hostname of the instance is used by default. 1. To add the instance to an existing Location, select a Location from the list. Or to create a Location, select **Create New**. - {{< important >}} + {{< call-out "important" >}} Once set, the Location for an instance cannot be changed. If you need to change or remove the Location for an instance, you must [remove the instance from NGINX Controller]({{< ref "/controller/infrastructure/instances/manage-instances.md#delete-an-instance" >}}), and then add it back. - {{< /important >}} + {{< /call-out >}} 1. (Optional) By default, registration of NGINX Plus instances is performed over a secure connection. To use self-signed certificates with the Controller Agent, select **Allow insecure server connections to NGINX Controller using TLS**. For security purposes, we recommend that you secure the Controller Agent with signed certificates when possible. 1. Use SSH to connect and log in to the NGINX instance that you want to connect to NGINX Controller. @@ -51,7 +51,7 @@ Once set, the Location for an instance cannot be changed. If you need to change curl -sS -L https://
Welcome to nginx GTR !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/gtr.jpg b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/gtr.jpg new file mode 100644 index 000000000..be39ffe4a Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/gtr.jpg differ diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/index.html b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/index.html new file mode 100644 index 000000000..5d2b3044c --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/index.html @@ -0,0 +1,24 @@ + + + +Welcome to nginx!
+If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.
+ +For online documentation and support please refer to
+nginx.org.
+Commercial support is available at
+nginx.com.
Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.html b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.html new file mode 100644 index 000000000..fc1de05d1 --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.html @@ -0,0 +1,22 @@ + + + +Welcome to nginx NSX !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.jpg b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.jpg new file mode 100644 index 000000000..f3c27f59e Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/nsx.jpg differ diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.html b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.html new file mode 100644 index 000000000..468ddae0b --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.html @@ -0,0 +1,22 @@ + + + +Welcome to nginx RCF !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.jpg b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.jpg new file mode 100644 index 000000000..40faef6dc Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-oss/usr/share/nginx/html/rcf.jpg differ diff --git a/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/conf.d/default.conf b/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/conf.d/default.conf new file mode 100644 index 000000000..013d7b423 --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/conf.d/default.conf @@ -0,0 +1,64 @@ +server { + listen 80 default_server; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + location /test_header { + add_header X-Test-App true; + return 200 'HTTP/1.1 200 OK\nContent-Type: text/html\n\nWelcome to Lab 4 of the NGINX One Console Workshop!'; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + + # enable /api/ location with appropriate access control in order + # to make use of NGINX Plus API + # + #location /api/ { + # api write=on; + # allow 127.0.0.1; + # deny all; + #} + + # enable NGINX Plus Dashboard; requires /api/ location to be + # enabled and appropriate access control for remote access + # + #location = /dashboard.html { + # root /usr/share/nginx/html; + #} +} diff --git a/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/nginx.conf b/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/nginx.conf new file mode 100644 index 000000000..f0ece9626 --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/nginx.conf @@ -0,0 +1,75 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} + + +# TCP/UDP proxy and load balancing block +# +#stream { + # Example configuration for TCP load balancing + + #upstream stream_backend { + # zone tcp_servers 64k; + # server backend1.example.com:12345; + # server backend2.example.com:12345; + #} + + #server { + # listen 12345; + # status_zone tcp_server; + # proxy_pass stream_backend; + #} +#} + +# NGINX Plus Usage Reporting +# +# By default, every 30 minutes, NGINX Plus will send usage information +# to NGINX Instance Manager, resolved by a "nginx-mgmt.local" DNS entry. +# Alternate settings can be configured by uncommenting the "mgmt" block +# and optional directives. +# +#mgmt { + #usage_report endpoint=nginx-mgmt.local interval=30m; + #resolver DNS_IP; + + #uuid_file /var/lib/nginx/nginx.id; + + #ssl_protocols TLSv1.2 TLSv1.3; + #ssl_ciphers DEFAULT; + + #ssl_certificate client.pem; + #ssl_certificate_key client.key; + + #ssl_trusted_certificate trusted_ca_cert.crt; + #ssl_verify on; + #ssl_verify_depth 2; +#} diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/dashboard.html b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/dashboard.html new file mode 100644 index 000000000..5f1d00bf1 --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/dashboard.html @@ -0,0 +1,1929 @@ +Welcome to nginx GTR !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/gtr.jpg b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/gtr.jpg new file mode 100644 index 000000000..be39ffe4a Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/gtr.jpg differ diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/index.html b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/index.html new file mode 100644 index 000000000..5d2b3044c --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/index.html @@ -0,0 +1,24 @@ + + + +Welcome to nginx!
+If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.
+ +For online documentation and support please refer to
+nginx.org.
+Commercial support is available at
+nginx.com.
Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.html b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.html new file mode 100644 index 000000000..fc1de05d1 --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.html @@ -0,0 +1,22 @@ + + + +Welcome to nginx NSX !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.jpg b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.jpg new file mode 100644 index 000000000..f3c27f59e Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/nsx.jpg differ diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.html b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.html new file mode 100644 index 000000000..468ddae0b --- /dev/null +++ b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.html @@ -0,0 +1,22 @@ + + + +Welcome to nginx RCF !
+If you see this page, the nginx web server is successfully installed and +working.
+ +
+
+Thank you for using nginx.
+ + diff --git a/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.jpg b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.jpg new file mode 100644 index 000000000..40faef6dc Binary files /dev/null and b/static/workshops/nginx-one/lab2/nginx-plus/usr/share/nginx/html/rcf.jpg differ diff --git a/templates/release-notes/example-release-notes.md b/templates/release-notes/example-release-notes.md index 60d8341b2..a3c4c558d 100644 --- a/templates/release-notes/example-release-notes.md +++ b/templates/release-notes/example-release-notes.md @@ -9,7 +9,7 @@ April 18, 2024 If you are already using a previous version of Nbeamex coffee, please make sure to clean your grinder and coffee maker thoroughly before adding the new coffee beans. This will ensure that you get the best flavor from the new beans. -{{< see-also >}}Please consult or [list of authorized retailers](https://nbeamex.com/retailers) to find the best coffee beans for your grinder.{{< /see-also >}} +{{< call-out "note" >}}Please consult or [list of authorized retailers](https://nbeamex.com/retailers) to find the best coffee beans for your grinder.{{< /call-out>}} ### What's new @@ -42,9 +42,9 @@ You can find the list of known issues in the [Known issues](https://nbeamex.com/ ### Security Updates -{{< important >}} +{{< call-out "important" >}} For the protection of our customers, NBeamex doesn't disclose security issues until an investigation has occurred and a fix is available. -{{< /important >}} +{{< /call-out >}} This release includes the following security updates: diff --git a/templates/release-notes/template-release-notes.md b/templates/release-notes/template-release-notes.md index f3a56e6a8..cbf53f38b 100644 --- a/templates/release-notes/template-release-notes.md +++ b/templates/release-notes/template-release-notes.md @@ -36,9 +36,9 @@ You can find the list of known issues in the [Known issues](https://example.com/ ### (Optional) Security updates -{{< important >}} +{{< call-out "important" >}} For the protection of our customers, F5 NGINX doesn't disclose security issues until an investigation has occurred and a fix is available. -{{< /important >}} +{{< /call-out >}} This release includes the following security updates: diff --git a/tests/constants.ts b/tests/constants.ts deleted file mode 100644 index 6484baac2..000000000 --- a/tests/constants.ts +++ /dev/null @@ -1,4 +0,0 @@ -/* - Place to store constant values. -*/ -export const TIMEOUT = 4000 \ No newline at end of file diff --git a/tests/search.spec.ts b/tests/search.spec.ts deleted file mode 100644 index c0b60f150..000000000 --- a/tests/search.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { test, expect} from '@playwright/test'; -import { handleConsentPopup, waitFor } from '../tests/utils/commonUtils.ts' - -test.describe("Testing search page", () => { - test('Searchbar is visible', async ({ page }) => { - await page.goto('/'); - await waitFor(() => handleConsentPopup(page)); - - const searchBox = page.locator('.CoveoSearchbox').first(); - const searchButton = page.locator('.CoveoSearchButton'); - const searchValue = "proxy"; - expect(searchBox).toBeVisible(); - - await searchBox.click(); - await page.keyboard.insertText(searchValue); - await searchButton.click(); - await page.waitForURL(`/search.html#q=${searchValue}&sort=relevancy`); - expect(await page.locator('div h1').innerHTML()).toBe('Search Results'); - }); - - test('Search page returns results without error', async ({ page }) => { - await page.goto("/search.html#q=proxy&sort=relevancy"); - await waitFor(() => handleConsentPopup(page)); - - await page.waitForSelector('div.coveo-result-list-container'); - const coveoErrorReport = page.locator('div.CoveoErrorReport'); - const errorReportDisplay = await coveoErrorReport.evaluate(e => window.getComputedStyle(e).display); - expect(errorReportDisplay).toBe('none'); - }); -}) \ No newline at end of file diff --git a/tests/utils/commonUtils.ts b/tests/utils/commonUtils.ts deleted file mode 100644 index 4a20e87b7..000000000 --- a/tests/utils/commonUtils.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { expect, type Page } from '@playwright/test'; -import { TIMEOUT } from '../../tests/constants.ts'; - -// THE GDPR Consent button appears when test is run from EU locations. This handles that popup. -export async function handleConsentPopup(page: Page) { - const consentContent = page.locator('#truste-consent-content'); - const isConsentContentVisibile = await consentContent.isVisible(); - if(isConsentContentVisibile) { - const consentButton = page.locator('#truste-consent-required'); - expect(consentButton).toBeVisible(); - await consentButton.click(); - } -} - -let sleep = ms => new Promise(r => setTimeout(r, ms)); -export let waitFor = async function waitFor(f, ftimeout=TIMEOUT){ - while(!f()) await sleep(ftimeout); - return f(); -}; \ No newline at end of file