Merge branch 'master' into collect-data

2019-01-23 12:54:28 -07:00 · 2019-01-23 12:54:28 -07:00 · f814f9705f
parent b6a03ca93f 0551a37ade
commit f814f9705f
78 changed files with 1374 additions and 433 deletions
--- a/assets/js/content-interactions.js
+++ b/assets/js/content-interactions.js
@ -84,3 +84,10 @@ $(".truncate-toggle").click(function(e) {
 	e.preventDefault()
 	$(this).closest('.truncate').toggleClass('closed');
 })
+
+//////////////////// Replace Missing Images with Placeholder ///////////////////
+
+$(".article--content img").on("error", function() {
+  $(this).attr("src", "/img/coming-soon.svg");
+  $(this).attr("style", "max-width:500px;");
+});
--- a/assets/js/search-interactions.js
+++ b/assets/js/search-interactions.js
@ -0,0 +1,8 @@
+$('#algolia-search-input').focus(function() {
+  $('.content-wrapper').fadeTo(400, .35);
+})
+
+$('#algolia-search-input').blur(function() {
+  $('.content-wrapper').fadeTo(200, 1);
+  $('.ds-dropdown-menu').hide();
+})
--- a/assets/styles/layouts/_algolia-search-overrides.scss
+++ b/assets/styles/layouts/_algolia-search-overrides.scss
@ -0,0 +1,135 @@
+.algolia-autocomplete {
+  width: 100%;
+
+  /* Main dropdown wrapper */
+  .ds-dropdown-menu {
+    width: 74vw;
+    max-width: 800px;
+    background: $article-bg;
+
+    [class^=ds-dataset-] {
+      background-color: $article-bg;
+      border: none;
+      box-shadow: 2px 2px 10px $sidebar-search-shadow;
+      transition: background-color .2s;
+    }
+    &:before {
+      display: none;
+    }
+
+    .ds-suggestions {
+      padding: 2rem;
+    }
+  }
+
+  /* Main category (eg. Getting Started) */
+  .algolia-docsearch-suggestion {
+    background: $article-bg;
+
+    &--category-header {
+      color: $article-heading;
+      border-color: $article-hr;
+      text-decoration: none;
+      &-lvl0{
+        font-size: 1.5rem;
+        font-weight: bold !important;
+        padding-bottom: 1rem;
+      }
+    }
+
+    /* Category (eg. Downloads) */
+    &--subcategory-column {
+      color: rgba($article-text, .5) !important;
+      &:before { background: $article-hr; }
+    }
+
+    /* Title (eg. Bootstrap CDN) */
+    &--title {
+      font-weight: bold;
+      color: $article-heading;
+    }
+
+    /* Description description (eg. Bootstrap currently works...) */
+    &--text {
+      font-size: 0.8rem;
+      color: $article-text;
+    }
+
+    /* Highlighted text */
+    &--highlight {
+      color: $article-link;
+    }
+
+    &--content {
+      &:before { background: $article-hr; }
+    }
+  }
+}
+
+//////////////////////////////// HARD OVERRIDES ////////////////////////////////
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main
+.algolia-docsearch-suggestion--category-header,
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__secondary {
+  text-decoration: none;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main
+.algolia-docsearch-suggestion--category-header {
+  padding-bottom: .75rem;
+  margin-bottom: .5rem;
+}
+
+.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu {
+  left: 24vw !important;
+  top: -.45rem !important;
+}
+
+.ds-suggestion:not(:first-child) {
+  .algolia-docsearch-suggestion--category-header{
+      margin-top: 1.5rem;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////// MEDIA QUERIES ////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+@media (min-width: 801px) and (max-width: 1200px) {
+  .algolia-autocomplete .ds-dropdown-menu {
+    max-width: 70vw;
+  }
+  .algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu {
+    left: 28.5vw !important;
+    top: -.45rem !important;
+  }
+}
+
+@include media(medium) {
+  .algolia-autocomplete .ds-dropdown-menu {
+    max-width: 100vw;
+    width: 100vw;
+    min-width: 0;
+  }
+  .algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu {
+    left: -1rem !important;
+    top: 112% !important;
+  }
+  .algolia-autocomplete .algolia-docsearch-suggestion {
+    .algolia-docsearch-suggestion--subcategory-column,
+    .algolia-docsearch-suggestion--content {
+      display: block;
+      margin: 2px 0;
+      float: none;
+      &:after { content: ""; }
+    }
+  }
+}
+
+@include media(small) {
+  .algolia-autocomplete .ds-dropdown-menu {
+    width: 100vw;
+  }
+  .algolia-autocomplete .ds-dropdown-menu .ds-suggestions {
+    padding: .5rem;
+  }
+}
--- a/assets/styles/layouts/_layout-content-wrapper.scss
+++ b/assets/styles/layouts/_layout-content-wrapper.scss
@ -3,6 +3,7 @@
  width: 75%;
  position: relative;
  border-radius: $border-radius 0 0 $border-radius;
+  overflow: hidden;

  .copyright {
    padding: .5rem 1rem .5rem .5rem;
--- a/assets/styles/layouts/_layout-landing.scss
+++ b/assets/styles/layouts/_layout-landing.scss
@ -0,0 +1,101 @@
+.cards {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+
+  a {
+    text-decoration: none;
+    color: inherit;
+  }
+
+  .group {
+    display: flex;
+    background: linear-gradient(127deg, $landing-sm-gradient-left, $landing-sm-gradient-right);
+    flex-wrap: wrap;
+  }
+
+  .card {
+    text-align: center;
+
+    &.full {
+      width: 100%;
+      padding: 5rem 2rem;
+    }
+
+    &.quarter {
+      flex-grow: 2;
+      margin: 1px;
+      padding: 2rem;
+      background: rgba($landing-sm-gradient-overlay, .5);
+      transition: background-color .4s;
+      &:hover {
+        background: rgba($landing-sm-gradient-overlay, 0);
+      }
+    }
+
+    h1,h2,h3,h4 {
+      font-family: $klavika;
+      font-weight: 300;
+      font-style: italic;
+      text-align: center;
+      color: $g20-white;
+    }
+
+    h1 {
+      margin: 0 0 1.25rem;
+      font-size: 2.25rem;
+    }
+
+    h3 { font-size: 1.35rem;}
+
+    &#get-started {
+      background: linear-gradient(127deg, $landing-lg-gradient-left, $landing-lg-gradient-right );
+      text-align: center;
+
+      .btn {
+        display: inline-block;
+        padding: .85rem 1.5rem;
+        color: $g20-white;
+        font-weight: bold;
+        background: rgba($g20-white, .1);
+        border: 2px solid rgba($g20-white, .5);
+        border-radius: $border-radius;
+        transition: background-color .2s, color .2s;
+
+        &:hover {
+          background: $g20-white;
+          color: $b-pool;
+        }
+      }
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////// MEDIA QUERIES ////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+
+@include media(large) {
+  .cards {
+    .card {
+      &.full { padding: 3.5rem;}
+      &.quarter { width: 48%; }
+    }
+  }
+}
+
+@include media(small) {
+  .cards {
+    .group { flex-direction: column; }
+    .card{
+      &.full { padding: 2.5rem;}
+      &.quarter {
+        width: 100%;
+        max-width: 100%;
+        padding: 1.25rem;
+      }
+      h1 { font-size: 2rem; }
+    }
+  }
+}
--- a/assets/styles/layouts/_layout-topnav.scss
+++ b/assets/styles/layouts/_layout-topnav.scss
@ -130,6 +130,10 @@
    &#theme-switch-dark { display: $theme-switch-dark; }
    &#theme-switch-light { display: $theme-switch-light; }
  }
+
+  #search-btn {
+    opacity: 0;
+  }
 }

 ////////////////////////////////////////////////////////////////////////////////
--- a/assets/styles/styles-default.scss
+++ b/assets/styles/styles-default.scss
@ -17,4 +17,6 @@
        "layouts/layout-content-wrapper",
        "layouts/layout-article",
        "layouts/syntax-highlighting",
+        "layouts/algolia-search-overrides",
+        "layouts/layout-landing",
        "layouts/layout-error-page";
--- a/assets/styles/themes/_theme-dark.scss
+++ b/assets/styles/themes/_theme-dark.scss
@ -137,3 +137,10 @@ $error-page-btn: $b-ocean !default;
 $error-page-btn-text: $g20-white !default;
 $error-page-btn-hover: $g20-white !default;
 $error-page-btn-hover-text: $b-ocean !default;
+
+// Landing Page colors
+$landing-lg-gradient-left: $b-ocean !default;
+$landing-lg-gradient-right: $b-pool !default;
+$landing-sm-gradient-left: $p-planet !default;
+$landing-sm-gradient-right: $p-star !default;
+$landing-sm-gradient-overlay: $p-shadow !default;
--- a/assets/styles/themes/_theme-light.scss
+++ b/assets/styles/themes/_theme-light.scss
@ -136,3 +136,10 @@ $error-page-btn: $b-ocean;
 $error-page-btn-text: $g20-white;
 $error-page-btn-hover: $b-pool;
 $error-page-btn-hover-text: $g20-white;
+
+// Landing Page colors
+$landing-lg-gradient-left: $b-ocean;
+$landing-lg-gradient-right: $b-pool;
+$landing-sm-gradient-left: $p-star;
+$landing-sm-gradient-right: $p-comet;
+$landing-sm-gradient-overlay: $p-planet;
--- 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?cn4x5l');
-  src:  url('fonts/icomoon.eot?cn4x5l#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?cn4x5l') format('truetype'),
-    url('fonts/icomoon.woff?cn4x5l') format('woff'),
-    url('fonts/icomoon.svg?cn4x5l#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?rws1o3');
+  src:  url('fonts/icomoon.eot?rws1o3#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?rws1o3') format('truetype'),
+    url('fonts/icomoon.woff?rws1o3') format('woff'),
+    url('fonts/icomoon.svg?rws1o3#icomoon') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@ -87,6 +87,12 @@
 .icon-menu:before {
  content: "\e91b";
 }
+.icon-minus:before {
+  content: "\e91d";
+}
+.icon-plus:before {
+  content: "\e91e";
+}
 .icon-settings:before {
  content: "\e914";
 }
--- a/config.toml
+++ b/config.toml
@ -1,4 +1,4 @@
-baseURL = "http://docs.influxdata.com/"
+baseURL = "https://v2.docs.influxdata.com/"
 languageCode = "en-us"
 title = "InfluxDB Documentation"

--- a/content/v2.0/UI/exploring-metrics.md
+++ b/content/v2.0/UI/exploring-metrics.md
@ -1,41 +0,0 @@
---
-title: Exploring metrics
-description:
-menu:
-  v2_0:
-    name: Exploring metrics
-    weight: 1
-    parent: Placeholder parent
---
-
-Explore and visualize your data in the **Data Explorer**. The user interface allows you to move seamlessly between using the builder or templates and manually editing the query; when possible, the interface automatically populates the builder with the information from your raw query. Choose between [visualization types](/chronograf/latest/guides/visualization-types/) for your query.
-
-To open the **Data Explorer**, click the **Explore** icon in the navigation bar:
-
-<img src="/img/chronograf/v1.7/data-explorer-icon.png" style="width:100%; max-width:400px; margin:2em 0; display: block;">
-
-## Explore data with Flux
-
-Flux is InfluxData's new functional data scripting language designed for querying, analyzing, and acting on time series data. To learn more about Flux, see [Getting started with Flux](/flux/v0.7/introduction/getting-started).
-
-1. Click the **Data Explorer** icon in the sidebar.
-2. Use the builder to select from your existing data and have the query automatically formatted for you.
-Alternatively, click **Edit Query As Flux** to manually edit the query. To switch back to the query builder, click **Visual Query Builder**.
-3. Use the **Functions** pane to review the available Flux functions. Click on a function from the list to add it to your query.
-4. Click **Submit** to run your query. You can then preview your graph in the above pane.
-
-## Visualize your query
-
-**To visualize your query**:
-
-* Select a visualization type from the dropdown menu in the upper-left.
-<<SCREENSHOT>>
-* Select the **Visualization** tab at the bottom of the **Data Explorer**. For details about all of the available visualization options, see [Visualization types](/chronograf/latest/guides/visualization-types/).
-
-## Save your query as a dashboard cell or task
-
-**To save your query**:
-
-1. Click **Save as** in the upper right.
-2. Click **Dashboard Cell** to add your query to a dashboard.
-3. Click **Task** to save your query as a task.
--- a/content/v2.0/UI/getting-started.md
+++ b/content/v2.0/UI/getting-started.md
@ -1,77 +0,0 @@
---
-title: Getting started
-description: This is just an example post to show the format of new 2.0 posts
-menu:
-  v2_0:
-    name: Getting started
-    weight: 1
-    parent: Placeholder parent
---
-
-## Buckets
-
-Buckets are a new data storage concept for InfluxDB. A bucket is a named location where data is stored that has a retention policy. It’s similar to an InfluxDB v1.x “database,” but is a combination of both a database and a retention policy. When using multiple retention policies, each retention policy is treated as is its own bucket.
-
-
-## Onboarding (/setup)
-
-* Set up your initial admin user.
-Enter:
-    * Admin username
-    * Admin password/confirm
-    * Default organization name
-    * Default bucket name
-* Click Next
-* Select data sources to add to your bucket.
-Pick from boxes showing sources
-    * Streaming
-    * Line protocol
-    * CSV
-* Click Next
-* Configure your data source.
-    * Lots of details, differs depending on source type.
-    * Type v1 or v2?
-* Import protoboards for selected data sources
-* Setup complete screen
-    * click Go to Status Dashboard?
-    * or does it link you to the User Homepage? Pretty sure it’s this.
-
-
-## User Homepage (/)
-
-* A jumping off point for everything the user has access to
-    * List of all dashboards they have access to
-    * List of all orgs they belong to
-    * List of all tasks they have access to
-* Contains links to support related items:
-    * Technical documentation
-    * Community forum
-    * Report a bug
-    * Request a feature
-    * Version info
-    * Last commit
-* Contains links to docs
-* Manage my plan: A place to get notifications from Quartz
-* A place to learn about new features and updates in each version
-
-### Subpages
-
-#### Account settings (/my-account)
-
-* About Me:
-    * Username
-    * Email address
-* Preferences
-    * Timezone
-    * Theme
-* For both, Edit Changes then Save Changes
-
-#### Tokens (/tokens)
-
-* Table with Description, Last Used, and Organization columns
-    * Click on token name in Description column for Edit Token overlay
-        * Unlikely that user will use it, mostly in case of emergency
-    * Click on org name in Organization column to open organization page
-* Generate token upper right
-    * Opens generate token overlay (tgo!)
-    * Also very unlikely that user will manually generate a token
--- a/content/v2.0/UI/organizations.md
+++ b/content/v2.0/UI/organizations.md
@ -1,64 +0,0 @@
---
-title: Managing organizations
-description: Describes how to manage organizations.
-menu:
-  v2_0:
-    name: Managing organizations
-    weight: 1
-    parent: Placeholder parent
---
-
-Everything is scoped by/contained within organization--dashboards, tasks, buckets, users, !!collectors and scrapers!!.
-
-**To create an organization**:
-
-1. Click the **Organizations** tab in the navigation bar.
-2. Click **+ Create Organization**
-2. Enter a name for your organization.
-3. Click **Create**.
-
-**To manage an organization's members**:
-
-Organizations have "owners" and "members".
-
-1. Click the **Organizations** tab in the navigation bar.
-2. Click on the name of an organization. All of the organization's members appear in the **Members** tab.
-3. Select a member from the list or search to filter the list.
-4. ?? Edit members, remove members, invite users to be a member
-
-
-**To manage an organization's buckets**:
-
-A bucket is a named location where data is stored that has a retention policy. It’s similar to an InfluxDB v1.x “database,” but is a combination of both a database and a retention policy. Each bucket can only have one retention policy.
-
-
-1. Click the **Organizations** tab in the navigation bar.
-2. Click on the name of an organization, then select the **Buckets** tab. All of the organization's buckets appear.
-3. To create a bucket, click **+Create** in the upper right.
-  * Enter a name for your bucket in the **Name** field.
-  * In the **How often to clear data?** field:
-    * Select **Never** to retain data forever.
-    * Select **Periodically** to define a specific retention policy.
-4. To update a bucket's name or retention policy, click the name of the bucket from the list.
-5. Click **Update** to save.
-6. ??Configure data sources tied to each bucket, delete bucket
-
-
-**To view an organization's dashboards**:
-
-1. Click the **Organizations** tab in the navigation bar.
-2. Click on the name of an organization, then select the **Dashboards** tab. All of the organization's dashboards appear.
-3. Click on the name of the dashboard to view it.
-
-For details on editing dashboards, see <<link to dashboards section>>
-
-
-#### Tasks (/organizations/orgnamehere/tasks)
-  * User can see all tasks owned by this org
-
-#### Options (/organizations/orgnamehere/options) mockup says settings
-  * Only owners can see this tab
-  * Owner can change name of Organization
-  * Owner can modify permissions of an organization
-  * There will be more options here in the future
-  * Owner can disband organization
--- a/content/v2.0/UI/sources.md
+++ b/content/v2.0/UI/sources.md
@ -1,123 +0,0 @@
---
-title: Managing sources
-description: This is just an example post to show the format of new 2.0 posts
-menu:
-  v2_0:
-    name: Managing sources
-    weight: 1
-    parent: Placeholder parent
---
-
-
-Chronograf offers a complete dashboard solution for visualizing your data and monitoring your infrastructure:
-
-* View [pre-created dashboards](/chronograf/latest/guides/using-precreated-dashboards) from the Host List page. Dashboards are available depending on which Telegraf input plugins you have enabled. These pre-created dashboards cannot be cloned or edited.
-* Create custom dashboards from scratch by building queries in the Data Explorer, as described [below](#build-a-dashboard).
-* Import dashboard templates when you add or update a connection in Chronograf. See [Dashboard templates](#dashboard-templates) for details.
-
-
-By the end of this guide, you'll be aware of the tools available to you for creating dashboards similar to this example:
-
-![Oh, the Chronobilities](/img/chronograf/v1.7/g-dashboard-possibilities.png)
-
-## Requirements
-
-To perform the tasks in this guide, you must have a working Chronograf instance that is connected to an InfluxDB source.
-Data is accessed using the Telegraf [system ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system) input plugins.
-For more information, see [Configuring Chronograf](/chronograf/latest/administration/configuration).
-
-## Build a Dashboard
-
-Click **Dashboards** in the navigation bar and then click the **Create Dashboard** button.
-A new dashboard is created and ready to begin adding cells.
-
-### Step 1: Name your dashboard
-
-Click **Name This Dashboard** and type a new name. In this guide, "ChronoDash" is used.
-
-### Step 2: Enter cell editor mode
-
-In the first cell, titled "Untitled Cell", click **Edit**
-to open the cell editor mode.
-
-![Edit your cell](/img/chronograf/g-dashboard-cell-edit.png)
-
-### Step 3: Create your query
-
-Click the **Add a Query** button to create an [InfluxQL](/influxdb/latest/query_language/) query.
-In query editor mode, use the builder to select from your existing data and allow Chronograf to format the query for you.
-Alternatively, manually enter and edit a query.
-Chronograf allows you to move seamlessly between using the builder and manually editing the query; when possible, the interface automatically populates the builder with the information from your raw query.
-
-For our example, the query builder is used to generate a query that shows the average idle CPU usage grouped by host (in this case, there are three hosts).
-By default, Chronograf applies the [`MEAN()` function](/influxdb/latest/query_language/functions/#mean) to the data, groups averages into auto-generated time intervals (`:interval:`), and shows data for the past hour (`:dashboardTime:`).
-Those defaults are configurable using the query builder or by manually editing the query.
-
-In addition, the time range (`:dashboardTime:`) is [configurable on the dashboard](#step-6-configure-your-dashboard).
-
-![Build your query](/img/chronograf/v1.7/g-dashboard-builder.png)
-
-### Step 4: Choose your visualization type
-
-Chronograf supports many different [visualization types](/chronograf/latest/guides/visualization-types/). To choose a visualization type, click **Visualization** and select **Step-Plot Graph**.
-
-![Visualization type](/img/chronograf/v1.7/g-dashboard-visualization.png)
-
-### Step 5: Save your cell
-Click **Save** (the green checkmark icon) to save your cell.
-
-{{% note %}}
-If you navigate away from this page without clicking Save, your work will not be saved.
-{{% /note %}}
-
-### Step 6: Configure your dashboard
-
-#### Customize cells:
-* You can change the name of the cell from "Untitled Cell" by returning to the cell editor mode, clicking on the name, and renaming it. Remember to save your changes.
-* **Move** your cell around by clicking its top bar and dragging it around the page
-* **Resize** your cell by clicking and dragging its bottom right corner
-
-#### Explore cell data:
-* **Zoom** in on your cell by clicking and dragging your mouse over the area of interest
-* **Pan** over your cell data by pressing the shift key and clicking and dragging your mouse over the graph
-* **Reset** your cell by double-clicking your mouse in the cell window
-
-{{% note %}}
-These tips only apply to the line, stacked, step-plot, and line+stat [visualization types](/chronograf/latest/guides/visualization-types/).
-{{% /note %}}
-
-#### Configure dashboard-wide settings:
-* You can change the dashboard's *auto-refresh interval* at the top of the page - the default interval selected is **Every 15 seconds**.
-* You can also modify the dashboard's *time range* at the top of the page - the default range is **Past 15 minutes**.
-
-Now, you are free to experiment and complete your dashboard by creating, editing, and repositioning more cells!
-
-## Dashboard templates
-
-Select from a variety of dashboard templates to import and customize based on which Telegraf plugins you have enabled, such as the following examples:
-
-* <img src="/img/chronograf/v1.7/protoboard-kubernetes.png" style="width:100%; max-width:600px;">
-* <img src="/img/chronograf/v1.7/protoboard-mysql.png" style="width:100%; max-width:600px;">
-* <img src="/img/chronograf/v1.7/protoboard-system.png" style="width:100%; max-width:600px;">
-* <img src="/img/chronograf/v1.7/protoboard-vsphere.png" style="width:100%; max-width:600px;">
-
-**To import dashboard templates:**
-
-1. From the Configuration page, click **Add Connection** or select an existing connection to edit it.
-2. In the **InfluxDB Connection** window, enter or verify your connection details and click **Add** or **Update Connection**.
-3. In the **Dashboards** window, select from the available dashboard templates to import based on which Telegraf plugins you have enabled.
-
-    <img src="/img/chronograf/v1.7/protoboard-select.png" style="width:100%; max-width:500px;">
-4. Click **Create (x) Dashboards**.    
-5. Edit, clone, or configure the dashboards as needed.
-
-
-## Extra Tips
-
-### Full screen mode
-View your dashboard in full screen mode by clicking on the full screen icon in the top right corner of your dashboard.
-To exit full screen mode, press the Esc key.
-
-### Template variables
-Dashboards support template variables.
-See the [Dashboard Template Variables](/chronograf/latest/guides/dashboard-template-variables/) guide for more information.
--- a/content/v2.0/_index.md
+++ b/content/v2.0/_index.md
@ -1,11 +1,26 @@
 ---
-title: InfluxDB v2.0
-seotitle: This is the SEO title for InfluxDB v2.0
-description: placeholder
+description: >
+  InfluxDB is an open source time series database designed to handle high write and query loads.
+  Learn how to use and leverage InfluxDB in use cases such as monitoring metrics, IoT data, and events.
 layout: version-landing
 menu:
  versions:
    name: v2.0
 ---

-_This placeholder content for the landing page for v2.0._
+#### Welcome
+Welcome to the InfluxDB v2.0 documentation!
+InfluxDB is an open source time series database designed to handle high write and query loads.
+
+This documentation is meant to help you learn how to use and leverage InfluxDB to meet your needs.
+Common use cases include infrastructure monitoring, IoT data collection, events handling and more.
+If your use case involves time series data, InfluxDB is purpose-built to handle it.
+
+{{% note %}}
+This is an alpha release of InfluxDB v2.0.
+Feedback and bug reports are welcome and encouraged both for InfluxDB and this documentation.
+Issue tracking is managed through Github.
+
+[Submit an InfluxDB issue](https://github.com/influxdata/influxdb/issues/new)  
+[Submit a documentation issue](https://github.com/influxdata/docs-v2/issues/new)
+{{% /note %}}
--- a/content/v2.0/get-started/setup.md
+++ b/content/v2.0/get-started/setup.md
@ -24,6 +24,20 @@ influxd
 _See the [`influxd` documentation](/v2.0/reference/cli/influxd) for information about
 available flags and options._

+{{% note %}}
+#### InfluxDB "phone-home"
+By default, InfluxDB sends telemetry data back to InfluxData.
+The [InfluxData telemetry](https://www.influxdata.com/telemetry) page provides
+information about what data is collected and how it is used.
+
+Top opt-out of sending telemetry data back to InfluxData, include the
+`--reporting-disabled` flag when starting `influxd`.
+
+```bash
+influxd --reporting-disabled
+```
+{{% /note %}}
+

 ## Set up InfluxDB through the UI

--- a/content/v2.0/organizations/_index.md
+++ b/content/v2.0/organizations/_index.md
@ -0,0 +1,16 @@
+---
+title: Manage organizations
+seotitle: Manage organizations in InfluxDB
+description: Manage organizations in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Manage organizations
+    weight: 10
+---
+
+An **organization** is a workspace for a group of users.
+All dashboards, tasks, buckets, members, etc., belong to an organization.
+
+The following articles provide information about managing organizations:
+
+{{< children >}}
--- a/content/v2.0/organizations/buckets/_index.md
+++ b/content/v2.0/organizations/buckets/_index.md
@ -0,0 +1,18 @@
+---
+title: Manage buckets
+seotitle: Manage buckets in InfluxDB
+description: Manage buckets in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Manage buckets
+    parent: Manage organizations
+    weight: 5
+---
+
+A **bucket** is a named location where time series data is stored.
+All buckets have a **retention policy**, a duration of time that each data point persists.
+A bucket belongs to an organization.
+
+The following articles provide information about managing buckets:
+
+{{< children >}}
--- a/content/v2.0/organizations/buckets/create-bucket.md
+++ b/content/v2.0/organizations/buckets/create-bucket.md
@ -0,0 +1,44 @@
+---
+title: Create a bucket
+seotitle: Create a bucket in InfluxDB
+description: Create buckets to store time series data in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Create a bucket
+    parent: Manage buckets
+    weight: 1
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to create a bucket.
+
+## Create a bucket in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Buckets** tab.
+3. Click **+ Create Bucket** in the upper right.
+4. Enter a **Name** for the bucket.
+5. Select **How often to clear data?**:  
+    Select **Never** to retain data forever.  
+    Select **Periodically** to define a specific retention policy.
+5. Click **Create** to create the bucket.
+
+## Create a bucket using the influx CLI
+
+Use the [`influx bucket create` command](/v2.0/reference/cli/influx/bucket/create)
+to create a new bucket. A bucket requires the following:
+
+- A name
+- The name or ID of the organization to which it belongs
+- A retention period in nanoseconds
+
+```sh
+# Pattern
+influx bucket create -n <bucket-name> -o <org-name> -r <retention period in nanoseconds>
+
+# Example
+influx bucket create -n my-bucket -o my-org -r 604800000000000
+```
--- a/content/v2.0/organizations/buckets/delete-bucket.md
+++ b/content/v2.0/organizations/buckets/delete-bucket.md
@ -0,0 +1,39 @@
+---
+title: Delete a bucket
+seotitle: Delete a bucket from InfluxDB
+description: Delete a bucket from InfluxDB using the InfluxDB UI or the influx CLI
+menu:
+  v2_0:
+    name: Delete a bucket
+    parent: Manage buckets
+    weight: 3
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to delete a bucket.
+
+## Delete a bucket in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Buckets** tab.
+3. Hover over the bucket you would like to delete.
+4. Click **Delete** and **Confirm** to delete the bucket.
+
+## Delete a bucket using the influx CLI
+
+Use the [`influx bucket delete` command](/v2.0/reference/cli/influx/bucket/delete)
+to delete a bucket. Deleting a bucket requires the following:
+
+- The bucket ID _(provided in the output of `influx bucket find`)_
+- The name or ID of the organization to which the bucket belongs
+
+```sh
+# Pattern
+influx bucket delete -i <bucket-id>
+
+# Example
+influx bucket delete -i 034ad714fdd6f000
+```
--- a/content/v2.0/organizations/buckets/update-bucket.md
+++ b/content/v2.0/organizations/buckets/update-bucket.md
@ -0,0 +1,49 @@
+---
+title: Update a bucket
+seotitle: Update a bucket in InfluxDB
+description: Update a bucket's name or retention policy in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Update a bucket
+    parent: Manage buckets
+    weight: 2
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to update a bucket.
+
+## Update a bucket in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Buckets** tab. All of the organization's buckets appear.
+3. To update a bucket's name or retention policy, click the name of the bucket from the list.
+4. Click **Update** to save.
+
+## Update a bucket using the influx CLI
+
+Use the [`influx bucket update` command](/v2.0/reference/cli/influx/bucket/update)
+to update a bucket. Updating a bucket requires the following:
+
+- The bucket ID _(provided in the output of `influx bucket find`)_
+- The name or ID of the organization to which the bucket belongs
+
+##### Update the name of a bucket
+```sh
+# Pattern
+influx bucket update -i <bucket-id> -o <org-name> -n <new-bucket-name>
+
+# Example
+influx bucket update -i 034ad714fdd6f000 -o my-org -n my-new-bucket
+```
+
+##### Update a bucket's retention policy
+```sh
+# Pattern
+influx bucket update -i <bucket-id> -o <org-name> -r <retention period in nanoseconds>
+
+# Example
+influx bucket update -i 034ad714fdd6f000 -o my-org -r 1209600000000000
+```
--- a/content/v2.0/organizations/buckets/view-buckets.md
+++ b/content/v2.0/organizations/buckets/view-buckets.md
@ -0,0 +1,33 @@
+---
+title: View buckets
+seotitle: View buckets in InfluxDB
+description: View a list of all the buckets for an organization in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: View buckets
+    parent: Manage buckets
+    weight: 2
+---
+
+## View buckets in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Buckets** tab. All of the organization's buckets appear.
+3. Click on a bucket to view details.=
+
+## View buckets using the influx CLI
+
+Use the [`influx bucket find` command](/v2.0/reference/cli/influx/bucket/find)
+to view a buckets in an organization. Viewing bucket requires the following:
+
+
+```sh
+influx bucket find
+```
+
+Other filtering options such as filtering by organization, name, or ID are available.
+See the [`influx bucket find` documentation](/v2.0/reference/cli/influx/bucket/find)
+for information about other available flags.
--- a/content/v2.0/organizations/create-org.md
+++ b/content/v2.0/organizations/create-org.md
@ -0,0 +1,36 @@
+---
+title: Create an organization
+seotitle: Create an organization in InfluxDB
+description: Create an organization in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Create an organization
+    parent: Manage organizations
+    weight: 1
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to create an organization.
+
+## Create an organization in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+_Complete content coming soon_
+
+## Create an organization using the influx CLI
+
+Use the [`influx org create` command](/v2.0/reference/cli/influx/org/create)
+to create a new organization. A new organization requires the following:
+
+- A name for the organization
+
+```sh
+# Pattern
+influx org create -n <org-name>
+
+# Example
+influx org create -n my-org
+```
--- a/content/v2.0/organizations/delete-org.md
+++ b/content/v2.0/organizations/delete-org.md
@ -0,0 +1,36 @@
+---
+title: Delete an organization
+seotitle: Delete an organization from InfluxDB
+description: Delete an existing organization from InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Delete an organization
+    parent: Manage organizations
+    weight: 4
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to create an organization.
+
+## Delete an organization in the InfluxDB UI
+
+* Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+The list of organizations appears.
+* Hover over an organization's name and click **Delete**.
+
+## Delete an organization using the influx CLI
+
+Use the [`influx org delete` command](/v2.0/reference/cli/influx/org/delete)
+to delete an organization. Deleting an organization requires the following:
+
+- The organization ID _(provided in the output of `influx org find`)_
+
+```sh
+# Pattern
+influx org delete -i <org-id>
+
+# Example
+influx org delete -i 034ad714fdd6f000
+```
--- a/content/v2.0/organizations/members/_index.md
+++ b/content/v2.0/organizations/members/_index.md
@ -0,0 +1,15 @@
+---
+title: Manage organization members
+seotitle: Manage members of an organization in InfluxDB
+description: Manage members of an organization in InfluxDB using the InfluxDB UI or CLI.
+menu:
+  v2_0:
+    name: Manage members
+    parent: Manage organizations
+    weight: 6
+---
+
+A **member** is a user that belongs to an organization.
+The following articles provide information about managing users:
+
+{{< children >}}
--- a/content/v2.0/organizations/members/add-member.md
+++ b/content/v2.0/organizations/members/add-member.md
@ -0,0 +1,31 @@
+---
+title: Add a member
+seotitle: Add a member to an organization in InfluxDB
+description: Add a member to an organization.
+menu:
+  v2_0:
+    name: Add a member
+    parent: Manage members
+    weight: 1
+draft: true
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to add a member to an organization.
+
+## Add a member to an organization in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Members** tab.
+
+_Complete content coming soon_
+
+## Add a member to an organization using the influx CLI
+
+Use the [`influx org members add` command](/v2.0/reference/cli/influx/org/members/add)
+to add a user to an organization. Adding a user requires the following:
+
+_Complete content coming soon_
--- a/content/v2.0/organizations/members/remove-member.md
+++ b/content/v2.0/organizations/members/remove-member.md
@ -0,0 +1,31 @@
+---
+title: Remove a member
+seotitle: Remove a member from an organization in InfluxDB
+description: Remove a member from an organization.
+menu:
+  v2_0:
+    name: Remove a member
+    parent: Manage members
+    weight: 3
+draft: true
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to remove a member from an organization.
+
+## Remove a member from an organization in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the name of an organization, then select the **Members** tab.
+
+_Complete content coming soon_
+
+## Remove a member from an organization using the influx CLI
+
+Use the [`influx org members add` command](/v2.0/reference/cli/influx/org/members/add)
+to remove a member from an organization. Removing a member requires the following:
+
+_Complete content coming soon_
--- a/content/v2.0/organizations/members/view-members.md
+++ b/content/v2.0/organizations/members/view-members.md
@ -0,0 +1,37 @@
+---
+title: View members
+seotitle: View members of an organization in InfluxDB
+description: Review a list of members for an organization.
+menu:
+  v2_0:
+    name: View members
+    parent: Manage members
+    weight: 2
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to view members of an organization.
+
+## View members of organization in the InfluxDB UI
+
+* Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+* Click on the name of an organization, then select the **Members** tab. The list of organization members appears.
+
+
+## View members of organization using the influx CLI
+
+Use the [`influx org members list` command](/v2.0/reference/cli/influx/org/members/list)
+to list members of an organization. Listing an organization's members requires the following:
+
+- The name or ID of the organization
+
+```sh
+# Pattern
+influx org members list -n <org-name>
+
+# Example
+influx org members list -n my-org
+```
--- a/content/v2.0/organizations/update-org.md
+++ b/content/v2.0/organizations/update-org.md
@ -0,0 +1,39 @@
+---
+title: Update an organization
+seotitle: Update an organization in InfluxDB
+description: Update an organization's name and assets in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Update an organization
+    parent: Manage organizations
+    weight: 3
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to update an organization.
+
+## Update an organization in the InfluxDB UI
+
+1. Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+2. Click on the organization you want to update in the list.
+3. To update the organization's name, select the **Options** tab.
+4. To manage the organization's members, buckets, dashboards, and tasks, click on the corresponding tabs.
+
+## Update an organization using the influx CLI
+
+Use the [`influx org update` command](/v2.0/reference/cli/influx/org/update)
+to update an organization. Updating an organization requires the following:
+
+- The org ID _(provided in the output of `influx org find`)_
+
+##### Update the name of a organization
+```sh
+# Pattern
+influx org update -i <org-id> -n <new-org-name>
+
+# Example
+influx org update -i 034ad714fdd6f000 -n my-new-org
+```
--- a/content/v2.0/organizations/view-orgs.md
+++ b/content/v2.0/organizations/view-orgs.md
@ -0,0 +1,35 @@
+---
+title: View organizations
+seotitle: View organizations in InfluxDB
+description: Review a list of organizations in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: View organizations
+    parent: Manage organizations
+    weight: 2
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to view organizations.
+
+## View organizations in the InfluxDB UI
+
+* Click the **Organizations** tab in the navigation bar.
+
+    {{< img-hd src="/img/organizations-icon.png" title="Organizations icon" />}}
+
+The list of organizations appears.
+
+
+## View organizations using the influx CLI
+
+Use the [`influx org find` command](/v2.0/reference/cli/influx/org/find)
+to view organizations.
+
+```sh
+influx org find
+```
+
+Filtering options such as filtering by name or ID are available.
+See the [`influx org find` documentation](/v2.0/reference/cli/influx/org/find)
+for information about other available flags.
--- a/content/v2.0/process-data/_index.md
+++ b/content/v2.0/process-data/_index.md
@ -7,7 +7,7 @@ description: >
 menu:
  v2_0:
    name: Process data
-    weight: 3
+    weight: 5
 ---

 InfluxDB's _**task engine**_ is designed for processing and analyzing data.
--- a/content/v2.0/process-data/manage-tasks/create-task.md
+++ b/content/v2.0/process-data/manage-tasks/create-task.md
@ -26,7 +26,7 @@ The InfluxDB UI provides multiple ways to create a task:
 ### Create a task from the Data Explorer
 1. Click on the **Data Explorer** icon in the left navigation menu.

-    {{< img-hd src="/img/data-explorer-icon.png" alt="Data Explorer Icon" />}}
+    {{< img-hd src="/img/data-explorer-icon.png" title="Data Explorer Icon" />}}

 2. Building a query and click **Save As** in the upper right.
 3. Select the **Task** option.
@ -34,12 +34,12 @@ The InfluxDB UI provides multiple ways to create a task:
   for detailed information about each option.
 5. Click **Save as Task**.

-{{< img-hd src="/img/data-explorer-save-as-task.png" alt="Add a task from the Data Explorer"/>}}
+{{< img-hd src="/img/data-explorer-save-as-task.png" title="Add a task from the Data Explorer"/>}}

 ### Create a task in the Task UI
 1. Click on the **Tasks** icon in the left navigation menu.

-    {{< img-hd src="/img/tasks-icon.png" alt="Tasks Icon" />}}
+    {{< img-hd src="/img/tasks-icon.png" title="Tasks Icon" />}}

 2. Click **+ Create Task** in the upper right.
 3. In the left panel, specify the task options.
@ -47,7 +47,7 @@ The InfluxDB UI provides multiple ways to create a task:
 4. In the right panel, enter your task script.
 5. Click **Save** in the upper right.

-{{< img-hd src="/img/tasks-create-edit.png" alt="Create a task" />}}
+{{< img-hd src="/img/tasks-create-edit.png" title="Create a task" />}}

 ### Import a task
 1. Click on the **Tasks** icon in the left navigation menu.
@ -55,8 +55,6 @@ The InfluxDB UI provides multiple ways to create a task:
 3. Drag and drop or select a file to upload.
 4. Click **Upload Task**.

-{{< img-hd src="/img/tasks-import-task.png" alt="Import a task" />}}
-
 ## Create a task using the influx CLI
 Use `influx task create` command to create a new task.
 It accepts either a file path or raw Flux.
--- a/content/v2.0/process-data/manage-tasks/delete-task.md
+++ b/content/v2.0/process-data/manage-tasks/delete-task.md
@ -20,8 +20,6 @@ menu:
 3. Click **Delete** on the far right.
 4. Click **Confirm**.

-{{< img-hd src="/img/tasks-delete-task.png" alt="Delete a task" />}}
-

 ## Delete a task with the influx CLI
 Use the `influx task delete` command to delete a task.
--- a/content/v2.0/process-data/manage-tasks/view-tasks.md
+++ b/content/v2.0/process-data/manage-tasks/view-tasks.md
@ -1,5 +1,5 @@
 ---
-title: View tasks in InfluxDB
+title: View tasks
 seotitle: View created tasks that process data in InfluxDB
 description: >
  How to view all created data processing tasks using the InfluxDB user interface
@ -23,8 +23,6 @@ Click the **Tasks** icon in the left navigation to view the lists of tasks.
 3. Select an organization from the **All Organizations** dropdown to filter the list by organization.
 4. Click on the heading of any column to sort by that field.

-{{< img-hd src="/img/tasks-list.png" alt="View and filter tasks" />}}
-
 ## View tasks with the influx CLI
 Use the `influx task find` command to return a list of created tasks.

@ -34,6 +32,6 @@ influx task find

 #### Filter tasks using the CLI
 Other filtering options such as filtering by organization or user,
-or limiting the number of tasks returned are available.
+or limiting the number of tasks returned, are available.
 See the [`influx task find` documentation](/v2.0/reference/cli/influx/task/find)
 for information about other available flags.
--- a/content/v2.0/query-data/execute-queries.md
+++ b/content/v2.0/query-data/execute-queries.md
@ -20,7 +20,7 @@ This guide covers the different options:
 ## Data Explorer
 Queries can be built, executed, and visualized in InfluxDB UI's Data Explorer.

-![Data Explorer with Flux](/img/flux-data-explorer.png)
+![Data Explorer with Flux](/img/data-explorer-ui.png)

 ## Influx REPL
 The [`influx repl` command](/v2.0/reference/cli/influx/repl) starts an interactive
--- a/content/v2.0/reference/cli/influxd.md
+++ b/content/v2.0/reference/cli/influxd.md
@ -25,7 +25,6 @@ influxd [flags]
 | `-h`, `--help`         | Help for `influxd`                                                   |            |
 | `--http-bind-address`  | Bind address for the REST HTTP API (default `:9999`)                 | string     |
 | `--log-level`          | Supported log levels are debug, info, and error (default `info`)     | string     |
-| `--nats-path`          | Path to NATS queue for scraping tasks (default `~/.influxdbv2/nats`) | string     |
 | `--reporting-disabled` | Disable sending telemetry data to https://telemetry.influxdata.com   |            |
 | `--protos-path`        | Path to protos on the filesystem (default `~/.influxdbv2/protos`)    | string     |
 | `--secret-store`       | Data store for secrets (bolt or vault) (default `bolt`)              | string     |
--- a/content/v2.0/reference/flux/functions/transformations/fill.md
+++ b/content/v2.0/reference/flux/functions/transformations/fill.md
@ -8,7 +8,7 @@ menu:
    weight: 1
 ---

-The `fill()` function replaces all null values in an input stream and replace them with a non-null value.
+The `fill()` function replaces all null values in an input stream with a non-null value.
 The output stream is the same as the input stream with all null values replaced in the specified column.

 _**Function type:** Transformation_  
--- a/content/v2.0/ui/account-settings.md
+++ b/content/v2.0/ui/account-settings.md
@ -1,13 +0,0 @@
---
-title: Managing account settings
-description: This is just an example post to show the format of new 2.0 posts
-menu:
-  v2_0:
-    name: Managing account settings
-    weight: 1
-    parent: Placeholder parent
---
-
-1. Click the ?? icon in the navigation bar.
-2. Review your settings on the **Settings** tab.
-3. To edit your settings, click **Edit About Me**
--- a/content/v2.0/ui/labels.md
+++ b/content/v2.0/ui/labels.md
@ -1,15 +0,0 @@
---
-title: Managing labels
-description: This is just an example post to show the format of new 2.0 posts
-menu:
-  v2_0:
-    name: Managing labels
-    weight: 1
-    parent: Placeholder parent
---
-Labels are !!!.
-
-**To view labels**:
-
-* Click the **Configuration** icon in the navigation bar.
-* Review the list of labels or enter a search to filter the list of labels.
--- a/content/v2.0/ui/tokens.md
+++ b/content/v2.0/ui/tokens.md
@ -1,23 +0,0 @@
---
-title: Managing account settings
-description: This is just an example post to show the format of new 2.0 posts
-menu:
-  v2_0:
-    name: Managing tokens
-    weight: 1
-    parent: Placeholder parent
---
-**To view tokens**:
-
-1. Click the ?? icon in the navigation bar.
-2. In the right panel labeled **My Settings**, click **Tokens**. All of your account's tokens appear.
-3. Click on a token name from the list to view the token and a summary of access permissions.
-<<SCREENSHOT>>
-
-**To copy a token**:
-
-* From the token detail view, click **Copy**.
-
-**To delete a token**:
-
-* Hover over the name of a token in the list, then click **Delete**.
--- a/content/v2.0/users/_index.md
+++ b/content/v2.0/users/_index.md
@ -0,0 +1,17 @@
+---
+title: Manage users
+seotitle: Manage users in InfluxDB
+description: Manage users in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Manage users
+    weight: 12
+---
+
+Users are those with access to InfluxDB.
+In order to access any data, a user must be [added as a member](/v2.0/organizations/members/add) of an organization.
+All users have unique authentication tokens with specific permissions used to grant them access to data within InfluxDB.
+
+The following articles walk through managing users.
+
+{{< children >}}
--- a/content/v2.0/users/create-user.md
+++ b/content/v2.0/users/create-user.md
@ -0,0 +1,34 @@
+---
+title: Create a user
+seotitle: Create a user in InfluxDB
+description: Create a user in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Create a user
+    parent: Manage users
+    weight: 1
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to create a user.
+
+## Create a user in the InfluxDB UI
+
+{{% note %}}
+While in alpha, additional users cannot be created in the InfluxDB UI.
+{{% /note %}}
+
+## Create a user using the influx CLI
+
+Use the [`influx user create` command](/v2.0/reference/cli/influx/create/create)
+to create a new user. A new user requires the following:
+
+- A username
+
+```sh
+# Pattern
+influx user create -n <username>
+
+# Example
+influx user create -n johndoe
+```
--- a/content/v2.0/users/delete-user.md
+++ b/content/v2.0/users/delete-user.md
@ -0,0 +1,34 @@
+---
+title: Delete a user
+seotitle: Delete a user from InfluxDB
+description: Delete a user from InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Delete a user
+    parent: Manage users
+    weight: 3
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to create a user.
+
+## Delete a user from the InfluxDB UI
+
+{{% note %}}
+While in alpha, users cannot be deleted from the InfluxDB UI.
+{{% /note %}}
+
+## Delete a user using the influx CLI
+
+Use the [`influx user delete` command](/v2.0/reference/cli/influx/user/delete)
+to delete a user. Deleting a user requires the following:
+
+- The user ID _(provided in the output of `influx user find`)_
+
+```sh
+# Pattern
+influx user delete -i <user-id>
+
+# Example
+influx user delete -i 034ad714fdd6f000
+```
--- a/content/v2.0/users/tokens/_index.md
+++ b/content/v2.0/users/tokens/_index.md
@ -0,0 +1,17 @@
+---
+title: Manage tokens
+seotitle: Manage tokens in InfluxDB
+description: Manage authentication tokens in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Manage tokens
+    parent: Manage users
+    weight: 5
+---
+
+InfluxDB ensures secure interaction between users and data through the use of **authentication tokens**.
+Every user has a unique token.
+
+The following articles provide information about managing authentication tokens.
+
+{{< children >}}
--- a/content/v2.0/users/tokens/create-token.md
+++ b/content/v2.0/users/tokens/create-token.md
@ -0,0 +1,37 @@
+---
+title: Create a token
+seotitle: Create an authentication token in InfluxDB
+description: Create an authentication token in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Create a token
+    parent: Manage tokens
+    weight: 1
+draft: true
+---
+
+**To view tokens**:
+
+1. Click the ?? icon in the navigation bar.
+2. In the right panel labeled **My Settings**, click **Tokens**. All of your account's tokens appear.
+3. Click on a token name from the list to view the token and a summary of access permissions.
+<<SCREENSHOT>>
+
+**To copy a token**:
+
+* From the token detail view, click **Copy**.
+
+**To delete a token**:
+
+* Hover over the name of a token in the list, then click **Delete**.
+
+
+#### Tokens (/tokens)
+
+* Table with Description, Last Used, and Organization columns
+    * Click on token name in Description column for Edit Token overlay
+        * Unlikely that user will use it, mostly in case of emergency
+    * Click on org name in Organization column to open organization page
+* Generate token upper right
+    * Opens generate token overlay (tgo!)
+    * Also very unlikely that user will manually generate a token
--- a/content/v2.0/users/tokens/view-tokens.md
+++ b/content/v2.0/users/tokens/view-tokens.md
@ -0,0 +1,32 @@
+---
+title: View tokens
+seotitle: View authentication tokens in InfluxDB
+description: View authentication tokens in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: View tokens
+    parent: Manage tokens
+    weight: 2
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to view tokens.
+
+## View tokens in the InfluxDB UI
+
+1. Click the **Influx** icon in the navigation bar.
+2. In the right panel labeled **My Settings**, click **Tokens**. All of your account's tokens appear.
+3. Click on a token name from the list to view the token and a summary of access permissions.
+
+## View tokens using the influx CLI
+
+Use the [`influx auth find` command](/v2.0/reference/cli/influx/auth/find)
+to view tokens.
+
+```sh
+influx auth find
+```
+
+Filtering options such as filtering by authorization ID, username, or user ID are available.
+See the [`influx auth find` documentation](/v2.0/reference/cli/influx/auth/find)
+for information about other available flags.
--- a/content/v2.0/users/update-user.md
+++ b/content/v2.0/users/update-user.md
@ -0,0 +1,35 @@
+---
+title: Update a user
+seotitle: Update a user in InfluxDB
+description: Update a user in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: Update a user
+    parent: Manage users
+    weight: 3
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to update a user.
+
+## Update a user in the InfluxDB UI
+
+{{% note %}}
+While in alpha, user information cannot be updated in the InfluxDB UI.
+{{% /note %}}
+
+## Update a user using the influx CLI
+
+Use the [`influx user update` command](/v2.0/reference/cli/influx/user/update)
+to update a user. Updating a user requires the following:
+
+- The user ID _(provided in the output of `influx user find`)_
+
+##### Update the name of a user
+```sh
+# Pattern
+influx user update -i <user-id> -n <new-username>
+
+# Example
+influx user update -i 034ad714fdd6f000 -n janedoe
+```
--- a/content/v2.0/users/view-users.md
+++ b/content/v2.0/users/view-users.md
@ -0,0 +1,32 @@
+---
+title: View users
+seotitle: View users in InfluxDB
+description: Review a list of users in InfluxDB using the InfluxDB UI or the influx CLI.
+menu:
+  v2_0:
+    name: View users
+    parent: Manage users
+    weight: 2
+---
+
+Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
+to view users.
+
+## View users in the InfluxDB UI
+
+{{% note %}}
+While in alpha, there is no list of users in the InfluxDB UI.
+{{% /note %}}
+
+## View users using the influx CLI
+
+Use the [`influx user find` command](/v2.0/reference/cli/influx/user/find)
+to view users.
+
+```sh
+influx user find
+```
+
+Filtering options such as filtering by username or ID are available.
+See the [`influx user find` documentation](/v2.0/reference/cli/influx/user/find)
+for information about other available flags.
--- a/content/v2.0/visualize-data/_index.md
+++ b/content/v2.0/visualize-data/_index.md
@ -0,0 +1,31 @@
+---
+title: Visualize data with InfluxDB
+description: >
+  InfluxDB offers a complete dashboard solution for visualizing your time series data.
+  Create custom dashboards with flexible queries and visualization types.
+menu:
+  v2_0:
+    name: Visualize data
+    weight: 4
+---
+
+The InfluxDB user interface (UI) provides tools for building custom dashboards to visualize your data.
+The following articles outline ways to customize and manage dashboards.
+
+## InfluxDB UI home page
+* A jumping off point for everything the user has access to
+    * List of all dashboards they have access to
+    * List of all orgs they belong to
+    * List of all tasks they have access to
+* Contains links to support related items:
+    * Technical documentation
+    * Community forum
+    * Report a bug
+    * Request a feature
+    * Version info
+    * Last commit
+* Contains links to docs
+* Manage my plan: A place to get notifications from Quartz
+* A place to learn about new features and updates in each version
+
+{{< children >}}
--- a/content/v2.0/visualize-data/dashboards.md
+++ b/content/v2.0/visualize-data/dashboards.md
@ -1,15 +1,17 @@
 ---
-title: Managing dashboards
-description: This is just an example post to show the format of new 2.0 posts
+title: Manage InfluxDB dashboards
+description: Create, edit, and manage custom dashboards in the InfluxDB user interface (UI).
 menu:
  v2_0:
-    name: Managing dashboards
+    name: Manage dashboards
+    parent: Visualize data
    weight: 1
-    parent: Placeholder parent
 ---

 Create, edit, and manage dashboards from the **Dashboards** tab in the left navigation.

+{{< img-hd src="/img/dashboards-icon.png" title="Dashboard icon" />}}
+
 Variable names changed--instead of dashboard time, it's time range start/time range end (double-check).
 Window interval replaces interval
 Save as somewhere--same as send to dashboard
@ -17,7 +19,7 @@ Also save as dashboard/save as tasks
 Multiple tabs, hide/show tabs, rename tabs


-## Creating dashboards
+## Create a dashboard

 **To create a dashboard**:

@ -25,32 +27,33 @@ Multiple tabs, hide/show tabs, rename tabs
 2. Click the **+Create Dashboard** button in the upper right.
 3. Enter a name for your dashboard in the **Name this dashboard** field in the upper left.

-**To add data to your dashboard**:
+#### Add data to your dashboard

 1. From your dashboard, click **Add Cell** in the upper right. The Data Explorer overlay opens.
-2. Create a query in the Data Explorer following the instructions in <<link to data explorer article>>.
+2. Create a query in the Data Explorer following the instructions in [Exlpore metrics](/v2.0/visualize-data/explore-metrics).
 3. Enter a name for your cell in the upper left.
 4. Click the checkmark icon to save the cell to your dashboard.

 You can also send data to your dashboard directly from the Data Explorer. For details, see <<link to data explorer article>>.

-**To add a note to your dashboard**:
+#### Add a note to your dashboard
 1. From your dashboard, click **Add Note** in the upper right.
 2. Enter your note in the window that appears. You can use Markdown syntax to format your note.
 3. To preview your Markdown formatting, click the **Preview** option.
 4. Click **Save**.


-## Modifying dashboards
+## Modify a dashboard

- **To delete a dashboard**:
- 1. Hover over the dashboard name in the list of dashboards to show options.
- 2. Click **Delete**.
- <<SCREENSHOT>>
- 3. Click **Confirm** to continue deleting your dashboard.
+#### Delete a dashboard
+1. Hover over the dashboard name in the list of dashboards to show options.
+2. Click **Delete**.    
+3. Click **Confirm** to continue deleting your dashboard.

-**To clone a dashboard**:
-* Hover over the dashbaord name in the list of dashboard to show options.
-* Click **Clone**.
-<<SCREEENSHOT>>
- The cloned dashboard opens.
+    ![Delete a dashboard](/img/dashboard-delete.png)
+
+#### Clone a dashboard
+1. Hover over the dashbaord name in the list of dashboard to show options.
+2. Click **Clone**. The cloned dashboard opens.
+
+    ![Clone a dashboard](/img/dashboard-clone.png)
--- a/content/v2.0/visualize-data/explore-metrics.md
+++ b/content/v2.0/visualize-data/explore-metrics.md
@ -0,0 +1,54 @@
+---
+title: Explore metrics with InfluxDB
+description: >
+  Explore and visualize your data in InfluxDB's Data Explorer.
+  The InfluxDB user interface (UI) allows you to move seamlessly between using the
+  Flux builder and manually editing the query.
+menu:
+  v2_0:
+    name: Explore metrics
+    parent: Visualize data
+    weight: 1
+---
+
+Explore and visualize your data in the **Data Explorer**.
+The InfluxDB user interface (UI) allows you to move seamlessly between using the
+Flux builder or templates and manually editing the query.
+Choose between [visualization types](/v2.0/visualize-data/visualization-types/) for your query.
+
+To open the **Data Explorer**, click the **Data Explorer** icon in the navigation bar:
+
+{{< img-hd src="/img/data-explorer-icon.png" title="Data Explorer icon" />}}
+
+## Explore data with Flux
+
+Flux is InfluxData's functional data scripting language designed for querying,
+analyzing, and acting on time series data.
+See [Get started with Flux](/v2.0/query-data/get-started) to learn more about Flux.
+
+1. Click the **Data Explorer** icon in the sidebar.
+2. Use the Flux builder in the bottom panel to select a bucket and filters such as measurement, field or tag.
+   Alternatively, click **Script Editor** to manually edit the query.
+   To switch back to the query builder, click **Query Builder**.
+3. Use the **Functions** list to review the available Flux functions.
+   Click on a function from the list to add it to your query.
+4. Click **Submit** to run your query. You can then preview your graph in the above pane.
+
+## Visualize your query
+To visualize your query:
+
+1. Select a visualization type from the dropdown menu in the upper-left.
+
+    {{< img-hd src="/img/visualization-dropdown.png" title="Visualization dropdown" />}}
+
+2. Select the **Visualization** tab at the bottom of the **Data Explorer**.
+   For details about all of the available visualization options, see
+   [Visualization types](/v2.0/visualize-data/visualization-types/).
+
+## Save your query as a dashboard cell or task
+
+**To save your query**:
+
+1. Click **Save as** in the upper right.
+2. Click **Dashboard Cell** to add your query to a dashboard.
+3. Click **Task** to save your query as a task.
--- a/content/v2.0/visualize-data/labels.md
+++ b/content/v2.0/visualize-data/labels.md
@ -0,0 +1,43 @@
+---
+title: Manage labels in the InfluxDB UI
+description: >
+  Labels are a way to add visual metadata to dashboards, tasks, and other items
+  in the InfluxDB UI. View and manage labels in the InfluxDB user interface.
+menu:
+  v2_0:
+    name: Manage labels
+    parent: Visualize data
+    weight: 1
+---
+
+Labels are a way to add visual metadata to dashboards, tasks, and other items in the InfluxDB UI.
+To manage labels, click the **Configuration** icon in the navigation bar and select **Labels**.
+
+{{< img-hd src="/img/labels-nav-link.png" title="Labels configuration" />}}
+
+#### Create a label
+1. Click **+ Create Label**.
+2. Enter a **Name** for the label.
+3. Select a **Color** for the lable.
+4. Enter a description for the label _(Optional)_.
+5. Click **Create label**.
+
+#### Edit a label
+1. In the label list view, click the name of the label you would like to edit.
+   The **Edit Label** overlay will appear.
+2. Make the desired changes to the label.
+3. Click **Save Changes**.
+
+#### Delete a label
+1. In the label list view, hover over the label you would like to delete.
+2. Click **Delete** in the far right of the label row.
+
+### Add labels to dashboards and tasks
+1. In the list view of dashboards or tasks, hover over the item to which you would like to add a label.
+2. Click the
+   <span class="icon-plus" style="color:#fff;background:#22adf6;border-radius:50%;padding:.07rem .1rem;margin:0 .25rem;display: inline-block;width: 20px;height: 20px;"></span>
+   icon that appears to the right of the name.
+   The **Manage Labels** overlay will appear.
+3. Type the name of the label you would like to add to filter the list of available labels.
+   Click the label you would like to add. More than one label can be added.
+4. Click **Save Changes**.
--- a/content/v2.0/visualize-data/sources.md
+++ b/content/v2.0/visualize-data/sources.md
@ -0,0 +1,31 @@
+---
+title: Manage sources
+description: InfluxDB offers a complete dashboard solution for visualizing your data and monitoring your infrastructure.
+menu:
+  v2_0:
+    name: Manage sources
+    parent: Visualize data
+    weight: 1
+---
+
+Like dashboards and buckets, data sources are scoped by organization. When you first access the user interface, you'll be prompted to add a data source. You can also do so anytime using the steps below.
+
+
+**To add data to a bucket**:
+1. Click in the **Organizations** icon in the navigation bar.
+2. Select the **Buckets** tab.
+3. Next to the name of a bucket, click **Add Data**.
+4. Select **Streaming**, **Line Protocol**, or **Scraping** from the data source options.
+5. Click **Continue**.
+6. Follow the prompts add your data source.
+
+**To manage Telegraf configurations**:
+1. 1. Click in the **Organizations** icon in the navigation bar.
+2. Select the **Telegraf** tab. A list of existing Telegraf configurations appears.
+3. To add a new Telegraf configuration:
+  * Click **Create Configuration** in the upper right.
+  * Select the Telegraf plugins you want to use to collect data.
+  * Click **Continue**.
+  * Follow the instructions on the **Listen for Streaming Data** page that appears to complete your configuration.
+4. To delete a Telegraf configuration, hover over its name in the list and click **Delete**.
+5. To view details of a Telegraf configuration, hover over its name in the list and click **Download Config**.
--- a/content/v2.0/visualize-data/visualization-types.md
+++ b/content/v2.0/visualize-data/visualization-types.md
@ -1,15 +1,20 @@
 ---
 title: Visualization types
-description: This is just an example post to show the format of new 2.0 posts
+description: >
+  InfluxDB dashboards support multiple visualization types including line graphs,
+  gauges, tables, and more.
 menu:
  v2_0:
    name: Visualization types
+    parent: Visualize data
    weight: 1
-    parent: Placeholder parent
 ---
-Chronograf's dashboard views support the following visualization types, which can be selected in the **Visualization Type** selection view of the <<link to data explorer article>>.

-[Visualization Type selector](/img/chronograf/chrono-viz-types-selector.png)
+The InfluxDB's user interface's (UI) dashboard views support the following visualization types,
+which can be selected in the **Visualization Type** selection view of the
+[Data Explorer](/v2.0/visualize-data/explore-metrices).
+
+[Visualization Type selector](/img/chrono-viz-types-selector.png)

 Each of the available visualization types and available user controls are described below.

@ -22,7 +27,6 @@ Each of the available visualization types and available user controls are descri
 * [Gauge](#gauge)
 * [Table](#table)

-For information on adding and displaying annotations in graph views, see [Adding annotations to Chronograf views](/chronograf/v1.7/guides/annotations/).

 ### Graphs

@ -32,11 +36,11 @@ There are several types of graphs you can create.

 The **Line Graph** view displays a time series in a line graph.

-![Line Graph selector](/img/chronograf/chrono-viz-line-graph-selector.png)
+![Line Graph selector](/img/chrono-viz-line-graph-selector.png)

 ##### Line Graph Controls

-![Line Graph Controls](/img/chronograf/chrono-viz-line-graph-controls.png)
+![Line Graph Controls](/img/chrono-viz-line-graph-controls.png)

 Use the **Line Graph Controls** to specify the following:

@ -55,18 +59,18 @@ Use the **Line Graph Controls** to specify the following:

 ##### Line Graph example

-![Line Graph example](/img/chronograf/chrono-viz-line-graph-example.png)
+![Line Graph example](/img/chrono-viz-line-graph-example.png)


 #### Stacked Graph

 The **Stacked Graph** view displays multiple time series bars as segments stacked on top of each other.

-![Stacked Graph selector](/img/chronograf/chrono-viz-stacked-graph-selector.png)
+![Stacked Graph selector](/img/chrono-viz-stacked-graph-selector.png)

 ##### Stacked Graph Controls

-![Stacked Graph Controls](/img/chronograf/chrono-viz-stacked-graph-controls.png)
+![Stacked Graph Controls](/img/chrono-viz-stacked-graph-controls.png)

 Use the **Stacked Graph Controls** to specify the following:

@ -85,18 +89,18 @@ Use the **Stacked Graph Controls** to specify the following:

 ##### Stacked Graph example

-![Stacked Graph example](/img/chronograf/chrono-viz-stacked-graph-example.png)
+![Stacked Graph example](/img/chrono-viz-stacked-graph-example.png)


 ### Step Graph

 The **Step-Plot Graph** view displays a time series in a staircase graph.

-![Step-Plot Graph selector](/img/chronograf/chrono-viz-step-plot-graph-selector.png)
+![Step-Plot Graph selector](/img/chrono-viz-step-plot-graph-selector.png)

 #### Step Graph Controls

-![Step-Plot Graph Controls](/img/chronograf/chrono-viz-step-plot-graph-controls.png)
+![Step-Plot Graph Controls](/img/chrono-viz-step-plot-graph-controls.png)

 Use the **Step-Plot Graph Controls** to specify the following:

@ -113,7 +117,7 @@ Use the **Step-Plot Graph Controls** to specify the following:

 #### Step-Plot Graph example

-![Step-Plot Graph example](/img/chronograf/chrono-viz-step-plot-graph-example.png)
+![Step-Plot Graph example](/img/chrono-viz-step-plot-graph-example.png)


 ### Bar Graph
@ -122,11 +126,11 @@ The **Bar Graph** view displays the specified time series using a bar chart.

 To select this view, click the Bar Graph selector icon.

-![Bar Graph selector](/img/chronograf/chrono-viz-bar-graph-selector.png)
+![Bar Graph selector](/img/chrono-viz-bar-graph-selector.png)

 #### Bar Graph Controls

-![Bar Graph Controls](/img/chronograf/chrono-viz-bar-graph-controls.png)
+![Bar Graph Controls](/img/chrono-viz-bar-graph-controls.png)

 Use the **Bar Graph Controls** to specify the following:

@ -143,7 +147,7 @@ Use the **Bar Graph Controls** to specify the following:

 #### Bar Graph example

-![Bar Graph example](/img/chronograf/chrono-viz-bar-graph-example.png)
+![Bar Graph example](/img/chrono-viz-bar-graph-example.png)


 ### Line Graph + Single Stat
@ -152,11 +156,11 @@ The **Line Graph + Single Stat** view displays the specified time series in a li

 To select this view, click the **Line Graph + Single Stat** view option.

-![Line Graph + Single Stat selector](/img/chronograf/chrono-viz-line-graph-single-stat-selector.png)
+![Line Graph + Single Stat selector](/img/chrono-viz-line-graph-single-stat-selector.png)

 #### Line Graph + Single Stat Controls

-![Line Graph + Single Stat Controls](/img/chronograf/chrono-viz-line-graph-single-stat-controls.png)
+![Line Graph + Single Stat Controls](/img/chrono-viz-line-graph-single-stat-controls.png)

 Use the **Line Graph + Single Stat Controls** to specify the following:

@ -173,13 +177,13 @@ Use the **Line Graph + Single Stat Controls** to specify the following:

 #### Line Graph + Single Stat example

-![Line Graph + Single Stat example](/img/chronograf/chrono-viz-line-graph-single-stat-example.png)
+![Line Graph + Single Stat example](/img/chrono-viz-line-graph-single-stat-example.png)

 ### Single Stat

 The **Single Stat** view displays the most recent value of the specified time series as a numerical value.

-![Single Stat view](/img/chronograf/chrono-viz-single-stat-selector.png)
+![Single Stat view](/img/chrono-viz-single-stat-selector.png)

 If a cell's query includes a [`GROUP BY` tag](/influxdb/latest/query_language/data_exploration/#group-by-tags) clause, Chronograf sorts the different [series](/influxdb/latest/concepts/glossary/#series) lexicographically and shows the most recent [field value](/influxdb/latest/concepts/glossary/#field-value) associated with the first series.
 For example, if a query groups by the `name` [tag key](/influxdb/latest/concepts/glossary/#tag-key) and `name` has two [tag values](/influxdb/latest/concepts/glossary/#tag-value) (`chronelda` and `chronz`), Chronograf shows the most recent field value associated with the `chronelda` series.
@ -205,11 +209,11 @@ The **Gauge** view displays the single value most recent value for a time series

 To select this view, click the Gauge selector icon.

-![Gauge selector](/img/chronograf/chrono-viz-gauge-selector.png)
+![Gauge selector](/img/chrono-viz-gauge-selector.png)

 #### Gauge Controls

-![Gauge Controls](/img/chronograf/chrono-viz-gauge-controls.png)
+![Gauge Controls](/img/chrono-viz-gauge-controls.png)

 Use the **Gauge Controls** to specify the following:

@ -223,17 +227,17 @@ Use the **Gauge Controls** to specify the following:

 #### Gauge example

-![Gauge example](/img/chronograf/chrono-viz-gauge-example.png)
+![Gauge example](/img/chrono-viz-gauge-example.png)

 ### Table

 The **Table** panel displays the results of queries in a tabular view, which is sometimes easier to analyze than graph views of data.

-![Table selector](/img/chronograf/chrono-viz-table-selector.png)
+![Table selector](/img/chrono-viz-table-selector.png)

 #### Table Controls

-![Table Controls](/img/chronograf/chrono-viz-table-controls.png)
+![Table Controls](/img/chrono-viz-table-controls.png)

 Use the **Table Controls** to specify the following:

@ -259,4 +263,4 @@ Threshold settings apply to any cells with values, except when they appear in th

 #### Table view example

-![Table example](/img/chronograf/chrono-viz-table-example.png)
+![Table example](/img/chrono-viz-table-example.png)
--- a/layouts/_default/version-landing.html
+++ b/layouts/_default/version-landing.html
@ -4,11 +4,30 @@
  {{ partial "sidebar.html" . }}
  <div class="content-wrapper">
    <div class="sidebar-toggle" onclick="toggle_sidebar('sidebar-open');return false;"><a href="#">&#59675;</a></div>
-    
+
    <div class="cards">
-      <div class="full">
-        <h1>{{ $.Page.Title }}</h1>
+      <div class="card full" id="get-started">
+        {{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) }}
+        <h1>InfluxDB {{ $currentVersion }} Documentation</h1>
        <a class="btn" href="get-started">Get Started</a>
+      </div>
+      <div class="group">
+
+        <a class="card quarter" href="collect-data">
+          <h3>Collect Data</h3>
+        </a>
+
+        <a class="card quarter"href="query-data">
+          <h3>Query Data</h3>
+        </a>
+
+        <a class="card quarter" href="visualize-data">
+          <h3>Visualize Data</h3>
+        </a>
+
+        <a class="card quarter" href="process-data">
+          <h3>Process Data</h3>
+        </a>

      </div>
    </div>
--- a/layouts/partials/article/latest-version.html
+++ b/layouts/partials/article/latest-version.html
@ -2,7 +2,7 @@
 {{ $latestVersion := $.Site.Data.versions.latest_version }}
 {{ $latestVersionURL := replaceRE "[^/]+.*?[0]" $latestVersion .RelPermalink }}
 {{ if not (eq $currentVersion $latestVersion) }}
-  <div class="warn">
+  <div class="warn old-version">
    <p>
      This page documents an earlier version of InfluxDB.
      View the latest version of this page in the <a href="{{ $latestVersionURL }}">InfluxDB {{ $latestVersion }}</a> documentation.
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -1,3 +1,20 @@
+  {{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) }}
+  <!-- Docsearch JS -->
+  <script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
+  <script>
+  docsearch({
+    apiKey: 'ba4435a9d456ac0d954cc276206eac06',
+    appId: 'WHM9UWMP6M',
+    indexName: 'influxdata',
+    inputSelector: '#algolia-search-input',
+    // Set debug to true if you want to inspect the dropdown
+    debug: true,
+    algoliaOptions: {
+    'facetFilters': ["version:{{ $currentVersion }}"]
+  },
+  });
+  </script>
+
  </body>
  {{ partial "footer/javascript.html" }}
 </html>
--- a/layouts/partials/footer/javascript.html
+++ b/layouts/partials/footer/javascript.html
@ -1,5 +1,6 @@
 {{ $versionSelector := resources.Get "js/version-selector.js" }}
 {{ $contentInteractions := resources.Get "js/content-interactions.js" }}
-{{ $footerjs := slice $versionSelector $contentInteractions | resources.Concat "js/footer.bundle.js" }}
+{{ $searchInteractions := resources.Get "js/search-interactions.js" }}
+{{ $footerjs := slice $versionSelector $contentInteractions $searchInteractions | resources.Concat "js/footer.bundle.js" }}

 <script type="text/javascript" src="{{ $footerjs.RelPermalink }}" ></script>
--- a/layouts/partials/header/stylesheets.html
+++ b/layouts/partials/header/stylesheets.html
@ -1,3 +1,6 @@
+<!-- Docsearch Styles -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
+
 {{ $cssOptionsDark := (dict "targetPath" "dark-theme.css" "outputStyle" "compressed" "enableSourceMap" true) }}
 {{ $cssOptionsLight := (dict "targetPath" "light-theme.css" "outputStyle" "compressed" "enableSourceMap" true) }}
 {{ $cssSidebarOpen := (dict "targetPath" "sidebar-open.css" "outputStyle" "compressed" "enableSourceMap" true) }}
--- a/layouts/sitemap.xml
+++ b/layouts/sitemap.xml
@ -0,0 +1,21 @@
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  {{ range .Data.Pages }}
+  <url>
+    <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
+    <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
+    <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
+    <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+  </url>
+  {{ end }}
+</urlset>
--- a/static/fonts/icomoon.eot
+++ b/static/fonts/icomoon.eot
--- a/static/fonts/icomoon.svg
+++ b/static/fonts/icomoon.svg
@ -36,6 +36,8 @@
 <glyph unicode="&#xe91a;" glyph-name="chevron-up" d="M797.867 328.534l-256 256c-17.067 17.067-42.667 17.067-59.733 0l-256-256c-17.067-17.067-17.067-42.667 0-59.733s42.667-17.067 59.733 0l226.133 226.133 226.133-226.133c8.533-8.533 21.333-12.8 29.867-12.8s21.333 4.267 29.867 12.8c17.067 17.067 17.067 42.667 0 59.733z" />
 <glyph unicode="&#xe91b;" glyph-name="menu" d="M896 469.334h-768c-25.6 0-42.667-17.067-42.667-42.667s17.067-42.667 42.667-42.667h768c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667zM128 640h768c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667h-768c-25.6 0-42.667-17.067-42.667-42.667s17.067-42.667 42.667-42.667zM896 213.334h-768c-25.6 0-42.667-17.067-42.667-42.667s17.067-42.667 42.667-42.667h768c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667z" />
 <glyph unicode="&#xe91c;" glyph-name="download" d="M896 341.334c-25.6 0-42.667-17.067-42.667-42.667v-170.667c0-25.6-17.067-42.667-42.667-42.667h-597.333c-25.6 0-42.667 17.067-42.667 42.667v170.667c0 25.6-17.067 42.667-42.667 42.667s-42.667-17.067-42.667-42.667v-170.667c0-72.533 55.467-128 128-128h597.333c72.533 0 128 55.467 128 128v170.667c0 25.6-17.067 42.667-42.667 42.667zM482.133 268.8c4.267-4.267 8.533-8.533 12.8-8.533 4.267-4.267 12.8-4.267 17.067-4.267s12.8 0 17.067 4.267c4.267 4.267 8.533 4.267 12.8 8.533l213.333 213.333c17.067 17.067 17.067 42.667 0 59.733s-42.667 17.067-59.733 0l-140.8-140.8v409.6c0 25.6-17.067 42.667-42.667 42.667s-42.667-17.067-42.667-42.667v-409.6l-140.8 140.8c-17.067 17.067-42.667 17.067-59.733 0s-17.067-42.667 0-59.733l213.333-213.333z" />
+<glyph unicode="&#xe91d;" glyph-name="minus" d="M810.667 469.334h-597.333c-25.6 0-42.667-17.067-42.667-42.667s17.067-42.667 42.667-42.667h597.333c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667z" />
+<glyph unicode="&#xe91e;" glyph-name="plus" d="M810.667 469.334h-256v256c0 25.6-17.067 42.667-42.667 42.667s-42.667-17.067-42.667-42.667v-256h-256c-25.6 0-42.667-17.067-42.667-42.667s17.067-42.667 42.667-42.667h256v-256c0-25.6 17.067-42.667 42.667-42.667s42.667 17.067 42.667 42.667v256h256c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667z" />
 <glyph unicode="&#xe934;" glyph-name="folder-upload" d="M576 704l-128 128h-448v-832h1024v704h-448zM512 480l224-224h-160v-256h-128v256h-160l224 224z" />
 <glyph unicode="&#xe94c;" glyph-name="map2" d="M672 768l-320 128-352-128v-768l352 128 320-128 352 128v768l-352-128zM384 814.27l256-102.4v-630.138l-256 102.398v630.14zM64 723.172l256 93.090v-631.8l-256-93.088v631.798zM960 172.828l-256-93.092v631.8l256 93.090v-631.798z" />
 <glyph unicode="&#xe994;" glyph-name="cog" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" />
--- a/static/fonts/icomoon.ttf
+++ b/static/fonts/icomoon.ttf
--- a/static/fonts/icomoon.woff
+++ b/static/fonts/icomoon.woff
--- a/static/img/coming-soon.svg
+++ b/static/img/coming-soon.svg
@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 300 100" style="enable-background:new 0 0 300 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#42434C;}
+	.st1{fill:#9295A0;}
+</style>
+<g>
+	<rect x="-1" y="-1" class="st0" width="302" height="102"/>
+</g>
+<g>
+	<path class="st1" d="M94.81,43.41h1.18l-1.64,9.33h-1.18L94.81,43.41z"/>
+	<path class="st1" d="M105.85,47.48c0.01-0.08,0.03-0.18,0.03-0.24c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.82,0.53-2.56,1.02
+		l-0.85,4.85h-1.15l0.92-5.25c0.01-0.08,0.03-0.18,0.03-0.24c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.74,0.5-2.58,1.02l-0.85,4.85
+		h-1.15L97.92,46l1.01-0.17l-0.08,0.97c0.67-0.48,2.07-1.02,2.89-1.02c0.77,0,1.15,0.39,1.2,1.02c0.74-0.52,2.07-1.02,2.89-1.02
+		c0.85,0,1.22,0.46,1.22,1.2c0,0.15-0.01,0.36-0.06,0.59l-0.91,5.17h-1.15L105.85,47.48z"/>
+	<path class="st1" d="M113.18,52.74h-0.95l0.04-0.83c-0.76,0.67-1.68,0.97-2.55,0.97c-1.05,0-1.44-0.57-1.44-1.36
+		c0-0.17,0.03-0.35,0.06-0.53l0.48-2.7c0.29-1.65,0.91-2.51,3.07-2.51c0.84,0,1.78,0.21,2.45,0.46L113.18,52.74z M113.06,46.94
+		c-0.36-0.1-0.84-0.17-1.32-0.17c-1.05,0-1.57,0.32-1.81,1.67l-0.43,2.47c-0.03,0.17-0.06,0.35-0.06,0.48c0,0.32,0.14,0.5,0.56,0.5
+		c0.85,0,1.61-0.48,2.4-1.19L113.06,46.94z"/>
+	<path class="st1" d="M120.24,53.77c-0.25,1.43-0.83,1.86-2.4,1.86c-0.9,0-2.1-0.28-2.8-0.57l0.24-0.87
+		c0.94,0.34,1.81,0.49,2.61,0.49c0.87,0,1.09-0.27,1.22-1l0.35-1.98c-0.76,0.6-1.64,0.88-2.51,0.88c-1.05,0-1.44-0.57-1.44-1.36
+		c0-0.17,0.03-0.35,0.06-0.53l0.43-2.4c0.29-1.65,0.97-2.54,3.12-2.54c0.66,0,1.71,0.18,2.44,0.49L120.24,53.77z M120.3,46.95
+		c-0.36-0.1-0.9-0.18-1.37-0.18c-1.13,0-1.57,0.35-1.81,1.69l-0.39,2.19c-0.03,0.17-0.06,0.32-0.06,0.45c0,0.32,0.14,0.5,0.56,0.5
+		c0.73,0,1.71-0.49,2.44-1.11L120.3,46.95z"/>
+	<path class="st1" d="M123.92,50.92c-0.03,0.15-0.03,0.25-0.03,0.31c0,0.43,0.21,0.69,0.94,0.69c0.71,0,1.57-0.27,2.49-0.71
+		l0.25,0.85c-0.87,0.48-1.76,0.83-2.9,0.83c-1.37,0-1.92-0.64-1.92-1.58c0-0.17,0.01-0.39,0.06-0.63l0.41-2.3
+		c0.31-1.72,1.08-2.59,3.01-2.59c1.13,0,1.95,0.53,1.95,1.54c0,1.15-0.53,1.72-2.45,2.37c-0.83,0.28-1.09,0.35-1.68,0.53
+		L123.92,50.92z M127.1,47.44c0-0.45-0.34-0.73-0.95-0.73c-1.06,0-1.55,0.39-1.75,1.5l-0.17,0.94c0.38-0.11,0.6-0.18,1.26-0.38
+		C126.62,48.44,127.1,48,127.1,47.44z"/>
+	<path class="st1" d="M132.28,50.72c0-0.21,0.03-0.43,0.07-0.69l0.71-4.05c0.35-1.95,1.36-2.72,3.61-2.72c0.71,0,1.61,0.1,2.33,0.29
+		l-0.24,1.01c-0.71-0.15-1.57-0.25-2.19-0.25c-1.53,0-2.12,0.42-2.37,1.82l-0.69,3.91c-0.04,0.22-0.06,0.42-0.06,0.59
+		c0,0.84,0.46,1.19,1.79,1.19c0.62,0,1.48-0.08,2.23-0.22l0.04,1.01c-0.73,0.15-1.72,0.27-2.51,0.27
+		C133.05,52.88,132.28,52.01,132.28,50.72z"/>
+	<path class="st1" d="M139.32,50.29l0.35-1.99c0.29-1.67,1.25-2.52,3.21-2.52c1.57,0,2.38,0.87,2.38,2.03c0,0.1,0,0.25-0.04,0.48
+		l-0.38,2.14c-0.27,1.54-1.08,2.45-3.19,2.45C139.7,52.88,139.05,51.76,139.32,50.29z M144.07,48.28c0.03-0.15,0.04-0.29,0.04-0.41
+		c0-0.74-0.43-1.11-1.4-1.11c-1.12,0-1.71,0.53-1.89,1.6l-0.35,1.97c-0.15,0.94,0.07,1.54,1.34,1.54c1.18,0,1.71-0.5,1.89-1.53
+		L144.07,48.28z"/>
+	<path class="st1" d="M155.44,47.48c0.01-0.08,0.03-0.18,0.03-0.24c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.82,0.53-2.56,1.02
+		l-0.85,4.85h-1.15l0.93-5.25c0.01-0.08,0.03-0.18,0.03-0.24c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.74,0.5-2.58,1.02l-0.85,4.85
+		h-1.15l1.19-6.74l1.01-0.17l-0.08,0.97c0.67-0.48,2.07-1.02,2.88-1.02c0.77,0,1.15,0.39,1.21,1.02c0.74-0.52,2.07-1.02,2.89-1.02
+		c0.85,0,1.22,0.46,1.22,1.2c0,0.15-0.01,0.36-0.06,0.59l-0.91,5.17h-1.15L155.44,47.48z"/>
+	<path class="st1" d="M159.02,46l1.18-0.17l-1.22,6.91h-1.15L159.02,46z M159.52,43.13l1.18-0.17l-0.31,1.75l-1.18,0.15
+		L159.52,43.13z"/>
+	<path class="st1" d="M167.43,46.98c0,0.15-0.01,0.36-0.06,0.59l-0.91,5.17h-1.15l0.92-5.25c0.01-0.08,0.03-0.18,0.03-0.24
+		c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.74,0.5-2.58,1.02l-0.85,4.85h-1.15L162.4,46l1.01-0.17l-0.09,0.97
+		c0.67-0.48,2.07-1.02,2.89-1.02C167.07,45.78,167.43,46.24,167.43,46.98z"/>
+	<path class="st1" d="M173.45,53.77c-0.25,1.43-0.83,1.86-2.39,1.86c-0.9,0-2.1-0.28-2.8-0.57l0.24-0.87
+		c0.94,0.34,1.81,0.49,2.61,0.49c0.87,0,1.09-0.27,1.22-1l0.35-1.98c-0.76,0.6-1.64,0.88-2.51,0.88c-1.05,0-1.44-0.57-1.44-1.36
+		c0-0.17,0.03-0.35,0.05-0.53l0.44-2.4c0.29-1.65,0.97-2.54,3.12-2.54c0.66,0,1.71,0.18,2.44,0.49L173.45,53.77z M173.51,46.95
+		c-0.37-0.1-0.9-0.18-1.37-0.18c-1.13,0-1.57,0.35-1.81,1.69l-0.39,2.19c-0.03,0.17-0.06,0.32-0.06,0.45c0,0.32,0.14,0.5,0.56,0.5
+		c0.73,0,1.71-0.49,2.44-1.11L173.51,46.95z"/>
+	<path class="st1" d="M178.71,52.36l0.27-0.94c0.87,0.27,1.72,0.43,2.52,0.43c1.5,0,1.89-0.41,2.09-1.53
+		c0.05-0.31,0.1-0.55,0.1-0.73c0-0.59-0.37-0.74-1.72-1.09c-1.62-0.42-2.12-0.94-2.12-1.92c0-0.28,0.04-0.59,0.1-0.94
+		c0.34-1.89,1.09-2.38,3.32-2.38c0.7,0,1.72,0.13,2.45,0.32l-0.21,0.99c-0.79-0.18-1.74-0.28-2.31-0.28c-1.58,0-1.88,0.25-2.07,1.37
+		c-0.05,0.32-0.1,0.6-0.1,0.77c0,0.59,0.35,0.76,1.64,1.11c1.72,0.46,2.21,0.91,2.21,1.83c0,0.24-0.04,0.59-0.11,0.95
+		c-0.29,1.69-0.84,2.54-3.38,2.54C180.59,52.88,179.5,52.68,178.71,52.36z"/>
+	<path class="st1" d="M186.44,50.29l0.35-1.99c0.29-1.67,1.25-2.52,3.21-2.52c1.57,0,2.38,0.87,2.38,2.03c0,0.1,0,0.25-0.04,0.48
+		l-0.38,2.14c-0.27,1.54-1.08,2.45-3.19,2.45C186.82,52.88,186.18,51.76,186.44,50.29z M191.19,48.28c0.03-0.15,0.04-0.29,0.04-0.41
+		c0-0.74-0.43-1.11-1.4-1.11c-1.12,0-1.71,0.53-1.89,1.6l-0.35,1.97c-0.15,0.94,0.07,1.54,1.35,1.54c1.18,0,1.71-0.5,1.89-1.53
+		L191.19,48.28z"/>
+	<path class="st1" d="M193.53,50.29l0.35-1.99c0.29-1.67,1.25-2.52,3.21-2.52c1.57,0,2.38,0.87,2.38,2.03c0,0.1,0,0.25-0.04,0.48
+		l-0.38,2.14c-0.27,1.54-1.08,2.45-3.19,2.45C193.9,52.88,193.26,51.76,193.53,50.29z M198.28,48.28c0.03-0.15,0.04-0.29,0.04-0.41
+		c0-0.74-0.43-1.11-1.4-1.11c-1.12,0-1.71,0.53-1.89,1.6l-0.35,1.97c-0.15,0.94,0.07,1.54,1.35,1.54c1.18,0,1.71-0.5,1.89-1.53
+		L198.28,48.28z"/>
+	<path class="st1" d="M206.75,46.98c0,0.15-0.02,0.36-0.06,0.59l-0.91,5.17h-1.15l0.92-5.25c0.01-0.08,0.03-0.18,0.03-0.24
+		c0-0.28-0.14-0.38-0.48-0.38c-0.69,0-1.74,0.5-2.58,1.02l-0.86,4.85h-1.15l1.19-6.74l1.01-0.17l-0.08,0.97
+		c0.67-0.48,2.07-1.02,2.89-1.02C206.38,45.78,206.75,46.24,206.75,46.98z"/>
+</g>
+</svg>
--- a/static/img/configuration-icon-profile.png
+++ b/static/img/configuration-icon-profile.png
--- a/static/img/dashboard-clone.png
+++ b/static/img/dashboard-clone.png
--- a/static/img/dashboard-delete.png
+++ b/static/img/dashboard-delete.png
--- a/static/img/dashboards-icon.png
+++ b/static/img/dashboards-icon.png
--- a/static/img/data-explorer-icon.png
+++ b/static/img/data-explorer-icon.png
--- a/static/img/data-explorer-save-as-task.png
+++ b/static/img/data-explorer-save-as-task.png
--- a/static/img/data-explorer-ui.png
+++ b/static/img/data-explorer-ui.png
--- a/static/img/labels-nav-link.png
+++ b/static/img/labels-nav-link.png
--- a/static/img/organizations-icon.png
+++ b/static/img/organizations-icon.png
--- a/static/img/tasks-create-edit.png
+++ b/static/img/tasks-create-edit.png
--- a/static/img/tasks-icon.png
+++ b/static/img/tasks-icon.png
--- a/static/img/visualization-dropdown.png
+++ b/static/img/visualization-dropdown.png