diff --git a/assets/styles/layouts/article/_note.scss b/assets/styles/layouts/article/_note.scss
index 597e94ac5..2046aa285 100644
--- a/assets/styles/layouts/article/_note.scss
+++ b/assets/styles/layouts/article/_note.scss
@@ -8,7 +8,7 @@
color: $article-note-text;
}
strong {
- color: inherit;
+ color: $article-note-strong;
}
a {
color: $article-note-link;
diff --git a/assets/styles/themes/_theme-dark.scss b/assets/styles/themes/_theme-dark.scss
index eccc3749e..1b61b492b 100644
--- a/assets/styles/themes/_theme-dark.scss
+++ b/assets/styles/themes/_theme-dark.scss
@@ -81,6 +81,7 @@ $article-table-scrollbar: $g0-obsidian;
$article-note-base: $gr-viridian;
$article-note-heading: $g20-white;
$article-note-text: $gr-honeydew;
+$article-note-strong: $gr-krypton;
$article-note-link: $gr-wasabi;
$article-note-link-hover: $g20-white;
$article-note-table-header: $grad-green-dark;
diff --git a/assets/styles/themes/_theme-light.scss b/assets/styles/themes/_theme-light.scss
index 135c98026..b6d1661ed 100644
--- a/assets/styles/themes/_theme-light.scss
+++ b/assets/styles/themes/_theme-light.scss
@@ -82,6 +82,7 @@ $article-table-scrollbar: $g14-chromium !default;
$article-note-base: $gr-rainforest !default;
$article-note-heading: $gr-emerald !default;
$article-note-text: $gr-emerald !default;
+$article-note-strong: $gr-emerald !default;
$article-note-link: $b-ocean !default;
$article-note-link-hover: $br-magenta !default;
$article-note-table-header: $grad-green-dark !default;
diff --git a/assets/styles/tools/_icomoon.scss b/assets/styles/tools/_icomoon.scss
index 2b97654ae..b6d4624ef 100644
--- a/assets/styles/tools/_icomoon.scss
+++ b/assets/styles/tools/_icomoon.scss
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
- src: url('fonts/icomoon.eot?lj8dxa');
- src: url('fonts/icomoon.eot?lj8dxa#iefix') format('embedded-opentype'),
- url('fonts/icomoon.ttf?lj8dxa') format('truetype'),
- url('fonts/icomoon.woff?lj8dxa') format('woff'),
- url('fonts/icomoon.svg?lj8dxa#icomoon') format('svg');
+ src: url('fonts/icomoon.eot?a22byr');
+ src: url('fonts/icomoon.eot?a22byr#iefix') format('embedded-opentype'),
+ url('fonts/icomoon.ttf?a22byr') format('truetype'),
+ url('fonts/icomoon.woff?a22byr') format('woff'),
+ url('fonts/icomoon.svg?a22byr#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@@ -25,6 +25,9 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-crown:before {
+ content: "\e934";
+}
.icon-book-pencil:before {
content: "\e965";
}
diff --git a/content/chronograf/v1.8/administration/creating-connections.md b/content/chronograf/v1.8/administration/creating-connections.md
index 7c83e760b..e20c6b113 100644
--- a/content/chronograf/v1.8/administration/creating-connections.md
+++ b/content/chronograf/v1.8/administration/creating-connections.md
@@ -6,6 +6,8 @@ menu:
name: Create InfluxDB and Kapacitor connections
weight: 50
parent: Administration
+related:
+ - /influxdb/v2.0/tools/chronograf/
---
Connections to InfluxDB and Kapacitor can be configured through the Chronograf user interface (UI) or with JSON configuration files:
@@ -42,26 +44,29 @@ To create an InfluxDB connection in the Chronograf UI:
_(Required only if [authorization is enabled](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/) in InfluxDB)_
- **Password**: InfluxDB password
_(Required only if [authorization is enabled](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/) in InfluxDB)_
-- **Telegraf Database Name**: the database Chronograf uses to populate parts of the application, including the Host List page (default is `autogen`)
-- **Default Retention Policy**: default [retention policy](/{{< latest "influxdb" "v1" >}}/concepts/glossary/#retention-policy-rp) (default is `autogen`)
-- **Default connection**: use this connection as the default connection
+- **Telegraf Database Name**: the database Chronograf uses to populate parts of the application, including the Host List page (default is `telegraf`)
+- **Default Retention Policy**: default [retention policy](/{{< latest "influxdb" "v1" >}}/concepts/glossary/#retention-policy-rp)
+ (if left blank, defaults to `autogen`)
+- **Default connection**: use this connection as the default connection for data exploration, dashboards, and administrative actions
{{% /tab-content %}}
{{% tab-content %}}
- **Enable the {{< req "InfluxDB v2 Auth" >}} option**
-- **Connection URL**: InfluxDB Cloud or OSS 2.x URL
+- **Connection URL**: [InfluxDB Cloud region URL](/influxdb/cloud/reference/regions/)
+ or [InfluxDB OSS 2.x URL](/influxdb/v2.0/reference/urls/)
```
http://localhost:8086
```
- **Connection Name**: Unique name for this connection.
-- **Organiziation**: InfluxDB organization
+- **Organiziation**: InfluxDB [organization](/influxdb/v2.0/organizations/)
- **Token**: InfluxDB [authentication token](/influxdb/v2.0/security/tokens/)
-- **Telegraf Database Name**: database Chronograf uses to populate parts of the application, including the Host List page (default is `autogen`)
-- **Default Retention Policy**: default [retention policy](/{{< latest "influxdb" "v1" >}}/concepts/glossary/#retention-policy-rp) (default is `autogen`)
-- **Default connection**: use this connection as the default connection
+- **Telegraf Database Name**: database Chronograf uses to populate parts of the application, including the Host List page (default is `telegraf`)
+- **Default Retention Policy**: default [retention policy](/{{< latest "influxdb" "v1" >}}/concepts/glossary/#retention-policy-rp)
+ (if left blank, default is `autogen`)
+- **Default connection**: use this connection as the default connection for data exploration and dashboards
{{% note %}}
For more information about connecting Chronograf to an InfluxDB Cloud or OSS 2.x instance, see:
diff --git a/content/example.md b/content/example.md
index b2f6f2906..71c301c74 100644
--- a/content/example.md
+++ b/content/example.md
@@ -2,7 +2,7 @@
title: Example post
description: This is just an example post to show the format of new 2.0 posts
weight: 1
-draft: true
+#draft: true
related:
- /influxdb/v2.0/write-data/
- /influxdb/v2.0/write-data/quick-start
@@ -35,6 +35,7 @@ This is **bold** text. This is _italic_ text. This is _**bold and italic**_.
{{< icon "cog" >}} cog
{{< icon "config" >}} config
{{< icon "copy" >}} copy
+{{< icon "crown" >}} crown
{{< icon "dashboard" >}} dashboard
{{< icon "dashboards" >}} dashboards
{{< icon "data-explorer" >}} data-explorer
diff --git a/content/influxdb/v2.0/tools/chronograf.md b/content/influxdb/v2.0/tools/chronograf.md
index ef324b445..6c5c1036c 100644
--- a/content/influxdb/v2.0/tools/chronograf.md
+++ b/content/influxdb/v2.0/tools/chronograf.md
@@ -21,29 +21,6 @@ that provides an InfluxQL data explorer, Kapacitor integrations, and more.
Continue to use Chronograf with **InfluxDB Cloud** and **InfluxDB OSS 2.0** and the
[1.x compatibility API](/influxdb/v2.0/reference/api/influxdb-1x/).
-{{% warn %}}
-### No administrative functionality
-Chronograf cannot be used for administrative tasks in InfluxDB Cloud and InfluxDB OSS 2.0.
-For example, you **cannot** do the following:
-
-- Define databases
-- Modify retention policies
-- Add users
-
-When connected to an InfluxDB Cloud or InfluxDB 2.0 database, the **InfluxDB Admin**
-section of Chronograf is disabled.
-
-To complete administrative tasks, use the following:
-
-- **InfluxDB user interface (UI)**
-- [InfluxDB CLI](/influxdb/v2.0/reference/cli/influx/)
-- [InfluxDB v2 API](/influxdb/v2.0/reference/api/)
-
-### Limited InfluxQL support
-InfluxDB Cloud and InfluxDB OSS 2.0 support InfluxQL **read-only** queries.
-For more information, see [InfluxQL support](/influxdb/v2.0/query-data/influxql/#influxql-support).
-{{% /warn %}}
-
## Create an InfluxDB connection
1. In Choronograf, click **Configuration** in the left navigation bar,
and then click **{{< icon "plus" >}} Add Connection**.
@@ -60,17 +37,19 @@ For more information, see [InfluxQL support](/influxdb/v2.0/query-data/influxql/
```
- **Connection Name:** Name to uniquely identify this connection configuration
- - **Organization:** InfluxDB organization name
+ - **Organization:** InfluxDB [organization](/influxdb/v2.0/organizations/)
- **Token:** InfluxDB [authentication token](/influxdb/v2.0/security/tokens/)
- **Telegraf Database Name:** database Chronograf uses to populate parts of
- the application, including the Host List page (default is `autogen`)
+ the application, including the Host List page (default is `telegraf`)
- **Default Retention Policy:** default [retention policy](/{{< latest "influxdb" "v1" >}}/concepts/glossary/#retention-policy-rp)
- (default is `autogen`)
+ (if left blank, defaults to `autogen`)
{{% note %}}
#### DBRPs map to InfluxDB buckets
In InfluxDB Cloud and InfluxDB OSS 2.0, database/retention-policy (DBRP) combinations
are mapped to buckets using the `database-name/retention-policy` naming convention.
+**DBRP mappings are required to query InfluxDB OSS 2.x or InfluxDB Cloud using InfluxQL.**
+
For information, see [DBRP mapping](/influxdb/v2.0/reference/api/influxdb-1x/dbrp/)
and [Map unmapped buckets](/influxdb/v2.0/query-data/influxql/#map-unmapped-buckets).
{{% /note %}}
@@ -83,9 +62,36 @@ and [Map unmapped buckets](/influxdb/v2.0/query-data/influxql/#map-unmapped-buck
see [Use Kapacitor with InfluxDB](/influxdb/v2.0/tools/kapacitor/)._
6. Click **Finish**.
+## Important notes
+
+- [Update upgraded InfluxDB connections](#Update-upgraded-InfluxDB-connections)
+- [No administrative functionality](#No-administrative-functionality)
+- [Limited InfluxQL support](#Limited-InfluxQL-support)
+
### Update upgraded InfluxDB connections
If using Chronograf with an InfluxDB instance that was upgraded from 1.x
-to 2.x, update your connection configuration to use the **InfluxDB v2 Auth** option
-and provide an organization and a token.
+to 2.x, update your InfluxDB connection configuration in Chronograf to use the
+**InfluxDB v2 Auth** option and provide an organization and a token.
**Without an organization, Chronograf cannot use Flux to query InfluxDB.**
+### No administrative functionality
+Chronograf cannot be used for administrative tasks in InfluxDB Cloud and InfluxDB OSS 2.0.
+For example, you **cannot** do the following:
+
+- Define databases
+- Modify retention policies
+- Add users
+
+When connected to an InfluxDB Cloud or InfluxDB 2.0 database, functionality in the
+**{{< icon "crown" >}} InfluxDB Admin** section of Chronograf is disabled.
+
+To complete administrative tasks, use the following:
+
+- **InfluxDB user interface (UI)**
+- [InfluxDB CLI](/influxdb/v2.0/reference/cli/influx/)
+- [InfluxDB v2 API](/influxdb/v2.0/reference/api/)
+
+### Limited InfluxQL support
+InfluxDB Cloud and InfluxDB OSS 2.0 support InfluxQL **read-only** queries.
+For more information, see [InfluxQL support](/influxdb/v2.0/query-data/influxql/#influxql-support).
+
diff --git a/layouts/shortcodes/icon.html b/layouts/shortcodes/icon.html
index 4bcaa5484..ad63f8ab1 100644
--- a/layouts/shortcodes/icon.html
+++ b/layouts/shortcodes/icon.html
@@ -60,6 +60,8 @@
{{ else if or (eq $icon "notebook") (eq $icon "notebooks") }}
+{{ else if eq $icon "crown" }}
+
{{ else if eq $icon "add-label" }}
{{ else if or (eq $icon "toggle") (eq $icon "toggle-blue") }}
diff --git a/static/fonts/icomoon.eot b/static/fonts/icomoon.eot
index 82f344e0d..0caf211d4 100644
Binary files a/static/fonts/icomoon.eot and b/static/fonts/icomoon.eot differ
diff --git a/static/fonts/icomoon.svg b/static/fonts/icomoon.svg
index d7dc13c47..e942b9204 100644
--- a/static/fonts/icomoon.svg
+++ b/static/fonts/icomoon.svg
@@ -59,6 +59,7 @@
+
diff --git a/static/fonts/icomoon.ttf b/static/fonts/icomoon.ttf
index c3ebbc0fb..c14e82d68 100644
Binary files a/static/fonts/icomoon.ttf and b/static/fonts/icomoon.ttf differ
diff --git a/static/fonts/icomoon.woff b/static/fonts/icomoon.woff
index 95b34f35a..3ea85ffad 100644
Binary files a/static/fonts/icomoon.woff and b/static/fonts/icomoon.woff differ