Skip to content

Commit 3eaebb5

Browse files
authored
Merge branch 'main' into update-alert-migration-steps
2 parents ebb21ef + c9290c9 commit 3eaebb5

File tree

18 files changed

+98
-96
lines changed

18 files changed

+98
-96
lines changed

content/includes/use-cases/monitoring/n1c-dashboard-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Navigating the dashboard:
1010
- **Refine metric timeframe**: Metrics show the last hour's data by default. To view data from a different period, select the time interval you want from the drop-down menu.
1111

1212
<span style="display: inline-block; margin-top: 20px; margin-bottom: 50px;">
13-
{{< img src="nginx-one/images/nginx-one-dashboard.png">}}
13+
{{< img src="nginx-one-console/images/nginx-one-dashboard.png">}}
1414
</span>
1515

1616
{{<bootstrap-table "table table-striped table-bordered">}}

content/ngf/reference/cli-help.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ This command runs the NGINX Gateway Fabric control plane.
5959
| _nginx-one-tls-skip-verify_ | _bool_ | Skip TLS verification for NGINX One Console connections. |
6060
| _gateway-api-inference-extension_ | _bool_ | Enable Gateway API Inference Extension support. Allows for configuring InferencePools to route traffic to AI workloads. (Default: `false`) |
6161
| _agent-tls-secret_ | _string_ | The name of the base Secret containing TLS CA, certificate, and key for the NGINX Agent to securely communicate with the NGINX Gateway Fabric control plane. Must exist in the same namespace that the NGINX Gateway Fabric control plane is running in (default namespace: nginx-gateway). (Default `agent-tls`) |
62+
| _endpoint-picker-disable-tls_ | _bool_ | Disables TLS when connecting to the EndpointPicker. Set to true only for development/testing or when using a service mesh for encryption. (Default: `false`) |
63+
| _endpoint-picker-tls-skip-verify_ | _bool_ | Disables server certificate verification when connecting to the EndpointPicker, if TLS is enabled. REQUIRED: Must be true until Gateway API Inference Extension EndpointPicker supports mounting certificates. (Default `true`) |
6264

6365
## Sleep
6466

content/nginx-one-console/api/api-reference-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ tags:
99
title: API reference guide
1010
toc: false
1111
weight: null
12-
nd-api-reference: "./nginx-one/api/one.json"
12+
nd-api-reference: "./nginx-one-console/api/one.json"
1313
---

content/nginx-one-console/workshops/lab3/explore-nginx-one-console-features.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Make sure you have:
4848
Open NGINX One Console and select **Overview**. Here are the key metrics and what they mean:
4949

