diff --git a/assets/styles/layouts/_modal.scss b/assets/styles/layouts/_cloud-selector.scss
similarity index 88%
rename from assets/styles/layouts/_modal.scss
rename to assets/styles/layouts/_cloud-selector.scss
index dfc7f7ba4..f6e5d8ff7 100644
--- a/assets/styles/layouts/_modal.scss
+++ b/assets/styles/layouts/_cloud-selector.scss
@@ -107,6 +107,7 @@
.products {
display: flex;
+ flex-direction: column-reverse;
flex-wrap: wrap;
flex-grow: 1;
justify-content: flex-start;
@@ -178,6 +179,30 @@
}
}
+td,label,li {
+ &:after {
+ display: inline-block;
+ vertical-align: text-bottom;
+ font-style: italic;
+ font-weight: $medium;
+ font-size: .75em;
+ margin-left: .35rem;
+ padding: .1rem .3rem .12rem;
+ line-height: .75rem;
+ border-radius: 1rem;
+ }
+ &.beta:after {
+ content: 'beta';
+ color: $r-dreamsicle;
+ background: rgba($r-dreamsicle, .1);
+ border: 1px solid $r-dreamsicle;
+ }
+}
+
+label:after {
+ margin-left: .15rem;
+}
+
///////////////////////////// InfluxDB URL Triggers ////////////////////////////
.article--content {
@@ -211,6 +236,6 @@
}
.code-tab-content {
- .select-url{margin-top: -3.25rem}
+ .select-url{margin-top: -3.25rem}
}
}
diff --git a/assets/styles/styles-default.scss b/assets/styles/styles-default.scss
index afa7e41f5..97fd6d5cd 100644
--- a/assets/styles/styles-default.scss
+++ b/assets/styles/styles-default.scss
@@ -22,5 +22,5 @@
"layouts/algolia-search-overrides",
"layouts/landing",
"layouts/error-page",
- "layouts/modal",
+ "layouts/cloud-selector",
"layouts/feature-callouts";
diff --git a/content/v2.0/get-started.md b/content/v2.0/get-started.md
index 1b7e98de4..9858a10a9 100644
--- a/content/v2.0/get-started.md
+++ b/content/v2.0/get-started.md
@@ -66,11 +66,7 @@ Currently, we do **not support** using an existing InfluxDB Cloud 2.0 account to
3. (If you subscribed through InfluxData) Choose your cloud provider.
4. Select a provider and region for your {{< cloud-name >}} instance. The following are available:
- - **Amazon Web Services (AWS)**
- - **US West (Oregon)**
- - **EU Frankfurt**
- - **Google Cloud Platform (GCP)**
- - **Iowa**
+ {{< cloud_regions type="list" >}}
_To suggest regions to add, click **Let us know** under Regions._
5. (If you subscribed through InfluxData) Review the terms of the agreement, and then select **I have viewed and agree to InfluxDB Cloud 2.0 Services Subscription Agreement and InfluxData Global Data Processing Agreement**.
diff --git a/content/v2.0/reference/urls.md b/content/v2.0/reference/urls.md
index 97c8d9f41..738cd6b58 100644
--- a/content/v2.0/reference/urls.md
+++ b/content/v2.0/reference/urls.md
@@ -28,4 +28,4 @@ Use the URLs below to interact with your InfluxDB Cloud instances with the
[InfluxDB API](/v2.0/reference/api/), [InfluxDB client libraries](/v2.0/reference/api/client-libraries/),
[`influx` CLI](/v2.0/reference/cli/influx/), or [Telegraf](/v2.0/write-data/use-telegraf/).
-{{< cloud_urls >}}
+{{< cloud_regions >}}
diff --git a/data/influxdb_urls.yml b/data/influxdb_urls.yml
index 2f4b82beb..cbe01e84a 100644
--- a/data/influxdb_urls.yml
+++ b/data/influxdb_urls.yml
@@ -21,3 +21,9 @@ cloud:
regions:
- name: US Central (Iowa)
url: https://us-central1-1.gcp.cloud2.influxdata.com
+ - name: Microsoft Azure
+ short_name: Azure
+ regions:
+ - name: West Europe
+ url: https://westeurope-1.azure.cloud2.influxdata.com
+ status: beta
diff --git a/layouts/partials/footer/influxdb-url-modal.html b/layouts/partials/footer/influxdb-url-modal.html
index 4d059b994..97028500b 100644
--- a/layouts/partials/footer/influxdb-url-modal.html
+++ b/layouts/partials/footer/influxdb-url-modal.html
@@ -18,7 +18,7 @@
<ul>
{{ range .regions }}
<li>
- <label for="{{ anchorize .name }}">
+ <label for="{{ anchorize .name }}" {{ if .status }}class="{{ .status }}"{{ end }}>
<input type="radio" name="influxdb-loc" id="{{ anchorize .name }}" value="{{ .url }}" checked>
<span class="radio"></span>
{{ .name }}
diff --git a/layouts/shortcodes/cloud_regions.html b/layouts/shortcodes/cloud_regions.html
new file mode 100644
index 000000000..46c0ecf19
--- /dev/null
+++ b/layouts/shortcodes/cloud_regions.html
@@ -0,0 +1,43 @@
+{{ $type := .Get "type" | default "table" }}
+{{ $scratch := newScratch }}
+
+{{ if eq $type "table"}}
+ {{ range .Site.Data.influxdb_urls.cloud.providers }}
+ {{ $scratch.Set "title" .name }}
+ {{ if not (in .name .short_name) }}
+ {{ $scratch.Set "title" (print .name " (" .short_name ")")}}
+ {{ end }}
+ {{ $title := $scratch.Get "title" }}
+ {{ $titleID := anchorize $title }}
+ <h3 id="{{ $titleID }}">{{ $title }}</h3>
+ <table>
+ <thead>
+ <th align="left">Region</th>
+ <th align="left">URL</th>
+ </thead>
+ {{ range .regions }}
+ <tr>
+ <td {{ if .status }}class="{{ .status }}"{{ end }}>{{ .name }}</td>
+ <td><a href="{{ .url }}">{{ .url }}</a></td>
+ </tr>
+ {{ end }}
+ </table>
+ {{ end }}
+{{ else if eq $type "list" }}
+ <ul>
+ {{ range .Site.Data.influxdb_urls.cloud.providers }}
+ {{ $scratch.Set "title" .name }}
+ {{ if not (in .name .short_name) }}
+ {{ $scratch.Set "title" (print .name " (" .short_name ")")}}
+ {{ end }}
+ {{ $title := $scratch.Get "title" }}
+ <li><strong>{{ $title }}</strong>
+ <ul>
+ {{ range .regions }}
+ <li {{ if .status }}class="{{ .status }}"{{ end }}>{{ .name }}</li>
+ {{ end }}
+ </ul>
+ </li>
+ {{ end }}
+ </ul>
+{{ end }}
diff --git a/layouts/shortcodes/cloud_urls.html b/layouts/shortcodes/cloud_urls.html
deleted file mode 100644
index 2162a0870..000000000
--- a/layouts/shortcodes/cloud_urls.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ range .Site.Data.influxdb_urls.cloud.providers }}
- {{ $scratch := newScratch }}
- {{ $scratch.Set "title" .name }}
- {{ if .short_name }}
- {{ $scratch.Set "title" (print .name " (" .short_name ")")}}
- {{ end }}
- {{ $title := $scratch.Get "title" }}
- {{ $titleID := anchorize $title }}
- <h2 id="{{ $titleID }}">{{ $title }}</h2></strong>
- <table>
- <thead>
- <th align="left">Region</th>
- <th align="left">URL</th>
- </thead>
- {{ range .regions }}
- <tr>
- <td>{{ .name }}</td>
- <td><a href="{{ .url }}">{{ .url }}</a></td>
- </tr>
- {{ end }}
- </table>
-{{ end }}