Merge pull request #964 from influxdata/cloud-cleanup

Cloud cleanup

assets/styles/layouts/_sidebar.scss

@@ -168,15 +168,16 @@
       font-weight: $medium;
       display: inline-block;
 
-      // Product exclusivity labels
+      /////////////////////// Product exclusivity labels ///////////////////////
       span:after{
         display: inline-block;
         position: relative;
         top: -2px;
         margin-left: .15rem;
-        padding: .45rem .17rem .35rem;
+        padding: .45rem .18rem .35rem;
         line-height: 0;
         font-size: .6rem;
+        font-style: italic;
         border-radius: 8px;
       }
 
@@ -205,6 +206,7 @@
         }
       }
     }
+    ////////////////////// End Product exclusivity labels //////////////////////
 
     .nav-category > a {
       color: $nav-category;

assets/styles/themes/_theme-dark.scss

@@ -41,7 +41,7 @@ $nav-toggle-bg-hover: $b-pool;
 $nav-active: $br-chartreuse;
 
 // Product Flags
-$product-cloud: $b-dodger;
+$product-cloud: $b-pool;
 $product-oss: $p-potassium;
 $product-enterprise: $br-galaxy;
 

assets/styles/themes/_theme-light.scss

@@ -42,7 +42,7 @@ $nav-toggle-bg-hover: $br-magenta !default;
 $nav-active: $br-magenta !default;
 
 // Product Flags
-$product-cloud: $b-pool !default;
+$product-cloud: $b-dodger !default;
 $product-oss: $p-comet !default;
 $product-enterprise: $br-pulsar !default;
 
@@ -62,8 +62,8 @@ $article-code: $cp-marguerite !default;
 $article-code-bg: $cp-titan !default;
 $article-code-shadow: $g20-white !default;
 $article-code-accent1: $cp-melrose !default;
-$article-code-accent2: $b-dodger !default;
+$article-code-accent2: #0783e8 !default;
-$article-code-accent3: $gr-viridian !default;
+$article-code-accent3: #008859 !default;
 $article-code-accent4: $r-ruby !default;
 $article-code-accent5: #e24bbb !default;
 $article-code-accent6: $b-dodger !default;

content/v2.0/account-management/_index.md

@@ -3,12 +3,12 @@ title: Manage your InfluxDB Cloud 2.0 Account
 description: >
   View and manage information related to your InfluxDB Cloud 2.0 account such as
   pricing plans, data usage, account cancelation, etc.
-weight: 4
+weight: 10
 products: [cloud]
 aliases:
     - /v2.0/cloud/account-management/
 menu:
-  v2_0_cloud:
+  v2_0:
     name: Account management
 products: [cloud]
 ---

content/v2.0/account-management/billing.md

@@ -1,22 +1,43 @@
 ---
-title: Add payment method and view billing
+title: Manage InfluxDB Cloud billing
-list_title: Add payment and view billing
+list_title: Manage billing
 description: >
-  Add your InfluxDB Cloud payment method and view billing information.
+  Upgrade to the InfluxDB Cloud Usage-Based Plan and manage your billing information.
 aliases:
-      - /v2.0/cloud/account-management/billing
+  - /v2.0/cloud/account-management/billing
+  - /v2.0/cloud/account-management/upgrade-to-payg/
+  - /v2.0/cloud/account-management/upgrade-to-usage-based-plan/
 weight: 103
 menu:
-  v2_0_cloud:
+  v2_0:
     parent: Account management
-    name: Add payment and view billing
+    name: Manage billing
+products: [cloud]
 ---
 
+## Upgrade to Usage-Based Plan
+
+1. Click **Upgrade Now** in the top right corner of the {{< cloud-name "short" >}} user interface (UI).
+2. Review the terms and pricing associated with the Usage-Based Plan.
+3. Click **Sounds Good To Me**.
+4. Enter your contact information.
+   Traditionally this would be "shipping" information, but InfluxData does not ship anything.
+   This information should be the primary location where the service is consumed.
+   All service updates, security notifications and other important information are
+   sent using the information you provide.
+   The address is used to determine any applicable sales tax.
+5. Enter your payment information and click **Add Card**.
+6. Review the plan details, contact information, and credit card information.
+7. Click **Confirm & Order**.
+
 Add your payment method and view billing information in the {{< cloud-name "short" >}} user interface (UI).
 
 ## Access billing details
-1. Click the **user avatar** in the top right corner of the {{< cloud-name "short" >}}
+1. In the {{< cloud-name "short" >}} UI, select the **user avatar** in the left
-   UI and select **Billing**.
+   navigation menu, and select **Billing**.
+
+    {{< nav-icon "account" >}}
+
 2. Do one of the following:
     - If you subscribed to an InfluxDB Cloud 2.0 plan through **AWS Marketplace**
       or **GCP Marketplace**, click the **AWS** or **GCP** link to access your
@@ -36,9 +57,9 @@ Add your payment method and view billing information in the {{< cloud-name "shor
         - [Billing cycle](#billing-cycle)
         - [Declined or late payments](#declined-or-late-payments)
 
-### Add or update your InfluxDB Cloud 2.0 payment method
+### Add or update your payment method
 
-1. On the Billing page:
+1. On the **Billing page**:
    - To update, click the **Change Payment** button on the Billing page.
    - In the **Payment Method** section:
       - Enter your cardholder name and number
@@ -50,39 +71,40 @@ Add your payment method and view billing information in the {{< cloud-name "shor
 
 ### Add or update your contact information
 
-1. On the Billing page:
+1. On the **Billing page**:
    - To update, click the **Edit Information** button.
    - In the **Contact Information** section, enter your name, company, and address.
 2. Click **Save Contact Info**.
 
 ### Send notifications when usage exceeds an amount
 
-1. On the Billing page, click **Notification Settings**.
+1. On the **Billing page**, click **Notification Settings**.
 2. Select the **Send email notification** toggle, and then enter the email address to notify.
 3. Enter the dollar amount to trigger a notification email. By default, an email is triggered when the amount exceeds $10. (Whole dollar amounts only. For example, $10.50 is not a supported amount.)
 
 ### View Usage-based Plan information
 
-- On the Billing page, view your billing information, including:
+On the **Billing page**, view your billing information, including:
-  - Account balance
+
-  - Last billing update (updated hourly)
+- Account balance
-  - Past invoices
+- Last billing update (updated hourly)
-  - Payment method
+- Past invoices
-  - Contact information
+- Payment method
-  - Notification settings
+- Contact information
+- Notification settings
 
 ### View Free Plan information
 
-- On the Billing page, view the total limits available for the Free Plan.
+On the **Billing page**, view the total limits available for the Free Plan.
 
-### Exceeded rate limits
+## Exceeded rate limits
 
 If you exceed your plan's [rate limits](/v2.0/cloud/pricing-plans/), {{< cloud-name >}} provides a notification in the {{< cloud-name "short" >}} user interface (UI) and adds a rate limit event to your **Usage** page for review.
 
 All rate-limited requests are rejected; including both read and write requests.
 _Rate-limited requests are **not** queued._
 
-_To remove rate limits, [upgrade to a Usage-based Plan](/v2.0/cloud/account-management/upgrade-to-usage-based-plan/)._
+_To remove rate limits, [upgrade to a Usage-based Plan](#upgrade-to-usage-based-plan)._
 
 #### Rate-limited HTTP response code
 
@@ -93,7 +115,7 @@ HTTP 429 “Too Many Requests”
 Retry-After: xxx (seconds to wait before retrying the request)
 ```
 
-### Billing cycle
+## Billing cycle
 
 Billing occurs on the first day of the month for the previous month. For example, if you start the Usage-based Plan on September 15, you're billed on October 1 for your usage from September 15-30.
 

content/v2.0/account-management/data-usage.md

@@ -7,9 +7,10 @@ weight: 103
 aliases:
     - /v2.0/cloud/account-management/data-usage
 menu:
-  v2_0_cloud:
+  v2_0:
     parent: Account management
     name: View data usage
+products: [cloud]
 ---
 
 To view your {{< cloud-name >}} data usage, click the **user avatar** in the top

content/v2.0/account-management/offboarding.md

@@ -7,9 +7,10 @@ weight: 104
 aliases:
     - /v2.0/cloud/account-management/offboarding
 menu:
-  v2_0_cloud:
+  v2_0:
     parent: Account management
     name: Cancel InfluxDB Cloud
+products: [cloud]
 ---
 
 To cancel your {{< cloud-name >}} subscription, complete the following steps:

content/v2.0/account-management/pricing-calculator.md

@@ -5,8 +5,9 @@ description: >
   plugins, metrics, and writes for the Usage-based Plan.
 weight: 2
 menu:
-  v2_0_cloud:
+  v2_0:
     name: Pricing calculator
+products: [cloud]
 draft: true
 ---
 

content/v2.0/account-management/pricing-plans.md

@@ -6,11 +6,12 @@ description: >
 aliases:
   - /v2.0/cloud/rate-limits/
   - /v2.0/cloud/pricing-plans/
-weight: 2
+weight: 102
 menu:
-v2_0_cloud:
+  v2_0:
-  parent: Account management
+    parent: Account management
-  name: Pricing plans
+    name: Pricing plans
+products: [cloud]
 ---
 
 InfluxDB Cloud 2.0 offers two pricing plans:

content/v2.0/account-management/upgrade-to-usage-based-plan.md

@@ -1,28 +0,0 @@
----
-title: Upgrade to a Usage-Based Plan
-description: >
-  Upgrade to a Usage-Based Plan to remove rate limits from your InfluxDB Cloud 2.0 account.
-aliases:
-  - /v2.0/cloud/account-management/upgrade-to-payg/
-  - /v2.0/cloud/account-management/upgrade-to-usage-based-plan/
-weight: 102
-menu:
-  v2_0_cloud:
-    parent: Account management
-    name: Upgrade to Usage-Based Plan
----
-
-Upgrade to a Usage-Based Plan to remove rate limits from your InfluxDB Cloud 2.0 account.
-
-1. Click **Upgrade** in the top right corner of the {{< cloud-name "short" >}} user interface (UI).
-2. Review the terms and pricing associated with the Usage-Based Plan.
-3. Click **Sounds Good To Me**.
-4. Enter your contact information.
-   Traditionally this would be "shipping" information, but InfluxData does not ship anything.
-   This information should be the primary location where the service is consumed.
-   All service updates, security notifications and other important information are
-   sent using the information you provide.
-   The address is used to determine any applicable sales tax.
-5. Enter your payment information and click **Add Card**.
-6. Review the plan details, contact information, and credit card information.
-7. Click **Confirm & Order**.

content/v2.0/backup-restore/_index.md

@@ -8,8 +8,8 @@ v2.0/tags: [backup, restore]
 menu:
   v2_0:
     name: Back up & restore data
-weight: 10
+weight: 9
-#draft: true
+products: [oss]
 ---
 
 InfluxDB provides tools to back up and restore data and metadata stored in InfluxDB.

content/v2.0/backup-restore/backup.md

@@ -10,7 +10,7 @@ weight: 101
 related:
   - /v2.0/backup-restore/restore/
   - /v2.0/reference/cli/influx/backup/
-#draft: true
+products: [oss]
 ---
 
 Use the [`influx backup` command](/v2.0/reference/cli/influx/backup/) to back up

content/v2.0/backup-restore/restore.md

@@ -11,7 +11,7 @@ v2.0/tags: [restore]
 related:
   - /v2.0/backup-restore/backup/
   - /v2.0/reference/cli/influxd/restore/
-#draft: true
+products: [oss]
 ---
 
 Use the `influxd restore` command to restore backup data and metadata from InfluxDB.

content/v2.0/influxdb-templates/_index.md

@@ -4,7 +4,7 @@ description: >
   InfluxDB templates are prepackaged InfluxDB configurations that contain everything
   from dashboards and Telegraf configurations to notifications and alerts.
 menu: v2_0
-weight: 10
+weight: 9
 v2.0/tags: [templates]
 ---
 

content/v2.0/organizations/create-org.md

@@ -7,6 +7,7 @@ menu:
     name: Create an organization
     parent: Manage organizations
 weight: 101
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)

content/v2.0/organizations/delete-org.md

@@ -7,6 +7,7 @@ menu:
     name: Delete an organization
     parent: Manage organizations
 weight: 104
+products: [oss]
 ---
 
 Use the `influx` command line interface (CLI)

content/v2.0/organizations/members/add-member.md

@@ -34,7 +34,7 @@ influx user list
 2. To add a user to an organization, run the following command:
 
 ```sh
-influx org members add -n <org-name> -o <user-ID>
+influx org members add -n <org-name> -m <user-ID>
 ```
 
 For more information, see the [`influx org members add` command](/v2.0/reference/cli/influx/org/members/add).

content/v2.0/organizations/switch-org.md

@@ -7,6 +7,7 @@ menu:
     name: Switch organizations
     parent: Manage organizations
 weight: 105
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) to switch from one organization to another. The organization you're currently viewing determines what dashboards, tasks, buckets, members, and other assets you can access.

content/v2.0/organizations/view-orgs.md

@@ -20,6 +20,10 @@ to view organizations.
 
 2. Select **Switch Organizations**. The list of organizations appears.
 
+{{% cloud %}}
+**{{< cloud-name "short" >}}** does not support viewing and switching between multiple organizations.
+{{% /cloud %}}
+
 ## View organizations using the influx CLI
 
 Use the [`influx org list` command](/v2.0/reference/cli/influx/org/list)

content/v2.0/reference/cli/influx/org/members/add.md

@@ -20,7 +20,7 @@ influx org members add [flags]
 |:----             |:-----------                |:----------: |:------------------ |
 | `-h`, `--help`   | Help for the `add` command |             |                    |
 | `-i`, `--id`     | Organization ID            | string      | `INFLUX_ORG_ID`    |
-| `-o`, `--member` | Member ID                  | string      |                    |
+| `-m`, `--member` | Member ID                  | string      |                    |
 | `-n`, `--name`   | Organization name          | string      | `INFLUX_ORG`       |
 
 {{% cli/influx-global-flags %}}

content/v2.0/reference/cli/influxd/_index.md

@@ -9,6 +9,7 @@ menu:
 weight: 102
 related:
   - /v2.0/reference/config-options/
+products: [oss]
 ---
 
 The `influxd` daemon starts and runs all the processes necessary for InfluxDB to function.

content/v2.0/reference/cli/influxd/generate/_index.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd
 weight: 201
+products: [oss]
 ---
 
 The `influxd generate` command generates time series data direct to disk using a schema defined in a TOML file.

content/v2.0/reference/cli/influxd/generate/help-schema.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd generate
 weight: 301
+products: [oss]
 ---
 
 The `influxd generate help-schema` command outputs an example TOML schema to stdout that includes

content/v2.0/reference/cli/influxd/generate/simple.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd generate
 weight: 301
+products: [oss]
 ---
 
 The `influxd generate simple` command generates and writes a simple data set using

content/v2.0/reference/cli/influxd/inspect/_index.md

@@ -6,6 +6,7 @@ menu:
   v2_0_ref:
     parent: influxd
 weight: 201
+products: [oss]
 ---
 
 The `influxd inspect` commands and subcommands inspecting on-disk InfluxDB time series data.

content/v2.0/reference/cli/influxd/inspect/build-tsi.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect build-tsi` command rebuilds the TSI index and, if necessary,

content/v2.0/reference/cli/influxd/inspect/compact-series-file.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect compact-series-file` command compacts the [series file](/v2.0/reference/glossary/#series-file)

content/v2.0/reference/cli/influxd/inspect/dump-tsi.md

@@ -7,6 +7,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect dump-tsi` command outputs low-level information about

content/v2.0/reference/cli/influxd/inspect/dumpwal.md

@@ -7,6 +7,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect dumpwal` command outputs data from Write Ahead Log (WAL) files.

content/v2.0/reference/cli/influxd/inspect/export-blocks.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect export-blocks` command exports all blocks in one or more

content/v2.0/reference/cli/influxd/inspect/export-index.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect export-index` command exports all series in a TSI index to

content/v2.0/reference/cli/influxd/inspect/report-tsi.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect report-tsi` command analyzes Time Series Index (TSI) files

content/v2.0/reference/cli/influxd/inspect/report-tsm.md

@@ -9,6 +9,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect report-tsm` command analyzes Time-Structured Merge Tree (TSM)

content/v2.0/reference/cli/influxd/inspect/verify-seriesfile.md

@@ -7,6 +7,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect verify-seriesfile` command verifies the integrity of series files.

content/v2.0/reference/cli/influxd/inspect/verify-tsm.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect verify-tsm` command analyzes a set of TSM files for inconsistencies

content/v2.0/reference/cli/influxd/inspect/verify-wal.md

@@ -8,6 +8,7 @@ menu:
   v2_0_ref:
     parent: influxd inspect
 weight: 301
+products: [oss]
 ---
 
 The `influxd inspect verify-wal` command analyzes the Write-Ahead Log (WAL)

content/v2.0/reference/cli/influxd/restore.md

@@ -8,6 +8,7 @@ menu:
 weight: 201
 related:
   - /v2.0/backup-restore/restore/
+products: [oss]
 ---
 
 The `influxd restore` command restores backup data and metadata from an InfluxDB backup directory.

content/v2.0/reference/cli/influxd/run.md

@@ -8,6 +8,7 @@ menu:
 weight: 201
 related:
   - /v2.0/reference/config-options/
+products: [oss]
 ---
 
 The `influxd run` command is the default command for `influxd`.

content/v2.0/reference/cli/influxd/version.md

@@ -6,6 +6,7 @@ menu:
   v2_0_ref:
     parent: influxd
 weight: 202
+products: [oss]
 ---
 
 The `influxd version` command outputs the current version of InfluxDB.

content/v2.0/reference/config-options.md

@@ -7,6 +7,7 @@ menu:
   v2_0_ref:
     name: Configuration options
     weight: 3
+products: [oss]
 ---
 
 To configure InfluxDB, use the following configuration options when starting the

content/v2.0/reference/flux/stdlib/_index.md

@@ -13,6 +13,6 @@ weight: 102
 ---
 
 The Flux standard library includes built-in functions and importable packages
-that retrieve, transform,rocess, and output data.
+that retrieve, transform, process, and output data.
 
 {{< children >}}

content/v2.0/reference/urls.md

@@ -4,10 +4,10 @@ description: >
   InfluxDB 2.0 is available both locally (OSS) or on multiple cloud providers in multiple regions (Cloud).
 aliases:
     - /v2.0/cloud/urls/
-weight: 8
+weight: 6
 menu:
   v2_0_ref:
-    name: InfluxDB 2.0 URLs
+    name: InfluxDB URLs
 ---
 
 InfluxDB 2.0 is available both locally (OSS) or on multiple cloud providers in multiple regions (Cloud).
@@ -29,15 +29,3 @@ Use the URLs below to interact with your InfluxDB Cloud instances with the
 [`influx` CLI](/v2.0/reference/cli/influx/), or [Telegraf](/v2.0/write-data/use-telegraf/).
 
 {{< cloud_urls >}}
-
----
-
-### View your Cloud URL in the InfluxDB Cloud UI
-For the URL of your specific InfluxDB Cloud instance:
-
-1. Click the **Load Data** icon in the left navigation of your InfluxDB Cloud user interface (UI).
-
-    {{< nav-icon "load-data" >}}
-
-2. Go to **Client Libraries**.
-3. The URL of your InfluxDB instance is displayed near the top of the page.

content/v2.0/security/enable-tls.md

@@ -8,6 +8,7 @@ menu:
   v2_0:
     parent: Security & authorization
 v2.0/tags: [security, authentication, tls, https, ssl]
+products: [oss]
 ---
 
 Enabling TLS encrypts the communication between clients and the InfluxDB server.
@@ -103,13 +104,13 @@ InfluxDB supports three types of TLS certificates:
     Ensure you can connect over HTTPS by running
 
     ```
-    curl -v https://influxdb:9999/api/v2/ping
+    curl -v https://localhost:9999/api/v2/ping
     ```
 
     If using a self-signed certificate, use the `-k` flag to skip certificate verification:
 
     ```
-    curl -vk https://influxdb:9999/api/v2/ping
+    curl -vk https://localhost:9999/api/v2/ping
     ```
 
     With this command, you should see output confirming a succussful TLS handshake.
@@ -119,8 +120,8 @@ InfluxDB supports three types of TLS certificates:
 To connect [Telegraf](https://docs.influxdata.com/telegraf/latest/) to an InfluxDB 2.0 instance with TLS enabled,
 update the following `influxdb_v2` output settings in your Telegraf configuration file:
 
-- Update urls to use https instead of http.
+- Update URLs to use HTTPS instead of HTTP.
-- If using a self-signed certificate, uncomment and set `insecure_skip_verify` to true.
+- If using a self-signed certificate, uncomment and set `insecure_skip_verify` to `true`.
 
 ### Example configuration
 

content/v2.0/security/secrets/use-vault.md

@@ -6,6 +6,7 @@ menu:
   v2_0:
     parent: Store and use secrets
 weight: 201
+products: [oss]
 ---
 
 [Vault](https://www.vaultproject.io/) secures, stores, and tightly controls access
@@ -13,7 +14,8 @@ to tokens, passwords, certificates, and other sensitive secrets.
 Store sensitive secrets in Vault using the InfluxDB built-in Vault integration.
 
 {{% cloud %}}
-By default, all secrets added to InfluxDB Cloud are stored in the InfluxDB Cloud Vault cluster.
+By default, all secrets added to **InfluxDB Cloud** are stored in the
+**InfluxDB Cloud Vault cluster**.
 {{% /cloud %}}
 
 ## Start a Vault server

content/v2.0/users/_index.md

@@ -7,6 +7,7 @@ menu:
   v2_0:
     name: Manage users
 weight: 11
+products: [oss]
 ---
 
 Users are those with access to InfluxDB.

content/v2.0/users/create-user.md

@@ -7,6 +7,7 @@ menu:
     name: Create a user
     parent: Manage users
 weight: 101
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)

content/v2.0/users/delete-user.md

@@ -7,6 +7,7 @@ menu:
     name: Delete a user
     parent: Manage users
 weight: 103
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)

content/v2.0/users/update-user.md

@@ -7,6 +7,7 @@ menu:
     name: Update a user
     parent: Manage users
 weight: 103
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)

content/v2.0/users/view-users.md

@@ -7,6 +7,7 @@ menu:
     name: View users
     parent: Manage users
 weight: 102
+products: [oss]
 ---
 
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)

content/v2.0/write-data/scrape-data/manage-scrapers/_index.md

@@ -10,6 +10,7 @@ menu:
     parent: Scrape data
 weight: 201
 v2.0/tags: [scraper]
+products: [oss]
 ---
 
 The following articles walk through managing InfluxDB scrapers:

content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md

@@ -8,6 +8,7 @@ menu:
   v2_0:
     parent: Manage scrapers
 weight: 301
+products: [oss]
 ---
 
 Create a new scraper in the InfluxDB user interface (UI).

content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md

@@ -8,6 +8,7 @@ menu:
   v2_0:
     parent: Manage scrapers
 weight: 303
+products: [oss]
 ---
 
 Delete a scraper from the InfluxDB user interface (UI).

content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md

@@ -8,6 +8,7 @@ menu:
   v2_0:
     parent: Manage scrapers
 weight: 302
+products: [oss]
 ---
 
 Update a scraper in the InfluxDB user interface (UI).

layouts/partials/article.html

@@ -7,11 +7,6 @@
     {{ .Content }}
     {{ partial "article/related.html" . }}
     {{ partial "article/tags.html" . }}
-
+    {{ partial "article/_feedback.html" . }}
-    {{ if in .RelPermalink "/cloud/"}}
-      {{ partial "article/_cloud-feedback.html" . }}
-    {{ else }}
-      {{ partial "article/_feedback.html" . }}
-    {{ end }}
   </article>
 </div>

layouts/partials/article/_cloud-feedback.html

@@ -1,18 +0,0 @@
-{{ $cloudName := .Site.Data.products.cloud.name }}
-{{ $cloudNameShort := .Site.Data.products.cloud.shortname }}
-<hr/>
-<div class="feedback block">
-  <h4 id="cloud-support">{{ $cloudName }} Support</h4>
-  <p>
-    The following resources are available when you need help with {{ $cloudNameShort }}:
-  </p>
-  <h5 id="free-plan">Free Plan</h5>
-  <ul>
-    <li>Reach out in the <a href="https://community.influxdata.com/">InfluxData Community</a>.</li>
-  </ul>
-  <h5 id="usage-based-plan">Usage-based Plan</h5>
-  <ul>
-    <li>Reach out in the <a href="https://community.influxdata.com/">InfluxData Community</a>.</li>
-    <li>Contact <a href="mailto:support@influxdata.com" target="_blank">InfluxData Support</a>.</li>
-  </ul>
-</div>

layouts/partials/article/_feedback.html

@@ -1,15 +1,17 @@
 <hr/>
 <div class="feedback block">
-  <h4 id="bug-reports-and-feedback">Bug Reports and Feedback</h4>
+  <h4 id="bug-reports-and-feedback">Support and feedback</h4>
   <p>
-    Thank you for being willing to help test InfluxDB v2.0 beta!
+    Thank you for being part of our community!
-    Feedback and bug reports are welcome and encouraged both for InfluxDB and this documentation.
+    We welcome and encourage your feedback and bug reports for InfluxDB and this documentation.
-    Submit feedback using one of the following methods:
+    To find support or submit feedback, the following resources are available:
   </p>
   <ul>
-    <li><a href="https://community.influxdata.com/c/influxdb2" target="_blank">Post in the InfluxData Community</a></li>
+    <li><a href="https://community.influxdata.com/c/influxdb2" target="_blank">Post in the InfluxData Community</a>.</li>
-    <li>In the <strong>InfluxDB UI</strong>, click <strong class="white-space:nowrap"><span class="icon-ui-nav-chat" style="font-size:1.25rem;margin:0 .25rem 0;"></span> Feedback</strong> in the left navigation bar.</li>
     <li>Submit <strong>documentation issues</strong> to the <a href="https://github.com/influxdata/docs-v2" target="_blank">InfluxDB 2.0 documentation repository</a>.</li>
     <li>Submit <strong>InfluxDB issues</strong> to the <a href="https://github.com/influxdata/influxdb" target="_blank">InfluxDB repository</a>.</li>
   </ul>
+  <p>
+    For our <strong>InfluxDB Cloud</strong> customers, <a href="mailto:support@influxdata.com" target="_blank">InfluxData Support</a> is also available.
+  </p>
 </div>

layouts/partials/sidebar.html

@@ -22,16 +22,11 @@
   <ul id="nav-tree">
 
   {{ $mainMenu := (index .Site.Menus (replaceRE "[.]" "_" $currentVersion)) }}
-  {{ $cloudMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_cloud")) }}
   {{ $refMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_ref")) }}
 
   <!-- Main Section -->
   {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) }}
 
-  <!-- Cloud Section -->
-  <h4 class="reference">{{ .Site.Data.products.cloud.shortname }}</h4>
-  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $cloudMenu) }}
-
   <!-- Reference Section -->
   <h4 class="reference">Reference</h4>
   {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) }}

layouts/partials/sidebar/nested-menu.html

@@ -10,31 +10,31 @@
       {{ range .Children }}
         <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
           {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-          <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+          <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
           {{ if .HasChildren }}
             <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
             {{ range .Children }}
               <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                 {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
                 {{ if .HasChildren }}
                   <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                   {{ range .Children }}
                     <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                       {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                      <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                      <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
                       {{ if .HasChildren }}
                         <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                         {{ range .Children }}
                           <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                             {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                            <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                            <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
                             {{ if .HasChildren }}
                               <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                               {{ range .Children }}
                                 <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                                   {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                  <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                                  <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
 
                                   <!-- Begin nested block -->
                                   {{ if .HasChildren }}
@@ -42,7 +42,7 @@
                                     {{ range .Children }}
                                       <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                                         {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                        <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                                        <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
                                         <!-- To add more nested layers, copy the nested block and paste it here -->
                                       </li>
                                     {{ end }}