From 0e85a8f2361cc0bbc015e907b6ab29b3e1c0c0c7 Mon Sep 17 00:00:00 2001 From: kelseiv <47797004+kelseiv@users.noreply.github.com> Date: Tue, 1 Feb 2022 17:53:43 -0800 Subject: [PATCH 001/122] Create new limits page (#3355) * WIP * WIP 2 * WIP 3 * work with Gunnar +editorial pass * updates to pricing * more WIP updates * update plan links * edit from Gunnar * add table for error limits * edit * clarifications between global and plan limits * add edit from Rob Kramer * edits from Ryan * edit from Tim * Update content/influxdb/cloud/account-management/billing.md * Update data-usage.md * update menu * add query and task processing global limits * add note about interval and rmv API responses * update intr * More updates to the limits page * edits with Gunnar * Update content/influxdb/cloud/account-management/limits.md * Update content/influxdb/cloud/account-management/limits.md * Update content/influxdb/cloud/account-management/limits.md * Update content/influxdb/cloud/account-management/limits.md * Update content/influxdb/cloud/account-management/limits.md Co-authored-by: Greg <2653109+glinton@users.noreply.github.com> * edits from Tim * Update content/influxdb/cloud/account-management/limits.md * Update content/influxdb/cloud/account-management/limits.md * Removes old frontmatter, crosslinks usage docs, fixes typo (#3738) * removed old frontmatter, crosslinked usage docs, fixed typo * Apply suggestions from code review * delete old comment * edits from Scott * edit * reorder column content and update old links Co-authored-by: Gunnar Aasen Co-authored-by: Greg <2653109+glinton@users.noreply.github.com> Co-authored-by: Scott Anderson --- .../monitor/monitor-with-cloud.md | 2 +- .../v0.x/stdlib/experimental/usage/from.md | 3 + .../v0.x/stdlib/experimental/usage/limits.md | 2 + .../cloud/account-management/_index.md | 2 - .../cloud/account-management/billing.md | 5 +- .../cloud/account-management/data-usage.md | 37 +------ .../cloud/account-management/limits.md | 104 ++++++++++++++++++ .../cloud/account-management/offboarding.md | 1 - .../account-management/pricing-calculator.md | 1 - .../cloud/account-management/pricing-plans.md | 66 ++--------- .../cloud/influxdb-templates/cloud.md | 1 - .../influxdb-templates/monitor-enterprise.md | 2 +- .../execute-queries/query-demo-data.md | 2 +- .../cloud/reference/api/influxdb-1x/_index.md | 1 - .../cloud/reference/api/influxdb-1x/query.md | 1 - .../cloud/reference/api/influxdb-1x/write.md | 1 - content/influxdb/cloud/sign-up.md | 4 +- .../cloud/upgrade/v1-to-cloud/_index.md | 4 +- content/influxdb/cloud/upgrade/v2-to-cloud.md | 3 +- .../cloud/write-data/bulk-ingest-cloud.md | 1 - .../v2.0/influxdb-templates/monitor.md | 2 +- content/influxdb/v2.0/install.md | 4 +- .../monitoring/influxdata-platform/_index.md | 4 +- 23 files changed, 140 insertions(+), 113 deletions(-) create mode 100644 content/influxdb/cloud/account-management/limits.md diff --git a/content/enterprise_influxdb/v1.9/administration/monitor/monitor-with-cloud.md b/content/enterprise_influxdb/v1.9/administration/monitor/monitor-with-cloud.md index e9647bf86..73c19f5a4 100644 --- a/content/enterprise_influxdb/v1.9/administration/monitor/monitor-with-cloud.md +++ b/content/enterprise_influxdb/v1.9/administration/monitor/monitor-with-cloud.md @@ -32,7 +32,7 @@ Before you begin, make sure you have access to the following: - An InfluxDB Cloud account. ([Sign up for free here](https://cloud2.influxdata.com/signup)). - Command line access to a machine [running InfluxDB Enterprise 1.x](/enterprise_influxdb/v1.9/introduction/install-and-deploy/) and permissions to install Telegraf on this machine. - Internet connectivity from the machine running InfluxDB Enterprise 1.x and Telegraf to InfluxDB Cloud. - - Sufficient resource availability to install the template. (InfluxDB Cloud Free Plan accounts include [resource limits](/influxdb/cloud/account-management/pricing-plans/#resource-limits/influxdb/cloud/account-management/pricing-plans/#resource-limits).) + - Sufficient resource availability to install the template. (InfluxDB Cloud Free Plan accounts include a finite number of [available resources](/influxdb/cloud/account-management/limits/#free-plan-limits).) ## Install the InfluxDB Enterprise Monitoring template diff --git a/content/flux/v0.x/stdlib/experimental/usage/from.md b/content/flux/v0.x/stdlib/experimental/usage/from.md index fb18cab33..6fd267fe9 100644 --- a/content/flux/v0.x/stdlib/experimental/usage/from.md +++ b/content/flux/v0.x/stdlib/experimental/usage/from.md @@ -11,6 +11,9 @@ aliases: - /influxdb/cloud/reference/flux/stdlib/experimental/usage/from/ weight: 401 flux/v0.x/tags: [inputs] +related: + - /influxdb/cloud/account-management/data-usage/ + - /influxdb/cloud/account-management/limits/ --- `usage.from()` returns usage data from an **InfluxDB Cloud** organization. diff --git a/content/flux/v0.x/stdlib/experimental/usage/limits.md b/content/flux/v0.x/stdlib/experimental/usage/limits.md index 37f46baff..39eb4a947 100644 --- a/content/flux/v0.x/stdlib/experimental/usage/limits.md +++ b/content/flux/v0.x/stdlib/experimental/usage/limits.md @@ -13,6 +13,8 @@ aliases: weight: 401 related: - /flux/v0.x/stdlib/influxdata/influxdb/cardinality/ + - /influxdb/cloud/account-management/data-usage/ + - /influxdb/cloud/account-management/limits/ --- The `usage.limits()` function returns a record containing usage limits for an diff --git a/content/influxdb/cloud/account-management/_index.md b/content/influxdb/cloud/account-management/_index.md index ce4e5efc7..cb48c56f0 100644 --- a/content/influxdb/cloud/account-management/_index.md +++ b/content/influxdb/cloud/account-management/_index.md @@ -4,14 +4,12 @@ description: > View and manage information related to your InfluxDB Cloud account such as pricing plans, data usage, account cancelation, etc. weight: 10 -products: [cloud] aliases: - /influxdb/v2.0/cloud/account-management/ - /influxdb/v2.0/account-management menu: influxdb_cloud: name: Account management -products: [cloud] --- {{< children >}} diff --git a/content/influxdb/cloud/account-management/billing.md b/content/influxdb/cloud/account-management/billing.md index 4785ce212..70d655490 100644 --- a/content/influxdb/cloud/account-management/billing.md +++ b/content/influxdb/cloud/account-management/billing.md @@ -13,7 +13,6 @@ menu: influxdb_cloud: parent: Account management name: Manage billing -products: [cloud] --- Learn how to upgrade your plan, access billing details, and review and resolve plan limit overages: @@ -98,9 +97,9 @@ On the **Billing page**, view the total limits available for the Free Plan. ## Review and resolve plan limit overages -If you exceed your plan's [limits](/influxdb/cloud/account-management/pricing-plans), you'll receive a notification in the {{< cloud-name "short" >}} user interface (UI) **Usage** page. +If you exceed your plan's [adjustable quotas or limits](/influxdb/cloud/account-management/limits/), you'll receive a notification in the {{< cloud-name "short" >}} user interface (UI) **Usage** page. -If exceed the series cardinality limit, InfluxDB adds a rate limit event to your **Usage** page for review, and begins to reject write requests. To start processing write requests again, do the following as needed: +If you exceed the series cardinality limit, InfluxDB adds a rate limit event warning on the **Usage** page, and begins to reject write requests with new series. To start processing write requests again, do the following as needed: - **Usage-Based plan**: To request higher rate limits, contact [InfluxData Support](mailto:support@influxdata.com). - **Series cardinality limits**: If you exceed the series cardinality limit, see how to [resolve high series cardinality](https://docs.influxdata.com/influxdb/v2.0/write-data/best-practices/resolve-high-cardinality/). diff --git a/content/influxdb/cloud/account-management/data-usage.md b/content/influxdb/cloud/account-management/data-usage.md index 92053a7b4..315183d0a 100644 --- a/content/influxdb/cloud/account-management/data-usage.md +++ b/content/influxdb/cloud/account-management/data-usage.md @@ -11,10 +11,12 @@ menu: influxdb_cloud: parent: Account management name: View data usage -products: [cloud] +related: + - /flux/v0.x/stdlib/experimental/usage/from/ + - /flux/v0.x/stdlib/experimental/usage/limits/ --- -View the statistics of your data usage and rate limits (reads, writes, and delete limits) on the Usage page. Some usage data affects monthly costs (pricing vectors) and other usage data, including delete limits, does not affect pricing. For more information about costs and limits, see the [pricing plans](/influxdb/cloud/account-management/pricing-plans/). +View the statistics of your data usage and rate limits (reads, writes, and delete limits) on the Usage page. Some usage data affects monthly costs ([pricing vectors](/influxdb/cloud/account-management/pricing-plans/#pricing-vectors)) and other usage data (for example, delete limits), does not affect pricing. For more information, see the [InfluxDB Cloud limits and adjustable quotas](/influxdb/cloud/account-management/limits/). To view your {{< cloud-name >}} data usage, do the following: @@ -28,34 +30,3 @@ To view your {{< cloud-name >}} data usage, do the following: - **Data Out:** Total data in MB sent as responses to queries from your {{< cloud-name "short" >}} instance. A line graph displays usage for the selected vector for the specified time period. - -## Exceeded rate limits - -If you exceed your [plan's data limits](/influxdb/cloud/account-management/pricing-plans/), {{< cloud-name >}} UI displays a notification message, and the following occurs: - -- When **write or read requests or series cardinality exceed** the specified limit within a five-minute window, the request is rejected and the following events appears under **Limit Events** on the Usage page as applicable: `event_type_limited_query` or `event_type_limited_write` or `event_type_limited_cardinality` - - _To raise these rate limits, [upgrade to a Usage-based Plan](/influxdb/cloud/account-management/billing/#upgrade-to-usage-based-plan)._ - -- When **delete requests exceed** the specified limit within a five-minute window, the request is rejected and `event_type_limited_delete_rate` appears under **Limit Events** on the Usage page. - {{% note %}} -**Tip:** -Combine predicate expressions (if possible) into a single request. InfluxDB rate limits per number of requests (not points in request). -{{% /note %}} - -### InfluxDB API: HTTP rate limit responses - -The InfluxDB API returns the following responses: - -- When a **read or write or delete request exceeds** limits: - - ``` - HTTP 429 “Too Many Requests” - Retry-After: xxx (seconds to wait before retrying the request) - ``` - -- When **series cardinality exceeds** your plan's limit: - - ``` - HTTP 503 “Series cardinality exceeds your plan's limit” - ``` diff --git a/content/influxdb/cloud/account-management/limits.md b/content/influxdb/cloud/account-management/limits.md new file mode 100644 index 000000000..e87dc0d97 --- /dev/null +++ b/content/influxdb/cloud/account-management/limits.md @@ -0,0 +1,104 @@ +--- +title: InfluxDB Cloud limits and adjustable quotas +description: > + InfluxDB Cloud has adjustable service quotas and global (non-adjustable) system limits. +weight: 110 +menu: + influxdb_cloud: + parent: Account management + name: Adjustable quotas and limits +related: + - /flux/v0.x/stdlib/experimental/usage/from/ + - /flux/v0.x/stdlib/experimental/usage/limits/ +--- + +InfluxDB Cloud applies (non-adjustable) global system limits and adjustable service quotas on a per organization basis. Currently, InfluxDB Cloud supports one organization per account. + +{{% warn %}} +All __rates__ (data-in (writes), queries (reads), and deletes) are accrued within a fixed five-minute window. Once a rate is exceeded, an error response is returned until the current five-minute window resets. +{{% /warn %}} + +Review adjustable service quotas and global limits to plan for your bandwidth needs: + +- [Adjustable service quotas](#adjustable-service-quotas) +- [Global limits](#global-limits) +- [UI error messages](#ui-error-messages) +- [API error responses](#api-error-responses) + +## Adjustable service quotas + +To reduce the chance of unexpected charges and protect the service for all users, InfluxDB Cloud has adjustable service quotas applied per account. + +_To request higher service quotas, reach out to [InfluxData Support](https://support.influxdata.com/)._ + +### Free Plan + +- **Data-in**: Rate of 5 MB per 5 minutes (average of 17 kb/s) + - Uncompressed bytes of normalized [line protocol](/influxdb/cloud/reference/syntax/line-protocol/) +- **Read**: Rate of 300 MB per 5 minutes (average of 1000 kb/s) + - Bytes in HTTP in response payload +- **Cardinality**: 10k series (see [cardinality](/influxdb/cloud/reference/glossary/#series-cardinality)) +- **Available resources**: + - 2 buckets (excluding `_monitoring` and `_tasks` buckets) + - 5 dashboards + - 5 tasks +- **Alerts**: + - 2 checks + - 2 notification rules + - Unlimited Slack notification endpoints +- **Storage**: 30 days of data retention (see [retention period](/influxdb/cloud/reference/glossary/#retention-period)) + +{{% note %}} +To write historical data older than 30 days, retain data for more than 30 days, or increase rate limits, upgrade to the Cloud [Usage-Based Plan](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan). +{{% /note %}} + +### Usage-Based Plan + +- **Data-in**: Rate of 3 GB per 5 minutes + - Uncompressed bytes of normalized [line protocol](/influxdb/cloud/reference/syntax/line-protocol/) +- **Read**: Rate of 3 GB data per 5 minutes + - Bytes in HTTP in response payload +- **Cardinality**: 1M series (see [cardinality](/influxdb/cloud/reference/glossary/#series-cardinality)) +- **Unlimited resources** + - dashboards + - tasks + - buckets + - users +- **Alerts** + - Unlimited checks + - Unlimited notification rules + - Unlimited notification endpoints for [all endpoints](/flux/v0.x/tags/notification-endpoints/) +- **Storage**: Set your retention period to unlimited or up to 1 year by [updating a bucket’s retention period in the InfluxDB UI](/influxdb/cloud/organizations/buckets/update-bucket/#update-a-buckets-retention-period-in-the-influxdb-ui), or [set a custom retention period](/influxdb/cloud/organizations/buckets/update-bucket/#update-a-buckets-retention-period) using the [`influx` CLI](influxdb/cloud/reference/cli/influx/). + +## Global limits + +InfluxDB Cloud applies global (non-adjustable) system limits to all accounts, which protects the InfluxDB Cloud infrastructure for all users. As the service continues to evolve, we'll continue to review these global limits and adjust them as appropriate. + +Limits include: + +- Write request limits: + - 5 MB maximum HTTP request batch size (compressed or uncompressed--defined in the `Content-Encoding` header) + - 250 MB maximum HTTP request batch size after decompression +- Query processing time: 90 seconds +- Task processing time: 150 seconds +- Delete request limit: Rate of 300 every 5 minutes + {{% note %}} +**Tip:** +Combine predicate expressions (if possible) into a single request. InfluxDB limits delete requests by number of requests (not points in request). +{{% /note %}} + +## UI error messages + +The {{< cloud-name >}} UI displays a notification message when service quotas or limits are exceeded. The error messages correspond with the relevant [API error responses](#api-error-responses). + +Errors can also be viewed in the [Usage page](/influxdb/cloud/account-management/data-usage/) under **Limit Events**, e.g. `event_type_limited_query`, `event_type_limited_write`,`event_type_limited_cardinality`, or `event_type_limited_delete_rate`. + +## API error responses + +The following API error responses occur when your plan's service quotas are exceeded. + +| HTTP response code | Error message | Description | +| :----------------------------- | :----------------------------------------- | :----------- | +| `HTTP 413 “Request Too Large”` | cannot read data: points in batch is too large | If a **write** request exceeds the maximum [global limit](/influxdb/cloud/account-management/limits/#global-limits)| +| `HTTP 429 “Too Many Requests”` | Retry-After: xxx (seconds to wait before retrying the request) | If a **read** or **write** request exceeds your plan's [adjustable service quotas](/influxdb/cloud/account-management/limits/#adjustable-service-quotas) or if a **delete** request exceeds the maximum [global limit](/influxdb/cloud/account-management/limits/#global-limits)| +| `HTTP 503 “Service unavailable“` |Series cardinality exceeds your plan's service quota| If **series cardinality** exceeds your plan's [adjustable service quotas](/influxdb/cloud/account-management/limits/#adjustable-service-quotas) | diff --git a/content/influxdb/cloud/account-management/offboarding.md b/content/influxdb/cloud/account-management/offboarding.md index c2e3d4261..fb0fc3805 100644 --- a/content/influxdb/cloud/account-management/offboarding.md +++ b/content/influxdb/cloud/account-management/offboarding.md @@ -11,7 +11,6 @@ menu: influxdb_cloud: parent: Account management name: Cancel InfluxDB Cloud -products: [cloud] --- To cancel your {{< cloud-name >}} subscription, complete the following steps: diff --git a/content/influxdb/cloud/account-management/pricing-calculator.md b/content/influxdb/cloud/account-management/pricing-calculator.md index 714b55d9b..f372cdfe3 100644 --- a/content/influxdb/cloud/account-management/pricing-calculator.md +++ b/content/influxdb/cloud/account-management/pricing-calculator.md @@ -7,7 +7,6 @@ weight: 2 menu: influxdb_cloud: name: Pricing calculator -products: [cloud] draft: true --- diff --git a/content/influxdb/cloud/account-management/pricing-plans.md b/content/influxdb/cloud/account-management/pricing-plans.md index 0e881c676..83d2b5e1e 100644 --- a/content/influxdb/cloud/account-management/pricing-plans.md +++ b/content/influxdb/cloud/account-management/pricing-plans.md @@ -1,5 +1,5 @@ --- -title: InfluxDB Cloud pricing plans +title: InfluxDB Cloud plans description: > InfluxDB Cloud provides two pricing plans to fit your needs – the Free Plan and the Usage-based Plan. aliases: @@ -11,62 +11,21 @@ menu: influxdb_cloud: parent: Account management name: Pricing plans -products: [cloud] --- -InfluxDB Cloud offers two plans, which provide different data and resource usage limits: - -- [Free Plan](#free-plan) -- [Usage-Based Plan](#usage-based-plan) +InfluxDB Cloud offers a [Free Plan](#free-plan), a [Usage-Based Plan](#usage-based-plan) to pay as you go, and a discounted [Annual Plan](#annual-plan). ## Free Plan -All new {{< cloud-name >}} accounts start with Free Plan that limits data and resource usage. -Use this plan as much and as long as you want within the Free Plan limits below. - -### Data limits - -- **Data In:** 5.1MB every 5 minutes -- **Query:** 300MB every 5 minutes -- **Series cardinality:** 10,000 -- **Storage:** 30-day data retention -{{% note %}} -To write historical data older than 30 days or retain data for more than 30 days, upgrade to the Cloud [Usage-Based plan](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan). -{{% /note %}} - -### Resource limits - - - 5 dashboards - - 5 tasks - - 2 buckets - - 2 checks - - 2 notification rules - - Unlimited Slack notification endpoints - -_To raise rate limits, [upgrade to a Usage-based Plan](/influxdb/cloud/account-management/billing/#upgrade-to-usage-based-plan)._ +All new {{< cloud-name >}} accounts start with Free Plan that provides a limited number of resources and data usage. See [plan limits](/influxdb/cloud/account-management/limits/). ## Usage-Based Plan -The Usage-based Plan offers more flexibility and ensures you only pay for what you [use](/influxdb/cloud/account-management/data-usage/). +The Usage-Based Plan offers more flexibility and ensures you only pay for what you [use](/influxdb/cloud/account-management/data-usage/). Usage-Based Plans are based on consumption as measured by usage on the [pricing vectors](#pricing-vectors). -### Data limit - -- **Ingest batch size:** 50MB - -### Soft data limits - -To protect against any intentional or unintentional harm, the Usage-Based Plan includes soft limits. -_To request higher soft data limits, contact [InfluxData Support](mailto:support@influxdata.com)._ - -- **Data In:** 300MB every 5 minutes -- **Query:** 3000MB every 5 minutes -- **Series cardinality:** 1,000,000 initial limit (higher limits available; [contact InfluxData Support](mailto:support@influxdata.com)) -- **Storage:** Unlimited retention -{{% note %}} -Set your retention period to unlimited or up to 1 year by [updating a bucket’s retention period in the InfluxDB UI](/influxdb/cloud/organizations/buckets/update-bucket/#update-a-buckets-retention-period-in-the-influxdb-ui), or [set a custom retention period](/influxdb/cloud/organizations/buckets/update-bucket/#update-a-buckets-retention-period) using the [`influx` CLI](/influxdb/cloud/reference/cli/influx/). -{{% /note %}} +Usage-Based Plans also offer access to all notification endpoints such as PagerDuty, Slack, HTTP, and [endpoints available in Flux](/flux/v0.x/tags/notification-endpoints/). ### Pricing vectors @@ -82,12 +41,11 @@ The Usage-Based Plan uses the following pricing vectors to calculate InfluxDB Cl Discover how to [manage InfluxDB Cloud billing](/influxdb/cloud/account-management/billing/). -### Unlimited resources +## Annual Plan + - - Dashboards - - Tasks - - Buckets - - Users - - Checks - - Notification rules - - PagerDuty, Slack, and HTTP notification endpoints +An Annual Plan offers a discount for a commitment to a specific amount of usage over set period of time. This plan uses the same pricing vectors and calculation methodology as Usage-Based Plans. + +__Interested in an Annual Plan? Reach out to [InfluxData Sales](https://www.influxdata.com/contact-sales/).__ + + diff --git a/content/influxdb/cloud/influxdb-templates/cloud.md b/content/influxdb/cloud/influxdb-templates/cloud.md index 1f50e1126..8ebde2517 100644 --- a/content/influxdb/cloud/influxdb-templates/cloud.md +++ b/content/influxdb/cloud/influxdb-templates/cloud.md @@ -12,7 +12,6 @@ weight: 101 aliases: - /influxdb/cloud/influxdb-templates/get_started_cloud/ influxdb/cloud/tags: [templates] -products: [cloud] --- To use templates in InfluxDB Cloud, you have a couple options: diff --git a/content/influxdb/cloud/influxdb-templates/monitor-enterprise.md b/content/influxdb/cloud/influxdb-templates/monitor-enterprise.md index dc10bfc41..b75a416b1 100644 --- a/content/influxdb/cloud/influxdb-templates/monitor-enterprise.md +++ b/content/influxdb/cloud/influxdb-templates/monitor-enterprise.md @@ -31,7 +31,7 @@ Before you begin, make sure you have access to the following: - InfluxDB Cloud account ([sign up for free here](https://cloud2.influxdata.com/signup)) - Command line access to a machine [running InfluxDB Enterprise 1.x](/enterprise_influxdb/v1.9/introduction/install-and-deploy/) and permissions to install Telegraf on this machine - Internet connectivity from the machine running InfluxDB Enterprise 1.x and Telegraf to InfluxDB Cloud - - Sufficient resource availability to install the template. InfluxDB Cloud Free Plan accounts include [resource limits](/influxdb/cloud/account-management/pricing-plans/#resource-limits/influxdb/cloud/account-management/pricing-plans/#resource-limits) + - Sufficient resource availability to install the template. InfluxDB Cloud Free Plan accounts include [resource limits](/influxdb/cloud/account-management/limits/#free-plan-limits) ## Install the InfluxDB Enterprise Monitoring template diff --git a/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md b/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md index c86742747..87186a701 100644 --- a/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md +++ b/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md @@ -25,7 +25,7 @@ types of demo data that let you explore and familiarize yourself with InfluxDB C {{% note %}} #### Free to use and read-only - InfluxDB Cloud demo data buckets are **free to use** and are **_not_ subject to - [Free Plan](/influxdb/cloud/account-management/pricing-plans/#free-plan) rate limits**. + [Free Plan rate limits](influxdb/cloud/account-management/limits/#free-plan-rate-limits) rate limits**. - Demo data buckets are **read-only**. You cannot write data into demo data buckets. {{% /note %}} diff --git a/content/influxdb/cloud/reference/api/influxdb-1x/_index.md b/content/influxdb/cloud/reference/api/influxdb-1x/_index.md index 5b5bb0552..c79d9e9ac 100644 --- a/content/influxdb/cloud/reference/api/influxdb-1x/_index.md +++ b/content/influxdb/cloud/reference/api/influxdb-1x/_index.md @@ -9,7 +9,6 @@ menu: parent: InfluxDB v2 API weight: 104 influxdb/cloud/tags: [influxql, query, write] -products: [cloud] related: - /influxdb/cloud/query-data/influxql --- diff --git a/content/influxdb/cloud/reference/api/influxdb-1x/query.md b/content/influxdb/cloud/reference/api/influxdb-1x/query.md index d45905cb0..d1f91a5ed 100644 --- a/content/influxdb/cloud/reference/api/influxdb-1x/query.md +++ b/content/influxdb/cloud/reference/api/influxdb-1x/query.md @@ -9,7 +9,6 @@ menu: parent: 1.x compatibility weight: 301 influxdb/cloud/tags: [influxql, query] -products: [cloud] list_code_example: | 
   GET https://cloud2.influxdata.com/query
diff --git a/content/influxdb/cloud/reference/api/influxdb-1x/write.md b/content/influxdb/cloud/reference/api/influxdb-1x/write.md
index db7fcddee..ee3cc2ee5 100644
--- a/content/influxdb/cloud/reference/api/influxdb-1x/write.md
+++ b/content/influxdb/cloud/reference/api/influxdb-1x/write.md
@@ -10,7 +10,6 @@ menu:
     parent: 1.x compatibility
 weight: 301
 influxdb/cloud/tags: [write]
-products: [cloud]
 list_code_example: |
   
   POST https://cloud2.influxdata.com/write
diff --git a/content/influxdb/cloud/sign-up.md b/content/influxdb/cloud/sign-up.md
index 815b8cec2..394c17806 100644
--- a/content/influxdb/cloud/sign-up.md
+++ b/content/influxdb/cloud/sign-up.md
@@ -30,10 +30,10 @@ The primary differences between InfluxDB OSS 2.0 and InfluxDB Cloud are:
 
 Start using {{< cloud-name >}} at no cost with the [Free Plan](/influxdb/cloud/account-management/pricing-plans/#free-plan).
 Use it as much and as long as you like within the plan's rate-limits.
-Limits are designed to let you monitor 5-10 sensors, stacks or servers comfortably.
+[Limits](#/influxdb/cloud/account-management/limits/) are designed to let you monitor 5-10 sensors, stacks or servers comfortably.
 
 {{% note %}}
-Users on the Free Plan are limited to one organization. 
+Users on the Free Plan are limited to one organization.
 {{% /note %}}
 
 ## Sign up
diff --git a/content/influxdb/cloud/upgrade/v1-to-cloud/_index.md b/content/influxdb/cloud/upgrade/v1-to-cloud/_index.md
index f3c3ba95b..3c40e1f4c 100644
--- a/content/influxdb/cloud/upgrade/v1-to-cloud/_index.md
+++ b/content/influxdb/cloud/upgrade/v1-to-cloud/_index.md
@@ -238,8 +238,8 @@ See [Required InfluxDB Cloud credentials](#required-influxdb-cloud-credentials)
 
 {{% note %}}
 #### InfluxDB Cloud write rate limits
-Write requests are subject to rate limits associated with your
-[InfluxDB Cloud pricing plan](/influxdb/cloud/account-management/pricing-plans/).
+Read and write requests are subject to [rate limits](/influxdb/cloud/account-management/limits/#rate-limits) associated with your
+InfluxDB Cloud plan.
 If your exported line protocol size potentially exceeds your rate limits,
 include the `--rate-limit` flag with `influx write` to rate limit written data.
 
diff --git a/content/influxdb/cloud/upgrade/v2-to-cloud.md b/content/influxdb/cloud/upgrade/v2-to-cloud.md
index db40e713c..fa68c85b2 100644
--- a/content/influxdb/cloud/upgrade/v2-to-cloud.md
+++ b/content/influxdb/cloud/upgrade/v2-to-cloud.md
@@ -112,8 +112,7 @@ your **InfluxDB Cloud** instance.
 
 {{% note %}}
 #### InfluxDB Cloud Free Plan resource limits
-If upgrading to an [InfluxDB Cloud Free Plan](/influxdb/cloud/account-management/pricing-plans/#free-plan),
-you are only able to create a limited number of resources.
+If upgrading to an InfluxDB Cloud Free Plan, you are only able to create a [limited number of resources](/influxdb/cloud/account-management/limits/#free-plan-limits).
 If your exported template exceeds these limits, the resource migration will fail.
 {{% /note %}}
 
diff --git a/content/influxdb/cloud/write-data/bulk-ingest-cloud.md b/content/influxdb/cloud/write-data/bulk-ingest-cloud.md
index d6287822c..ecc6586bc 100644
--- a/content/influxdb/cloud/write-data/bulk-ingest-cloud.md
+++ b/content/influxdb/cloud/write-data/bulk-ingest-cloud.md
@@ -9,7 +9,6 @@ menu:
   influxdb_cloud:
     name: Bulk ingest
     parent: Write data
-products: [cloud]
 alias:
   - /influxdb/v2.0/write-data/bulk-ingest-cloud
 ---
diff --git a/content/influxdb/v2.0/influxdb-templates/monitor.md b/content/influxdb/v2.0/influxdb-templates/monitor.md
index 4c3079129..8f2fc2c63 100644
--- a/content/influxdb/v2.0/influxdb-templates/monitor.md
+++ b/content/influxdb/v2.0/influxdb-templates/monitor.md
@@ -33,7 +33,7 @@ Before you begin, make sure you have access to the following:
  - InfluxDB Cloud account ([sign up for free here](https://cloud2.influxdata.com/signup))
  - Command line access to a machine [running InfluxDB OSS 2.x](/influxdb/v2.0/install/) and permissions to install Telegraf on this machine
  - Internet connectivity from the machine running InfluxDB OSS 2.x and Telegraf to InfluxDB Cloud
- - Sufficient resource availability to install the template. InfluxDB Cloud Free Plan accounts include [resource limits](/influxdb/cloud/account-management/pricing-plans/#resource-limits/influxdb/cloud/account-management/pricing-plans/#resource-limits)
+ - Sufficient resource availability to install the template. InfluxDB Cloud Free Plan accounts include [resource limits](/influxdb/cloud/account-management/limits/#free-plan-limits)
 
 ## Install the InfluxDB OSS Monitoring template
 
diff --git a/content/influxdb/v2.0/install.md b/content/influxdb/v2.0/install.md
index a435eb391..fd185d6a0 100644
--- a/content/influxdb/v2.0/install.md
+++ b/content/influxdb/v2.0/install.md
@@ -574,8 +574,8 @@ If you have a 32-bit Raspberry Pi, [use Telegraf](/{{< latest "telegraf" >}}/)
 to collect and send data to:
 
 - [InfluxDB OSS](/influxdb/v2.0/), running on a 64-bit system
-- InfluxDB Cloud with a [**Free Tier**](/influxdb/cloud/account-management/pricing-plans/#free-plan) account
-- InfluxDB Cloud with a paid [**Usage-Based**](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan) account with relaxed resource restrictions.
+- InfluxDB Cloud [Free Plan](/influxdb/cloud/account-management/pricing-plans/#free-plan)
+- InfluxDB Cloud [Usage-Based Plan](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan)
 
 {{% /tab-content %}}
 
diff --git a/content/platform/monitoring/influxdata-platform/_index.md b/content/platform/monitoring/influxdata-platform/_index.md
index 607b6d240..0c9db8b79 100644
--- a/content/platform/monitoring/influxdata-platform/_index.md
+++ b/content/platform/monitoring/influxdata-platform/_index.md
@@ -27,8 +27,8 @@ Use it as much and as long as you like within the plan’s rate-limits.
 Limits are designed to let you monitor 5-10 sensors, stacks or servers comfortably.
 Monitoring a single InfluxDB OSS instance or even a modest InfluxDB Enterprise
 cluster should easily fit within the free plan limits.
-If you exceed the plan limits because of high resolution data or longer data retention,
-upgrade to the [pay-as-you-go plan](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan).
+If you exceed the plan [limits](/influxdb/cloud/account-management/limits/) because of high resolution data or longer data retention,
+upgrade to the [Usage-Based Plan](/influxdb/cloud/account-management/pricing-plans/#usage-based-plan).
 
 Start monitoring your InfluxDB instance by signing up for an [InfluxDB Cloud account](https://cloud2.influxdata.com/signup).
 

From 573abad33ecb5aee4d064894f0901e63dcbd9ad3 Mon Sep 17 00:00:00 2001
From: lwandzura <51929958+lwandzura@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:30:46 -0600
Subject: [PATCH 002/122] Add Chronograf 1.9.3 release notes (#3735)

* Add 1.9.3 release notes

* Update content/chronograf/v1.9/about_the_project/release-notes-changelog.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* Update content/chronograf/v1.9/about_the_project/release-notes-changelog.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* Update content/chronograf/v1.9/about_the_project/release-notes-changelog.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* Update content/chronograf/v1.9/about_the_project/release-notes-changelog.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* Update content/chronograf/v1.9/about_the_project/release-notes-changelog.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* added note about 1.9.2

* made requested changes

* updated wording and release notes date

* updated 1.9.2 message

* removed warning message from 1.9.1

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>
---
 .../release-notes-changelog.md                | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/content/chronograf/v1.9/about_the_project/release-notes-changelog.md b/content/chronograf/v1.9/about_the_project/release-notes-changelog.md
index e15d25d6b..aac0e0ceb 100644
--- a/content/chronograf/v1.9/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.9/about_the_project/release-notes-changelog.md
@@ -8,6 +8,32 @@ menu:
     parent: About the project
 ---
 
+## v1.9.3 [2022-02-02]
+
+{{% note %}} **NOTE:** We did not release version 1.9.2 due to a bug that impacted communication between the browser’s main thread and background workers.  This bug has been fixed in the 1.9.3 release.
+{{% /note %}}
+
+### Features
+- Add ability to rename TICKscripts.
+- Add the following enhancements to the `InfluxDB Admin - Queries` tab:
+  - `CSV download` button. 
+  - Rename `Running` column to `Duration`.
+  - Add `Status` column. When hovering over the `Duration` column, status shows `Kill` confirmation button.
+  - Modify the `CSV` export to include the `Status` column.
+- Upgrade to use new `google.golang protobuf` library.
+
+### Bug Fixes
+- Ability to log the InfluxDB instance URL when a ping fails, making connection issues easier to identify.
+- Repair enforcement of one organization between multiple tabs.
+- Configure HTTP proxy from environment variables in HTTP clients. Improvements were made to:
+  - Token command within `chronoctl` 
+  - OAuth client
+  - Kapacitor client 
+  - Flux client
+
+#### Security
+- Upgrade `github.com/microcosm-cc/bluemonday` to resolve CVE-2021-42576.
+
 ## v1.9.1 [2021-10-08]
 
 ### Features

From 7e10ebcf0ade9b35f8e65e736da73230cba1acca Mon Sep 17 00:00:00 2001
From: noramullen1 <42354779+noramullen1@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:47:24 -0800
Subject: [PATCH 003/122] January cloud updates (#3723)

* Add january 2022 updates including cloud multi-account (addresses #3709 and #3685 )

* Update billing and new switch page

* Update cloud-updates.md

* Update content/influxdb/cloud/reference/release-notes/cloud-updates.md

* Update content/influxdb/cloud/reference/release-notes/cloud-updates.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* Update cloud-updates.md

* Address PR feedback

* Update content/influxdb/cloud/reference/release-notes/cloud-updates.md

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>
---
 .../cloud/account-management/billing.md       |  6 ++---
 .../account-management/switch-account.md      | 23 +++++++++++++++++++
 content/influxdb/cloud/organizations/users.md | 22 +++++++++---------
 .../reference/release-notes/cloud-updates.md  |  9 ++++++--
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 content/influxdb/cloud/account-management/switch-account.md

diff --git a/content/influxdb/cloud/account-management/billing.md b/content/influxdb/cloud/account-management/billing.md
index 70d655490..9633305d7 100644
--- a/content/influxdb/cloud/account-management/billing.md
+++ b/content/influxdb/cloud/account-management/billing.md
@@ -30,14 +30,15 @@ Learn how to upgrade your plan, access billing details, and review and resolve p
 
 ## Upgrade to Usage-Based Plan
 
-1. Click **Upgrade Now** in the lower left corner of the {{< cloud-name "short" >}} user interface (UI).
+1. Click **Upgrade Now** in the upper right corner of the {{< cloud-name "short" >}} user interface (UI).
 2. Set your limits (opt to receive an email when your usage exceeds the amount you enter in the **Limit ($1 minimum)** field). All service updates, security notifications, and other important information are sent to the email address you provide.
 3. Enter your payment information and billing address, and then click **Upgrade**. A Ready To Rock confirmation appears; click **Start building your team**. Your plan will be upgraded and {{< cloud-name >}} opens with a default organization and bucket (both created from your email address).
 
 ## Access billing details
 
 1. In the {{< cloud-name "short" >}} UI, select the **user avatar** in the left
-   navigation menu, and select **Billing**.
+   navigation menu, and select **Account** >
+   **Billing**.
 
     {{< nav-icon "account" >}}
 
@@ -126,4 +127,3 @@ Billing occurs on the first day of the month for the previous month. For example
 | **One week later**          | Account disabled except data writes. Update your payment method to successfully process your payment and enable your account. |
 | **10-14 days later**        | Account completely disabled. During this period, you must contact us at support@influxdata.com to process your payment and enable your account. |
 | **21 days later**           | Account suspended. Contact support@influxdata.com to settle your final bill and retrieve a copy of your data or access to InfluxDB Cloud dashboards, tasks, Telegraf configurations, and so on.|
-
diff --git a/content/influxdb/cloud/account-management/switch-account.md b/content/influxdb/cloud/account-management/switch-account.md
new file mode 100644
index 000000000..2cab9717b
--- /dev/null
+++ b/content/influxdb/cloud/account-management/switch-account.md
@@ -0,0 +1,23 @@
+---
+title: Switch InfluxDB Cloud accounts
+seotitle: Switch between InfluxDB Cloud accounts
+description: >
+  Switch from one InfluxDB Cloud account to another and set a default account.  
+menu:
+  influxdb_cloud:
+    name: Switch InfluxDB accounts
+    parent: Account management
+weight: 105
+---
+If you belong to more than one {{< cloud-name >}} account with the same email address, you can switch from one account to another while staying logged in. An account can contain multiple organizations. 
+
+You can also set a default account. The default account is the account automatically used when the user logs in.
+
+To switch {{< cloud-name "short" >}} accounts:
+
+1. In the {{< cloud-name "short" >}} UI, select the **user avatar** in the left
+   navigation menu, and select **Account** > **Settings**.
+2. Click **Switch Account**. If this option doesn't appear, your email address is only associated with one account.
+3. Select the account you want to switch to or set as the default in the window that appears.
+4. To switch to the account, select **Switch Account**.
+5. To set an account as the default, select **Set Default Account**.
diff --git a/content/influxdb/cloud/organizations/users.md b/content/influxdb/cloud/organizations/users.md
index 4969f783e..ffb7ee7a5 100644
--- a/content/influxdb/cloud/organizations/users.md
+++ b/content/influxdb/cloud/organizations/users.md
@@ -7,7 +7,7 @@ weight: 106
 menu:
   influxdb_cloud:
     parent: Manage organizations
-    name: Manage Users
+    name: Manage users
 aliases:
   - /influxdb/v2.0/account-management/multi-user/
   - /influxdb/cloud/account-management/multi-user/
@@ -16,7 +16,7 @@ aliases:
   - /influxdb/cloud/users/
 ---
 
-{{< cloud-name >}} lets you invite and collaborate with multiple users in your organization. 
+{{< cloud-name >}} lets you invite and collaborate with multiple users in your organization.
 By default, each user has full permissions on resources in your organization.
 
 - [Users management page](#users-management-page)
@@ -26,16 +26,16 @@ By default, each user has full permissions on resources in your organization.
 - [Remove a user from your organization](#remove-a-user-from-your-organization)
   - [Remove yourself from an organization](#remove-yourself-from-an-organization)
 
-## Users management page
-Manage your organization's users from your organization's **Users management page**.
+## Members page
+Manage your organization's users from your organization's **Members page**.
 In the {{< cloud-name "short" >}} user interface (UI), click your user avatar in the left
-navigation menu, and select **Users**.
+navigation menu, and select **Organization** > **Members**.
 
 {{< nav-icon "account" >}}
 
 ## Invite a user to your organization
 
-1.  Navigate to your organization's [Users management page](#users-management-page).
+1.  Navigate to your organization's [Members page](#members-page).
 2.  Under **Add a new user to your organization**, enter the email address of
     the user to invite and select their role in your organization.
 
@@ -57,22 +57,22 @@ Accounts can have up to 50 pending invitations at one time.
 
 ### Resend an invitation
 
-1.  Navigate to your organization's [Users management page](#users-management-page).
+1.  Navigate to your organization's [Members page](#members-page).
 2.  Click the **{{< icon "refresh" >}}** icon next to the invitation you want to resend.
 
 ### Withdraw an invitation
 
-1.  Navigate to your organization's [Users management page](#users-management-page).
+1.  Navigate to your organization's [Members page](#members-page).
 2.  Click the **{{< icon "delete" >}}** icon next to the invitation you want to withdraw.
 3.  Click **{{< caps >}}Withdraw Invitation{{< /caps >}}**.
 
 ## Remove a user from your organization
 
-1.  Navigate to your organization's [Users management page](#users-management-page).
+1.  Navigate to your organization's [Members page](#members-page).
 2.  Click the **{{< icon "delete" >}}** icon next to the user you want to remove.
 3.  Click **{{< caps >}}Remove user access{{< /caps >}}**.
 
-### Remove yourself from an organization 
+### Remove yourself from an organization
 
 You cannot remove yourself from an organization.
-Have another member of your organization remove you. 
+Have another member of your organization remove you.
diff --git a/content/influxdb/cloud/reference/release-notes/cloud-updates.md b/content/influxdb/cloud/reference/release-notes/cloud-updates.md
index cb147efe5..dbb13ee9e 100644
--- a/content/influxdb/cloud/reference/release-notes/cloud-updates.md
+++ b/content/influxdb/cloud/reference/release-notes/cloud-updates.md
@@ -14,10 +14,15 @@ aliases:
 InfluxDB Cloud updates occur frequently. Find a compilation of recent updates below.
 To find information about the latest Flux updates in InfluxDB Cloud, see [Flux release notes](/influxdb/cloud/reference/release-notes/flux/).
 
-
+To enhance security, the Tokens UI will only display an InfluxDB Cloud token when it's [first created](/influxdb/cloud/security/tokens/create-token/). If you return to the Token page later, you won't be able to view or copy the token. To learn more about token access restrictions, see [Create an API token](/influxdb/cloud/security/tokens/create-token/).
+
+### Multi-account support
+
+You can now invite a user to join an organization using the same email they've used in another InfluxDB Cloud account. Users [can switch between accounts in the UI](/influxdb/cloud/account-management/switch-account/).
 
 ## December 2021
 

From ddc41fa055a3f200e173c8f72a660e722fb97644 Mon Sep 17 00:00:00 2001
From: Scott Anderson 
Date: Wed, 2 Feb 2022 13:00:34 -0800
Subject: [PATCH 004/122] Support cloud regions with multiple clusters in the
 docs (#3693)

* support multiple clusters in cloud regions

* Apply suggestions from code review

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>
---
 assets/js/influxdb-url.js                     | 23 +++++++++++
 assets/styles/layouts/_url-selector.scss      | 39 +++++++++++++++++++
 assets/styles/layouts/article/_tables.scss    |  9 +++++
 content/influxdb/cloud/reference/regions.md   | 12 ++++++
 data/influxdb_urls.yml                        |  5 +++
 .../partials/footer/influxdb-url-modal.html   | 34 ++++++++++++----
 layouts/shortcodes/cloud_regions.html         | 14 +++++--
 7 files changed, 125 insertions(+), 11 deletions(-)

diff --git a/assets/js/influxdb-url.js b/assets/js/influxdb-url.js
index cc09b030c..c03a04e02 100644
--- a/assets/js/influxdb-url.js
+++ b/assets/js/influxdb-url.js
@@ -276,6 +276,29 @@ $("#modal-close, .modal-overlay, .url-trigger").click(function(e) {
   toggleModal()
 })
 
+
+// Add checked to fake-radio if cluster is selected on page load
+if ($("ul.clusters label input").is(":checked")) {
+  var group = $("ul.clusters label input:checked").parent().parent().parent().siblings();
+  $(".fake-radio", group).addClass("checked");
+};
+
+// Select first cluster when region is clicked
+$("p.region").click(function () {
+  if (!$(".fake-radio", this).hasClass("checked")) {
+    $(".fake-radio", this).addClass("checked");
+    $("+ ul.clusters li:first label", this).trigger("click");
+  };
+});
+
+// Remove checked class from fake-radio when another region is selected
+$(".region-group").click(function () {
+  if (!$(".fake-radio", this).hasClass("checked")) {
+    $(".fake-radio", !this).removeClass("checked");
+    $(".fake-radio", this).addClass("checked");
+  }
+})
+
 // Update URLs and URL preference when selected/clicked in the modal
 $('input[name="influxdb-cloud-url"]').change(function() {
   var newUrl = $(this).val()
diff --git a/assets/styles/layouts/_url-selector.scss b/assets/styles/layouts/_url-selector.scss
index fcbd9e83e..3f5a53c04 100644
--- a/assets/styles/layouts/_url-selector.scss
+++ b/assets/styles/layouts/_url-selector.scss
@@ -131,6 +131,45 @@
         margin: .5rem .5rem .5rem 0;
         padding: 0;
         list-style: none;
+
+        &.clusters {
+          padding-left: 1.75rem;
+        }
+      }
+
+      p.region {
+
+        .fake-radio  {
+          position: relative;
+          display: inline-block;
+          height: 1.15em;
+          width: 1.15em;
+          margin: 0 0.3rem 0 0.1rem;
+          border-radius: $radius;
+          border: 1.5px solid transparent;
+          background: rgba($article-text, 0.05);
+          border: 1.5px solid rgba($article-text, 0.2);
+          vertical-align: text-top;
+          cursor: pointer;
+
+          &:after {
+            content: "";
+            position: absolute;
+            display: block;
+            height: .5rem;
+            width: .5rem;
+            top: .23rem;
+            left: .23rem;
+            border-radius: 50%;
+            background: rgba($article-text, .3);
+            opacity: 0;
+            transition: opacity .2s;
+          }
+
+          &.checked:after {
+            opacity: 1;
+          }
+        }
       }
     }
   }
diff --git a/assets/styles/layouts/article/_tables.scss b/assets/styles/layouts/article/_tables.scss
index 6d043b0ca..5c419dc69 100644
--- a/assets/styles/layouts/article/_tables.scss
+++ b/assets/styles/layouts/article/_tables.scss
@@ -49,6 +49,15 @@ table {
   }
 
   img { margin-bottom: 0; }
+
+  &.cloud-urls {
+    a { white-space: nowrap; }
+    p {
+      margin: 0 0 .5rem 0;
+      &:last-child { margin-bottom: 0 }
+    }
+    .cluster-name { font-weight: $medium; color: $article-bold; }
+  }
 }
 
 table + table {
diff --git a/content/influxdb/cloud/reference/regions.md b/content/influxdb/cloud/reference/regions.md
index e2555b575..5049dc568 100644
--- a/content/influxdb/cloud/reference/regions.md
+++ b/content/influxdb/cloud/reference/regions.md
@@ -19,4 +19,16 @@ Use the URLs below to interact with your InfluxDB Cloud instances with the
 
 Request a cloud region
 
+{{% note %}}
+#### Regions with multiple clusters
+Some InfluxDB Cloud regions have multiple Cloud clusters, each with a unique URL.
+To find your cluster URL, [log in to your InfluxDB Cloud organization](https://cloud2.influxdata.com)
+and review your organization URL. The first subdomain identifies your 
+InfluxDB Cloud cluster. For example:
+
+
+https://us-west-2-1.aws.cloud2.influxdata.com/orgs/03a2bbf46249a000/...
+

+{{% /note %}}
+
 {{< cloud_regions >}}
diff --git a/data/influxdb_urls.yml b/data/influxdb_urls.yml
index c08a7e4b6..e4ca27c95 100644
--- a/data/influxdb_urls.yml
+++ b/data/influxdb_urls.yml
@@ -17,6 +17,11 @@ cloud:
         - name: US West (Oregon)
           location: Oregon, USA
           url: https://us-west-2-1.aws.cloud2.influxdata.com
+          clusters:
+            - name: us-west-2-1
+              url: https://us-west-2-1.aws.cloud2.influxdata.com
+            - name: us-west-2-2
+              url: https://us-west-2-2.aws.cloud2.influxdata.com
         - name: US East (Virginia)
           location: Virginia, USA
           url: https://us-east-1-1.aws.cloud2.influxdata.com
diff --git a/layouts/partials/footer/influxdb-url-modal.html b/layouts/partials/footer/influxdb-url-modal.html
index aeadc40cc..896129750 100644
--- a/layouts/partials/footer/influxdb-url-modal.html
+++ b/layouts/partials/footer/influxdb-url-modal.html
@@ -15,13 +15,13 @@
   {{ .Scratch.Set "modalTitle" "Select your InfluxDB Cloud region" }}
 {{ end }}
 
-{{ .Scratch.Set "modalMessage" "Select your **InfluxDB Cloud region** or your **InfluxDB OSS URL** and we'll customize code examples for you." }}
+{{ .Scratch.Set "modalMessage" "Select your **InfluxDB Cloud region and cluster** or your **InfluxDB OSS URL** and we'll customize code examples for you. _[Identify your InfluxDB Cloud cluster](/influxdb/cloud/reference/regions/#regions-with-multiple-clusters)_." }}
 {{ if $isOSS }}
   {{ .Scratch.Set "modalMessage" "Customize your **InfluxDB OSS URL** and we'll update code examples for you." }}
 {{ else if $isEnterprise }}
   {{ .Scratch.Set "modalMessage" "Customize your **InfluxDB Enterprise URL** and we'll update code examples for you." }}
 {{ else if $isCloud }}
-  {{ .Scratch.Set "modalMessage" "Select your **InfluxDB Cloud region** and we'll customize code examples for you." }}
+  {{ .Scratch.Set "modalMessage" "Select your **InfluxDB Cloud region and cluster** and we'll customize code examples for you. _[Identify your InfluxDB Cloud cluster](/influxdb/cloud/reference/regions/#regions-with-multiple-clusters)_." }}
 {{ end }}
 
 {{ .Scratch.Set "modalRefLinks" (print "[InfluxDB Cloud regions](" $CloudLink ") or [InfluxDB OSS URLs](" $OSSLink ")") }}
@@ -62,12 +62,30 @@
             
{{ if .short_name}}{{ .short_name }}{{ else }}{{ .name }}{{ end }}