5050
<span style="display: inline-block;">
51-
{{< img src="nginx-one/images/nginx-one-dashboard.png"
51+
{{< img src="nginx-one-console/images/nginx-one-dashboard.png"
5252
alt="Overview dashboard showing panels for instance availability, NGINX versions, operating systems, certificates status, configuration recommendations, CVE severity, CPU and memory utilization, disk space usage, unsuccessful response codes, and network usage." >}}
5353
</span>
5454

@@ -147,7 +147,7 @@ The **Configuration Recommendations** panel provides suggestions:
147147
8. Select **Next** to preview your changes, then select **Save and Publish** to apply them.
148148

149149
<span style="display: inline-block;">
150-
{{< img src="nginx-one/images/config-recommendation.png"
150+
{{< img src="nginx-one-console/images/config-recommendation.png"
151151
alt="Configuration recommendation panel showing a Best Practice warning: 'log should not be set to off on line 34', with a pencil icon to edit." >}}
152152
</span>
153153

@@ -170,7 +170,7 @@ Try it on:
170170
- `$upstream_response_time`
171171

172172
<span style="display: inline-block;">
173-
{{< img src="nginx-one/images/ai-assistant.png"
173+
{{< img src="nginx-one-console/images/ai-assistant.png"
174174
alt="AI Assistant panel showing a highlighted $upstream_response_time snippet alongside the assistant's response with Purpose and Guidance headings." >}}
175175
</span>
176176

content/nginx-one-console/workshops/lab4/config-sync-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Instead of registering containers manually, you can set the sync group in your C
139139
6. Instances automatically sync the existing NGINX config. When sync finishes, the **Config Sync Status** shows `In Sync`.
140140

141141
<span style="display: inline-block;">
142-
{{< img src="nginx-one/images/config-sync-status.png"
142+
{{< img src="nginx-one-console/images/config-sync-status.png"
143143
alt="Table showing hostnames, NGINX versions, operating systems, availability status, and green In Sync indicators for each instance in the config sync group." >}}
144144
</span>
145145

@@ -163,7 +163,7 @@ Modify the shared configuration and apply the changes to all group members.
163163
```
164164

165165
<span style="display: inline-block;">
166-
{{< img src="nginx-one/images/config-sync-edits.png" alt="Editor showing modifications to default.conf with validator status 'NGINX Config OK'." >}}
166+
{{< img src="nginx-one-console/images/config-sync-edits.png" alt="Editor showing modifications to default.conf with validator status 'NGINX Config OK'." >}}
167167
</span>
168168

169169
The file is marked **modified** and the validator shows **NGINX Config OK**.

content/nginx-one-console/workshops/lab5/upgrade-nginx-plus-to-latest-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ When you recreate containers, old entries remain in NGINX One Console. Clean the
115115
5. Remove the filter by selecting the **X** next to the filter tag.
116116

117117
<span style="display: inline-block;">
118-
{{< img src="nginx-one/images/unavailable-instances.png"
118+
{{< img src="nginx-one-console/images/unavailable-instances.png"
119119
alt="Table of three NGINX One Console instances filtered to 'Availability = Unavailable.' Shows hostnames, NGINX versions, grey Unavailable icons, and the Delete selected button." >}}
120120
</span>
121121

content/nginxaas-google/getting-started/create-deployment/deploy-console.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ Before you can deploy NGINXaaS, follow the steps in the [Prerequisites]({{< ref
1818

1919
### Create a network attachment
2020

21-
NGINXaaS requires a [network attachment](https://cloud.google.com/vpc/docs/about-network-attachments) to connect your consumer Virtual Private Cloud (VPC) network and your NGINXaaS deployment's VPC network.
21+
NGINXaaS requires a [network attachment](https://cloud.google.com/vpc/docs/about-network-attachments) to connect your NGINXaaS deployment to your VPC network.
2222

2323
1. Access the [Google Cloud Console](https://console.cloud.google.com/).
2424
1. Create a consumer VPC network and subnetwork. See [Google's documentation on creating a VPC and subnet](https://cloud.google.com/vpc/docs/create-modify-vpc-networks#console_1) for a step-by-step guide.
25-
- The region you choose in this step must match the region where your NGINXaaS deployment will be created.
26-
1. Create a network attachment in your new subnet that automatically accepts connections. See [Google's documentation on creating a network attachment](https://cloud.google.com/vpc/docs/create-manage-network-attachments#console_1) for a step-by-step guide.
27-
1. Make a note of the network attachment ID. You will need it in the next steps to create your NGINXaaS deployment.
25+
- The region you select for the network attachment determines the region where your NGINXaaS deployment will be created. You do not manually select a region when creating an NGINXaaS deployment; it will automatically be created in the same region as the network attachment.
26+
1. Create a network attachment in your new subnet. See [Google's documentation on creating a network attachment](https://cloud.google.com/vpc/docs/create-manage-network-attachments#create-network-attachments) for a step-by-step guide.
27+
- For **production use cases**, we recommend setting the **Connection preference** on the Network Attachment resource to **Accept connections from selected projects**. This lets you manually approve trusted connections, as this setting cannot be changed later. To start, you can leave the list of accepted projects empty and add the NGINXaaS deployment project after it is created.
28+
- For **development use cases**, you can set the **Connection preference** to **Automatically accept connections from all projects**, which allows connections without manual approval. If you choose this option, you don't need to explicitly allow the NGINXaaS deployment project.
29+
2. Make a note of the network attachment ID. You will need it in the next steps to create your NGINXaaS deployment.
2830

2931
{{< call-out "caution" >}}NGINXaaS for Google Cloud currently supports the following regions:
3032

@@ -68,6 +70,8 @@ Next, create a new NGINXaaS deployment using the NGINXaaS Console:
6870

6971
Your new deployment will appear in the list of deployments. The status of the deployment will be "Pending" while the deployment is being created. Once the deployment is complete, the status will change to "Ready".
7072

73+
{{< call-out "important" >}}If the **Connection preference** on the Network Attachment resource is set to **Accept connections from selected projects**, you will need to add the **NGINXaaS deployment project** to the list of **Accepted projects** for the deployment to provision successfully. The NGINXaaS deployment `Project ID` can be found under the `Cloud Info` section for your deployment. Failing to do so will leave the deployment in a `Pending` state, with details provided on the necessary actions required to proceed.{{< /call-out >}}
74+
7175
## Configure your deployment
7276

7377
In the NGINXaaS Console,
@@ -107,4 +111,4 @@ To set up connectivity to your NGINXaaS deployment, you will need to configure a
107111

108112
## What's next
109113

110-
[Manage your NGINXaaS users]({{< ref "/nginxaas-google/getting-started/manage-users-accounts.md" >}})
114+
[Manage your NGINXaaS users]({{< ref "/nginxaas-google/getting-started/manage-users-organizations.md" >}})

content/nginxaas-google/getting-started/manage-users-accounts.md

Lines changed: 0 additions & 71 deletions
This file was deleted.
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
title: Manage users and organizations
3+
weight: 300
4+
toc: true
5+
nd-docs: DOCS-000
6+
url: /nginxaas/google/getting-started/manage-users-organizations/
7+
type:
8+
- how-to
9+
---
10+
11+
## Overview
12+
13+
This document explains how to manage users and organizations in F5 NGINXaaS for Google Cloud using the NGINXaaS console.
14+
15+
Before you start, ensure you understand the following concepts:
16+
17+
- **NGINXaaS Organization**: An NGINXaaS Organization is created when you subscribe to *F5 NGINXaaS for Google Cloud* via the Google Cloud Marketplace, as described in [prerequisites]({{< ref "/nginxaas-google/getting-started/prerequisites.md" >}}). You may create multiple NGINXaaS Organizations by signing up with different GCP billing accounts.
18+
- **User**: NGINXaaS Users are granted access to all resources in the NGINXaaS Organization. User authentication is performed securely via Google Cloud, requiring a matching identity. Individuals can be added as users to multiple NGINXaaS Organizations, and can switch between them using the steps documented below.
19+
- **Authorized Domains**: The list of domains allowed to authenticate into the NGINXaaS Organization using Google authentication.
20+
- This can be used to restrict access to Google identities within your Google Cloud Organization or Google Workspace, or other known, trusted Workspaces. For example, your Google Cloud Organization may have users created under the `example.com` domain. By setting the Authorized Domains in your NGINXaaS Organization to only allow `example.com`, users attempting to log in with the same email associated with `alternative.net` Google Workspace would not be authenticated.
21+
- By default, an NGINXaaS Organization has an empty authorized domains list, which accepts matching users from any Google Workspace.
22+
23+
## Add or edit a user
24+
25+
An existing NGINXaaS Organization user can add additional users following these steps:
26+
27+
1. Access the [NGINXaaS Console](https://console.nginxaas.net/).
28+
1. Log in to the console with your Google credentials.
29+
1. Navigate to **Users** page on the left menu, then select **Add User**.
30+
1. Enter the **Email** address for the user to be added. The email must match the individual's Google User to be able to authenticate successfully.
31+
1. Select **Create User** to save the changes.
32+
33+
The new user will appear in the list of users on the **Users** page. Their **Google Identity Domain** will remain empty until they log in for the first time.
34+
35+
## Modify organization settings
36+
37+
As an authenticated user, you may modify the authorized domains and name of an NGINXaaS Organization.
38+
39+
40+
### Modify Authorized Domains
41+
42+
1. Select **Organization Details** under the **Settings** section on the left menu.
43+
1. Select **Edit** in the **Authorized Domains** section.
44+
1. To add a new authorized domain, select **Add Domain** and enter the new domain.
45+
1. To remove an existing authorized domain, select the Recycle Bin button next to it.
46+
1. Select **Update** to save changes.
47+
48+
{{< call-out "note" >}}You cannot remove an authorized domain from the list if it matches an existing user's Google Identity Domain. To remove access from that domain you must first delete every NGINXaaS user that is associated with the domain.{{< /call-out >}}
49+
50+
### Modify the name of an organization
51+
52+
1. Select **Organization Details** under the **Settings** section on the left menu.
53+
1. Select **Edit** in the **Organization Info** section.
54+
1. Enter new name in **Organization Name** field, then select **Update** to save changes.
55+
56+
## Switch organizations
57+
58+
To switch to a different NGINXaaS Organization, select the profile symbol in the top right corner and choose **Switch Organization**. This opens a page showing the list of all the NGINXaaS Organizations that your Google Identity is linked to; select the organization you want to switch to.
59+
60+
## Delete a user
61+
62+
An authenticated user can delete other users (other than their own user account). Deletion is irreversible; the deleted user will no longer be able to access the NGINXaaS Organization.
63+
64+
To delete a user in an NGINXaaS Organization:
65+
66+
1. Select **Organization Details** under the **Settings** section on the left menu.
67+
1. Select the ellipsis (three dots) menu next to the user you want to delete.
68+
1. Select **Delete** in the menu. The deleted user will no longer appear in the **Users** page.
69+
70+
## What's next
71+
[Add certificates using the NGINXaaS Console]({{< ref "/nginxaas-google/getting-started/ssl-tls-certificates/ssl-tls-certificates-console.md" >}})

content/nginxaas-google/glossary.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ This document provides definitions for terms and acronyms commonly used in F5 NG
1818
| GC (Geographical Controller)| Geographical Controller (GC) is a control plane that serves users in a given geographical boundary while taking into account concerns relating to data residency and localization. Example: A US geographical controller serves US customers. We currently have presence in two Geographies: **US** and **EU**. |
1919
| NGINXaas Account | Represents a Google Cloud procurement with an active Marketplace NGINXaaS subscription, linked to a billing account. To create an account, see the signup documentation in [prerequisites]({{< ref "/nginxaas-google/getting-started/prerequisites.md" >}}). |
2020
| NGINXaaS User | NGINXaaS Users are granted access to all resources in the NGINXaaS Account. User authentication is performed securely via Google Cloud, requiring a matching identity. Individuals can be added as users to multiple NGINXaaS Accounts, and can switch between them using the steps documented below. |
21-
| Network attachment | A Google Cloud resource that enables a VM instance to connect to a VPC network. [More information](https://cloud.google.com/vpc/docs/about-network-attachments). |
2221
| VPC network | A Virtual Private Cloud (VPC) network is a virtual version of a physical network, implemented within Google Cloud. It provides networking functionality for your Google Cloud resources. [More information](https://cloud.google.com/vpc/docs/vpc). |
22+
| Network attachment | A Google Cloud resource that connects your NGINXaaS deployment to upstream applications in your VPC network. [More information](https://cloud.google.com/vpc/docs/about-network-attachments). |
2323

24-
25-
26-
{{</table>}}
24+
{{</table>}}

0 commit comments

Comments
 (0)