More updates to GS and shortcode

content/v2.0/cloud/get-started.md

@@ -2,34 +2,35 @@
 title: Get started with InfluxCloud 2.0 Beta
 description: >
   Sign up for and get started with InfluxCloud 2.0 Beta.
+cloud_all: true
 weight: 1
 menu:
   v2_0_cloud:
     name: Get started with InfluxCloud
 
 ---
-InfluxCloud 2.0 is a fully managed and hosted version of the InfluxDB 2.x API. To get started with {{< cloud-name >}}, complete the tasks below.
+{{< cloud-name >}} is a fully managed and hosted version of the InfluxDB 2.x API. To get started, complete the tasks below.
 
-{{% note %}}
+{{% cloud-msg %}}
-The InfluxDB v2.0 alpha documentation linked to in this article also applies to {{< cloud-name >}} unless otherwise specified. 
+The InfluxDB v2.0 alpha documentation linked to in this article also applies to {{< cloud-name "short" >}} unless otherwise specified.
-{{% /note %}}
+{{% /cloud-msg %}}
 
 ## Sign up
 
 {{% note %}}
-Early access to InfluxCloud 2.0 Beta is limited. You can apply for access [here](https://www.influxdata.com/influxcloud2beta/).
+Early access to {{< cloud-name >}} is limited. You can apply for access [here](https://www.influxdata.com/influxcloud2beta/).
 {{% /note %}}
 
-Sign up for the InfluxCloud 2.0 Beta with the link provided in the InfluxCloud v2.0 Beta Invite email.
+Sign up for the InfluxCloud 2.0 Beta with the link provided in the invite email.
 
 1. Look for an email invite from support@influxdata.com with the subject line **You've been invited to beta InfluxCloud 2.0.**
 2. Click **Accept Invite** to begin the sign up process.
 3. Provide an email id, password and follow the prompts to sign up for a Free Tier.
 4. Select the Region and click Next to create your default organization and bucket.
 
-  {{% note %}}
+  {{% cloud-msg %}}
   InfluxCloud 2.0 Beta will be restricted to one region only: us-west-2.
-  {{% /note %}}
+  {{% /cloud-msg %}}
 
 5. Once your organization and bucket are created, the usage page opens.
 
@@ -43,11 +44,11 @@ Browse to [https://us-west-2-1.aws.cloud2.influxdata.com](https://us-west-2-1.aw
 
 ## Collect data
 
-Use Telegraf to collect and write data to InfluxCloud 2.0. Create Telegraf configurations automatically in the UI or manually configure Telegraf.
+Use Telegraf to collect and write data to {{< cloud-name >}}. Create Telegraf configurations automatically in the UI or manually configure Telegraf.
 
-  {{% note %}}
+  {{% cloud-msg %}}
-  Scrapers are not available in InfluxCloud 2.0 Beta.
+  Scrapers are not available in {{< cloud-name >}}.
-  {{% /note %}}
+  {{% /cloud-msg %}}
 
 For details, see [Automatically configure Telegraf](https://v2.docs.influxdata.com/v2.0/collect-data/use-telegraf/auto-config/#create-a-telegraf-configuration) and [Manually configure Telegraf](https://v2.docs.influxdata.com/v2.0/collect-data/use-telegraf/manual-config/).
 
@@ -55,9 +56,19 @@ For details, see [Automatically configure Telegraf](https://v2.docs.influxdata.c
 
 Once you've set up InfluxCloud to collect data with Telegraf, you can do the following:
 
-* Query data using Flux, the UI, and the `influx` command line interface. See [Query data](https://v2.docs.influxdata.com/v2.0/query-data/)
+* Query data using Flux, the UI, and the `influx` command line interface. See [Query data](https://v2.docs.influxdata.com/v2.0/query-data/).
 * Build custom dashboards to visualize your data. See [Visualize data](https://v2.docs.influxdata.com/v2.0/visualize-data/).
 
-## Provide feedback
 
-To provide feedback or file a bug, send an email to cloudbeta@influxdata.com.
+## Known issues and disabled features
+
+The following issues currently exist in {{< cloud-name >}}:
+
+  * IDPE-2860: Additional user shows up as owner under Cloud 2 organization.
+  * IDPE 2868: User must not be able to delete token with an active Telegraf configuration pointed to it.
+  * IDPE-2869: As a Cloud 2.0 user, I cannot use any CLI tools to interact with my Cloud 2 tenant.
+  * [TELEGRAF-5600](https://github.com/influxdata/telegraf/issues/5600): Improve error message in Telegraf when bucket it's reporting to is not found
+  * [INFLUXDB-12686](https://github.com/influxdata/influxdb/issues/12686): Unable to copy error message from UI.
+  * [INFLUXDB-12690](https://github.com/influxdata/influxdb/issues/12690): Impossible to change a task from `every` to `cron`.
+  * [INFLUXDB-12688](https://github.com/influxdata/influxdb/issues/12688): Create bucket switching between periodically and never fails to create bucket.
+  * [INFLUXDB-12687](https://github.com/influxdata/influxdb/issues/12687): Create org should display only for the create org permission.

content/v2.0/collect-data/scrape-data/_index.md

@@ -19,9 +19,9 @@ then write the scraped data to an InfluxDB bucket.
 Scrapers can collect data from any HTTP(S)-accessible endpoint that provides data
 in the [Prometheus data format](https://prometheus.io/docs/instrumenting/exposition_formats/).
 
-{{% cloud %}}
+{{% cloud-msg %}}
-Scrapers are not available in {{< cloud-name >}}.
+Scrapers are not available in {{< cloud-name "short" >}}.
-{{% /cloud %}}
+{{% /cloud-msg %}}
 
 
 The following articles provide information about creating and managing InfluxDB data scrapers:

content/v2.0/get-started.md

@@ -8,6 +8,10 @@ weight: 1
 v2.0/tags: [get-started, install]
 ---
 
+{{% cloud-msg %}}
+This article describes how to get started with InfluxDB OSS. To get started with {{< cloud-name "short" >}}, see [Get Started with InfluxCloud 2.0 Beta](/v2.0/cloud/get-started/).
+{{% /cloud-msg %}}
+
 Get started with InfluxDB v2.0 by downloading InfluxDB, installing the necessary
 executables, and running the initial setup process.
 
@@ -169,7 +173,7 @@ docker exec -it influxdb /bin/bash
 
 {{< /tabs-wrapper >}}
 
-## Setup InfluxDB
+## Set up InfluxDB
 The initial setup process for InfluxDB walks through creating a default organization,
 user, and bucket.
 The setup process is available in both the InfluxDB user interface (UI) and in

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

@@ -12,9 +12,9 @@ weight: 101
 Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
 to create an organization.
 
-{{% cloud %}}
+{{% cloud-msg %}}
-You can only currently create one organization in {{< cloud-name >}}.
+You cannot currently create additional organizations in {{< cloud-name >}}. Only the default organization is available.
-{{% /cloud %}}
+{{% /cloud-msg %}}
 
 ## Create an organization in the InfluxDB UI
 

layouts/shortcodes/cloud-msg.html

@@ -0,0 +1,3 @@
+<div class="cloud-msg">
+  {{ .Inner }}
+</div>

layouts/shortcodes/cloud-name.html

@@ -1,7 +1,6 @@
 {{ $length := .Get 0 | default "long" }}
-
 {{ if eq $length "long" }}
-  {{ .Site.Data.products.cloud.name }}
+  {{- .Site.Data.products.cloud.name -}}
 {{ else if eq $length "short" }}
-  {{ .Site.Data.products.cloud.shortname }}
+  {{- .Site.Data.products.cloud.shortname -}}
 {{ end }}