diff --git a/content/influxdb/v1.7/about_the_project/releasenotes-changelog.md b/content/influxdb/v1.7/about_the_project/releasenotes-changelog.md
index 58b636049..cd0989c73 100644
--- a/content/influxdb/v1.7/about_the_project/releasenotes-changelog.md
+++ b/content/influxdb/v1.7/about_the_project/releasenotes-changelog.md
@@ -5,6 +5,7 @@ menu:
     name: Release notes
     weight: 10
     parent: About the project
+v2: /influxdb/v2.0/reference/release-notes/influxdb/
 ---
 
 ## v1.7.10 [2020-02-07]
diff --git a/content/influxdb/v1.7/administration/authentication_and_authorization.md b/content/influxdb/v1.7/administration/authentication_and_authorization.md
index a0d577498..6257b1ee6 100644
--- a/content/influxdb/v1.7/administration/authentication_and_authorization.md
+++ b/content/influxdb/v1.7/administration/authentication_and_authorization.md
@@ -7,6 +7,7 @@ menu:
     name: Authentication and authorization
     weight: 20
     parent: Administration
+v2: /influxdb/v2.0/security/tokens/
 ---
 
 This document covers setting up and managing authentication and authorization in InfluxDB.
@@ -32,7 +33,7 @@ This document covers setting up and managing authentication and authorization in
 
 > **Note:** Authentication and authorization should not be relied upon to prevent access and protect data from malicious actors.
 If additional security or compliance features are desired, InfluxDB should be run behind a third-party service.  If InfluxDB
-is being deployed on a publicly accessible endpoint, we strongly recommend authentication be enabled. Otherwise the data will 
+is being deployed on a publicly accessible endpoint, we strongly recommend authentication be enabled. Otherwise the data will
 be publicly available to any unauthenticated user.
 
 ## Authentication
diff --git a/content/influxdb/v1.7/administration/backup_and_restore.md b/content/influxdb/v1.7/administration/backup_and_restore.md
index c4a728b3b..b8964882b 100644
--- a/content/influxdb/v1.7/administration/backup_and_restore.md
+++ b/content/influxdb/v1.7/administration/backup_and_restore.md
@@ -8,6 +8,7 @@ menu:
     name: Backing up and restoring
     weight: 60
     parent: Administration
+v2: /influxdb/v2.0/backup-restore/
 ---
 
 ## Overview
diff --git a/content/influxdb/v1.7/administration/config.md b/content/influxdb/v1.7/administration/config.md
index 443f53c10..0e61ff740 100644
--- a/content/influxdb/v1.7/administration/config.md
+++ b/content/influxdb/v1.7/administration/config.md
@@ -5,6 +5,7 @@ menu:
     name: Configuring InfluxDB
     weight: 10
     parent: Administration
+v2: /influxdb/v2.0/reference/config-options/
 ---
 
 The InfluxDB open source (OSS) configuration file contains configuration settings specific to a local node.
diff --git a/content/influxdb/v1.7/administration/https_setup.md b/content/influxdb/v1.7/administration/https_setup.md
index 29edefe00..4f90b3ab5 100644
--- a/content/influxdb/v1.7/administration/https_setup.md
+++ b/content/influxdb/v1.7/administration/https_setup.md
@@ -6,6 +6,7 @@ menu:
     name: Enabling HTTPS
     weight: 30
     parent: Administration
+v2: /influxdb/v2.0/security/enable-tls/
 ---
 
 Enable TLS to encrypt communication between clients and the InfluxDB server.
diff --git a/content/influxdb/v1.7/administration/security.md b/content/influxdb/v1.7/administration/security.md
index d4d0de8dc..3fec37bb2 100644
--- a/content/influxdb/v1.7/administration/security.md
+++ b/content/influxdb/v1.7/administration/security.md
@@ -5,6 +5,7 @@ menu:
     name: Managing security
     weight: 70
     parent: Administration
+v2: /influxdb/v2.0/security/
 ---
 
 Some customers may choose to install InfluxDB with public internet access, however
diff --git a/content/influxdb/v1.7/concepts/_index.md b/content/influxdb/v1.7/concepts/_index.md
index 5404a3511..cd6898c47 100644
--- a/content/influxdb/v1.7/concepts/_index.md
+++ b/content/influxdb/v1.7/concepts/_index.md
@@ -4,7 +4,7 @@ menu:
   influxdb_1_7:
     name: Concepts
     weight: 30
-
+v2: /influxdb/v2.0/reference/key-concepts/
 ---
 
 Understanding the following concepts will help you get the most out of InfluxDB.
diff --git a/content/influxdb/v1.7/concepts/glossary.md b/content/influxdb/v1.7/concepts/glossary.md
index 8ba1b83a1..b8263aa42 100644
--- a/content/influxdb/v1.7/concepts/glossary.md
+++ b/content/influxdb/v1.7/concepts/glossary.md
@@ -5,6 +5,8 @@ menu:
     name: Glossary
     weight: 20
     parent: Concepts
+canonical: /{{< latest "influxdb" "v2" >}}/reference/glossary/
+v2: /influxdb/v2.0/reference/glossary/
 ---
 
 ## aggregation
diff --git a/content/influxdb/v1.7/concepts/insights_tradeoffs.md b/content/influxdb/v1.7/concepts/insights_tradeoffs.md
index a9260300e..ec734b94e 100644
--- a/content/influxdb/v1.7/concepts/insights_tradeoffs.md
+++ b/content/influxdb/v1.7/concepts/insights_tradeoffs.md
@@ -5,6 +5,7 @@ menu:
     name: InfluxDB design insights and tradeoffs
     weight: 40
     parent: Concepts
+v2: /influxdb/v2.0/reference/key-concepts/design-principles/
 ---
 
 InfluxDB is a time series database.
diff --git a/content/influxdb/v1.7/concepts/key_concepts.md b/content/influxdb/v1.7/concepts/key_concepts.md
index eb7c1949b..9af8e71c5 100644
--- a/content/influxdb/v1.7/concepts/key_concepts.md
+++ b/content/influxdb/v1.7/concepts/key_concepts.md
@@ -6,6 +6,7 @@ menu:
     name: Key concepts
     weight: 10
     parent: Concepts
+v2: /influxdb/v2.0/reference/key-concepts/
 ---
 
 Before diving into InfluxDB it's good to get acquainted with some of the key concepts of the database.
diff --git a/content/influxdb/v1.7/concepts/storage_engine.md b/content/influxdb/v1.7/concepts/storage_engine.md
index 5556eb09d..b3fe1e8f0 100644
--- a/content/influxdb/v1.7/concepts/storage_engine.md
+++ b/content/influxdb/v1.7/concepts/storage_engine.md
@@ -6,6 +6,7 @@ menu:
     name: In-memory indexing with TSM
     weight: 60
     parent: Concepts
+v2: /influxdb/v2.0/reference/internals/storage-engine/
 ---
 
 ## The InfluxDB storage engine and the Time-Structured Merge Tree (TSM)
diff --git a/content/influxdb/v1.7/flux/_index.md b/content/influxdb/v1.7/flux/_index.md
index 88bb1f370..6bb97b888 100644
--- a/content/influxdb/v1.7/flux/_index.md
+++ b/content/influxdb/v1.7/flux/_index.md
@@ -6,6 +6,7 @@ menu:
   influxdb_1_7:
     name: Flux
     weight: 80
+v2: /influxdb/v2.0/query-data/get-started/
 ---
 
 Flux is a functional data scripting language designed for querying, analyzing, and acting on time series data.
diff --git a/content/influxdb/v1.7/flux/get-started/_index.md b/content/influxdb/v1.7/flux/get-started/_index.md
index 41c2b51f5..20e01d06b 100644
--- a/content/influxdb/v1.7/flux/get-started/_index.md
+++ b/content/influxdb/v1.7/flux/get-started/_index.md
@@ -11,6 +11,8 @@ menu:
     weight: 2
 aliases:
   - /influxdb/v1.7/flux/getting-started/
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/get-started/
+v2: /influxdb/v2.0/query-data/get-started/
 ---
 
 Flux is InfluxData's new functional data scripting language designed for querying,
diff --git a/content/influxdb/v1.7/flux/get-started/query-influxdb.md b/content/influxdb/v1.7/flux/get-started/query-influxdb.md
index e029189ce..d5aa5236e 100644
--- a/content/influxdb/v1.7/flux/get-started/query-influxdb.md
+++ b/content/influxdb/v1.7/flux/get-started/query-influxdb.md
@@ -8,6 +8,8 @@ menu:
     weight: 1
 aliases:
   - /influxdb/v1.7/flux/getting-started/query-influxdb/
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/get-started/query-influxdb/
+v2: /influxdb/v2.0/query-data/get-started/query-influxdb/
 ---
 
 This guide walks through the basics of using Flux to query data from InfluxDB.
diff --git a/content/influxdb/v1.7/flux/get-started/syntax-basics.md b/content/influxdb/v1.7/flux/get-started/syntax-basics.md
index 2b625b44a..1aa95a235 100644
--- a/content/influxdb/v1.7/flux/get-started/syntax-basics.md
+++ b/content/influxdb/v1.7/flux/get-started/syntax-basics.md
@@ -8,6 +8,8 @@ menu:
     weight: 3
 aliases:
   - /influxdb/v1.7/flux/getting-started/syntax-basics/
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/get-started/syntax-basics/
+v2: /influxdb/v2.0/query-data/get-started/syntax-basics/
 ---
 
 
diff --git a/content/influxdb/v1.7/flux/get-started/transform-data.md b/content/influxdb/v1.7/flux/get-started/transform-data.md
index 7c0e0b3d6..f56f11c15 100644
--- a/content/influxdb/v1.7/flux/get-started/transform-data.md
+++ b/content/influxdb/v1.7/flux/get-started/transform-data.md
@@ -8,6 +8,8 @@ menu:
     weight: 2
 aliases:
   - /influxdb/v1.7/flux/getting-started/transform-data/
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/get-started/transform-data/
+v2: /influxdb/v2.0/query-data/get-started/transform-data/
 ---
 
 When [querying data from InfluxDB](/influxdb/v1.7/flux/get-started/query-influxdb),
diff --git a/content/influxdb/v1.7/flux/guides/_index.md b/content/influxdb/v1.7/flux/guides/_index.md
index 965cafaf7..713b141fe 100644
--- a/content/influxdb/v1.7/flux/guides/_index.md
+++ b/content/influxdb/v1.7/flux/guides/_index.md
@@ -6,6 +6,8 @@ menu:
   influxdb_1_7:
     name: Query with Flux
     parent: Flux
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/
+v2: /influxdb/v2.0/query-data/flux/
 ---
 
 The following guides walk through both common and complex queries and use cases for Flux.
diff --git a/content/influxdb/v1.7/flux/guides/calculate-percentages.md b/content/influxdb/v1.7/flux/guides/calculate-percentages.md
index 9db9b7d3f..8233feef2 100644
--- a/content/influxdb/v1.7/flux/guides/calculate-percentages.md
+++ b/content/influxdb/v1.7/flux/guides/calculate-percentages.md
@@ -9,6 +9,8 @@ menu:
     parent: Query with Flux
 weight: 6
 list_query_example: percentages
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/calculate-percentages/
+v2: /influxdb/v2.0/query-data/flux/calculate-percentages/
 ---
 
 Calculating percentages from queried data is a common use case for time series data.
diff --git a/content/influxdb/v1.7/flux/guides/conditional-logic.md b/content/influxdb/v1.7/flux/guides/conditional-logic.md
index fef58a079..1faa4e94d 100644
--- a/content/influxdb/v1.7/flux/guides/conditional-logic.md
+++ b/content/influxdb/v1.7/flux/guides/conditional-logic.md
@@ -10,6 +10,8 @@ menu:
     name: Conditional logic
     parent: Query with Flux
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/conditional-logic/
+v2: /influxdb/v2.0/query-data/flux/conditional-logic/
 list_code_example: |
   ```js
   if color == "green" then "008000" else "ffffff"
diff --git a/content/influxdb/v1.7/flux/guides/cumulativesum.md b/content/influxdb/v1.7/flux/guides/cumulativesum.md
index 509b489cb..6d7138784 100644
--- a/content/influxdb/v1.7/flux/guides/cumulativesum.md
+++ b/content/influxdb/v1.7/flux/guides/cumulativesum.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     name: Cumulative sum
 list_query_example: cumulative_sum
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/cumulativesum/
+v2: /influxdb/v2.0/query-data/flux/cumulativesum/
 ---
 
 Use the [`cumulativeSum()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/cumulativesum/)
diff --git a/content/influxdb/v1.7/flux/guides/execute-queries.md b/content/influxdb/v1.7/flux/guides/execute-queries.md
index 00d66163e..6bfd352fa 100644
--- a/content/influxdb/v1.7/flux/guides/execute-queries.md
+++ b/content/influxdb/v1.7/flux/guides/execute-queries.md
@@ -8,6 +8,7 @@ menu:
 weight: 1
 aliases:
   - /influxdb/v1.7/flux/guides/executing-queries/
+v2: /influxdb/v2.0/query-data/execute-queries/
 ---
 
 There are multiple ways to execute Flux queries with InfluxDB and Chronograf v1.7+.
diff --git a/content/influxdb/v1.7/flux/guides/exists.md b/content/influxdb/v1.7/flux/guides/exists.md
index 7e297be0f..b21b67d18 100644
--- a/content/influxdb/v1.7/flux/guides/exists.md
+++ b/content/influxdb/v1.7/flux/guides/exists.md
@@ -10,6 +10,8 @@ menu:
     name: Exists
     parent: Query with Flux
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/exists/
+v2: /influxdb/v2.0/query-data/flux/exists/
 list_code_example: |
   ##### Filter null values
   ```js
diff --git a/content/influxdb/v1.7/flux/guides/fill.md b/content/influxdb/v1.7/flux/guides/fill.md
index b39b32c64..ed8127c36 100644
--- a/content/influxdb/v1.7/flux/guides/fill.md
+++ b/content/influxdb/v1.7/flux/guides/fill.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     name: Fill
 list_query_example: fill_null
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/fill/
+v2: /influxdb/v2.0/query-data/flux/fill/
 ---
 
 Use the [`fill()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/fill/)
diff --git a/content/influxdb/v1.7/flux/guides/first-last.md b/content/influxdb/v1.7/flux/guides/first-last.md
index 3b790dfb3..247c500bd 100644
--- a/content/influxdb/v1.7/flux/guides/first-last.md
+++ b/content/influxdb/v1.7/flux/guides/first-last.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     name: First & last
 list_query_example: first_last
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/first-last/
+v2: /influxdb/v2.0/query-data/flux/first-last/
 ---
 
 Use the [`first()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/selectors/first/) or
diff --git a/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md b/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md
index 591e028ed..db763a70b 100644
--- a/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md
+++ b/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md
@@ -8,6 +8,8 @@ menu:
     name: Use Flux in dashboards
     parent: Query with Flux
 weight: 30
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/flux-in-dashboards/
+v2: /influxdb/v2.0/query-data/flux/flux-in-dashboards/
 ---
 
 [Chronograf](/{{< latest "chronograf" >}}/) is the web user interface for managing for the
diff --git a/content/influxdb/v1.7/flux/guides/group-data.md b/content/influxdb/v1.7/flux/guides/group-data.md
index 773686755..7621ec77e 100644
--- a/content/influxdb/v1.7/flux/guides/group-data.md
+++ b/content/influxdb/v1.7/flux/guides/group-data.md
@@ -11,6 +11,8 @@ weight: 2
 aliases:
   - /influxdb/v1.7/flux/guides/grouping-data/
 list_query_example: group
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/group-data/
+v2: /influxdb/v2.0/query-data/flux/group-data/
 ---
 
 With Flux, you can group data by any column in your queried data set.
diff --git a/content/influxdb/v1.7/flux/guides/histograms.md b/content/influxdb/v1.7/flux/guides/histograms.md
index 8ad374ae7..9dd99214c 100644
--- a/content/influxdb/v1.7/flux/guides/histograms.md
+++ b/content/influxdb/v1.7/flux/guides/histograms.md
@@ -9,6 +9,8 @@ menu:
     parent: Query with Flux
 weight: 10
 list_query_example: histogram
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/histograms/
+v2: /influxdb/v2.0/query-data/flux/histograms/
 ---
 
 Histograms provide valuable insight into the distribution of your data.
diff --git a/content/influxdb/v1.7/flux/guides/increase.md b/content/influxdb/v1.7/flux/guides/increase.md
index ca545a247..c3c0ab060 100644
--- a/content/influxdb/v1.7/flux/guides/increase.md
+++ b/content/influxdb/v1.7/flux/guides/increase.md
@@ -12,6 +12,8 @@ menu:
     parent: Query with Flux
     name: Increase
 list_query_example: increase
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/increase/
+v2: /influxdb/v2.0/query-data/flux/increase/
 ---
 
 Use the [`increase()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/increase/)
diff --git a/content/influxdb/v1.7/flux/guides/join.md b/content/influxdb/v1.7/flux/guides/join.md
index 16b184f3e..bf0705d40 100644
--- a/content/influxdb/v1.7/flux/guides/join.md
+++ b/content/influxdb/v1.7/flux/guides/join.md
@@ -9,6 +9,8 @@ menu:
     parent: Query with Flux
 weight: 10
 list_query_example: join
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/join/
+v2: /influxdb/v2.0/query-data/flux/join/
 ---
 
 The [`join()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/join) merges two or more
diff --git a/content/influxdb/v1.7/flux/guides/manipulate-timestamps.md b/content/influxdb/v1.7/flux/guides/manipulate-timestamps.md
index e087a4698..3bce05a44 100644
--- a/content/influxdb/v1.7/flux/guides/manipulate-timestamps.md
+++ b/content/influxdb/v1.7/flux/guides/manipulate-timestamps.md
@@ -8,6 +8,8 @@ menu:
     name: Manipulate timestamps
     parent: Query with Flux
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/manipulate-timestamps/
+v2: /influxdb/v2.0/query-data/flux/manipulate-timestamps/
 ---
 
 Every point stored in InfluxDB has an associated timestamp.
diff --git a/content/influxdb/v1.7/flux/guides/mathematic-operations.md b/content/influxdb/v1.7/flux/guides/mathematic-operations.md
index 4845bdfb5..ccb9a429f 100644
--- a/content/influxdb/v1.7/flux/guides/mathematic-operations.md
+++ b/content/influxdb/v1.7/flux/guides/mathematic-operations.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
 weight: 5
 list_query_example: map_math
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/mathematic-operations/
+v2: /influxdb/v2.0/query-data/flux/mathematic-operations/
 ---
 
 Flux supports mathematic expressions in data transformations.
diff --git a/content/influxdb/v1.7/flux/guides/median.md b/content/influxdb/v1.7/flux/guides/median.md
index 170decb46..3568b6112 100644
--- a/content/influxdb/v1.7/flux/guides/median.md
+++ b/content/influxdb/v1.7/flux/guides/median.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     name: Median
 list_query_example: median
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/median/
+v2: /influxdb/v2.0/query-data/flux/median/
 ---
 
 Use the [`median()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/median/)
diff --git a/content/influxdb/v1.7/flux/guides/monitor-states.md b/content/influxdb/v1.7/flux/guides/monitor-states.md
index 270e7bb80..71d9c7d3f 100644
--- a/content/influxdb/v1.7/flux/guides/monitor-states.md
+++ b/content/influxdb/v1.7/flux/guides/monitor-states.md
@@ -7,6 +7,8 @@ menu:
     name: Monitor states
     parent: Query with Flux
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/monitor-states/
+v2: /influxdb/v2.0/query-data/flux/monitor-states/
 ---
 
 Flux helps you monitor states in your metrics and events:
diff --git a/content/influxdb/v1.7/flux/guides/moving-average.md b/content/influxdb/v1.7/flux/guides/moving-average.md
index a57862570..2b662e32a 100644
--- a/content/influxdb/v1.7/flux/guides/moving-average.md
+++ b/content/influxdb/v1.7/flux/guides/moving-average.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     name: Moving Average
 list_query_example: moving_average
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/moving-average/
+v2: /influxdb/v2.0/query-data/flux/moving-average/
 ---
 
 Use the [`movingAverage()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/movingaverage/)
diff --git a/content/influxdb/v1.7/flux/guides/optimize-queries.md b/content/influxdb/v1.7/flux/guides/optimize-queries.md
index c3689c94f..d8a0a72dc 100644
--- a/content/influxdb/v1.7/flux/guides/optimize-queries.md
+++ b/content/influxdb/v1.7/flux/guides/optimize-queries.md
@@ -7,6 +7,8 @@ menu:
   influxdb_1_7:
     name: Optimize queries
     parent: Query with Flux
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/optimize-queries/
+v2: /influxdb/v2.0/query-data/flux/optimize-queries/
 ---
 
 Optimize your Flux queries to reduce their memory and compute (CPU) requirements.
diff --git a/content/influxdb/v1.7/flux/guides/percentile-quantile.md b/content/influxdb/v1.7/flux/guides/percentile-quantile.md
index 444a5c9be..c2cd41005 100644
--- a/content/influxdb/v1.7/flux/guides/percentile-quantile.md
+++ b/content/influxdb/v1.7/flux/guides/percentile-quantile.md
@@ -11,6 +11,8 @@ menu:
     parent: Query with Flux
     name: Percentile & quantile
 list_query_example: quantile
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/percentile-quantile/
+v2: /influxdb/v2.0/query-data/flux/percentile-quantile/
 ---
 
 Use the [`quantile()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/quantile/)
diff --git a/content/influxdb/v1.7/flux/guides/query-fields.md b/content/influxdb/v1.7/flux/guides/query-fields.md
index a77403a1b..2d68b8bb8 100644
--- a/content/influxdb/v1.7/flux/guides/query-fields.md
+++ b/content/influxdb/v1.7/flux/guides/query-fields.md
@@ -9,6 +9,8 @@ weight: 1
 menu:
   influxdb_1_7:
     parent: Query with Flux
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/query-fields/
+v2: /influxdb/v2.0/query-data/flux/query-fields/
 list_code_example: |
   ```js
   from(bucket: "db/rp")
diff --git a/content/influxdb/v1.7/flux/guides/rate.md b/content/influxdb/v1.7/flux/guides/rate.md
index 27dabfe2e..8f5dcbd73 100644
--- a/content/influxdb/v1.7/flux/guides/rate.md
+++ b/content/influxdb/v1.7/flux/guides/rate.md
@@ -13,6 +13,8 @@ menu:
     parent: Query with Flux
     name: Rate
 list_query_example: rate_of_change
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/rate/
+v2: /influxdb/v2.0/query-data/flux/rate/
 ---
 
 
diff --git a/content/influxdb/v1.7/flux/guides/regular-expressions.md b/content/influxdb/v1.7/flux/guides/regular-expressions.md
index c1444099d..b09600cb5 100644
--- a/content/influxdb/v1.7/flux/guides/regular-expressions.md
+++ b/content/influxdb/v1.7/flux/guides/regular-expressions.md
@@ -8,6 +8,8 @@ menu:
     parent: Query with Flux
 weight: 20
 list_query_example: regular_expressions
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/regular-expressions/
+v2: /influxdb/v2.0/query-data/flux/regular-expressions/
 ---
 
 Regular expressions (regexes) are incredibly powerful when matching patterns in large collections of data.
diff --git a/content/influxdb/v1.7/flux/guides/scalar-values.md b/content/influxdb/v1.7/flux/guides/scalar-values.md
index 010ce2f51..2f9edd39d 100644
--- a/content/influxdb/v1.7/flux/guides/scalar-values.md
+++ b/content/influxdb/v1.7/flux/guides/scalar-values.md
@@ -9,6 +9,8 @@ menu:
     name: Extract scalar values
     parent:  Query with Flux
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/scalar-values/
+v2: /influxdb/v2.0/query-data/flux/scalar-values/
 list_code_example: |
   ```js
   scalarValue = {
diff --git a/content/influxdb/v1.7/flux/guides/sort-limit.md b/content/influxdb/v1.7/flux/guides/sort-limit.md
index 8a35dfff8..2a84f10c2 100644
--- a/content/influxdb/v1.7/flux/guides/sort-limit.md
+++ b/content/influxdb/v1.7/flux/guides/sort-limit.md
@@ -11,6 +11,8 @@ menu:
     parent: Query with Flux
 weight: 3
 list_query_example: sort_limit
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/sort-limit/
+v2: /influxdb/v2.0/query-data/flux/sort-limit/
 ---
 
 Use the [`sort()`function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/sort)
diff --git a/content/influxdb/v1.7/flux/guides/sql.md b/content/influxdb/v1.7/flux/guides/sql.md
index f72d4a45c..5af40fe97 100644
--- a/content/influxdb/v1.7/flux/guides/sql.md
+++ b/content/influxdb/v1.7/flux/guides/sql.md
@@ -10,6 +10,8 @@ menu:
     parent: Query with Flux
     list_title: SQL data
 weight: 20
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/sql/
+v2: /influxdb/v2.0/query-data/flux/sql/
 list_code_example: |
   ```js
   import "sql"
diff --git a/content/influxdb/v1.7/flux/guides/window-aggregate.md b/content/influxdb/v1.7/flux/guides/window-aggregate.md
index 75f77d063..c4c1b4eec 100644
--- a/content/influxdb/v1.7/flux/guides/window-aggregate.md
+++ b/content/influxdb/v1.7/flux/guides/window-aggregate.md
@@ -11,6 +11,8 @@ menu:
     parent: Query with Flux
 weight: 4
 list_query_example: aggregate_window
+canonical: /{{< latest "influxdb" "v2" >}}/query-data/flux/window-aggregate/
+v2: /influxdb/v2.0/query-data/flux/window-aggregate/
 ---
 
 A common operation performed with time series data is grouping data into windows of time,
diff --git a/content/influxdb/v1.7/guides/calculating_percentages.md b/content/influxdb/v1.7/guides/calculating_percentages.md
index 129a136e1..e41b46396 100644
--- a/content/influxdb/v1.7/guides/calculating_percentages.md
+++ b/content/influxdb/v1.7/guides/calculating_percentages.md
@@ -5,6 +5,7 @@ menu:
   influxdb_1_7:
     weight: 50
     parent: Guides
+v2: /influxdb/v2.0/query-data/flux/calculate-percentages/
 ---
 
 [InfluxQL](/influxdb/v1.7/query_language/) lets you perform simple math equations
diff --git a/content/influxdb/v1.7/guides/downsampling_and_retention.md b/content/influxdb/v1.7/guides/downsampling_and_retention.md
index e767931ae..76020cc63 100644
--- a/content/influxdb/v1.7/guides/downsampling_and_retention.md
+++ b/content/influxdb/v1.7/guides/downsampling_and_retention.md
@@ -4,6 +4,7 @@ menu:
   influxdb_1_7:
     weight: 30
     parent: Guides
+v2: /influxdb/v2.0/process-data/common-tasks/downsample-data/
 ---
 
 InfluxDB can handle hundreds of thousands of data points per second.
diff --git a/content/influxdb/v1.7/guides/querying_data.md b/content/influxdb/v1.7/guides/querying_data.md
index 8d174c349..76fc27bc5 100644
--- a/content/influxdb/v1.7/guides/querying_data.md
+++ b/content/influxdb/v1.7/guides/querying_data.md
@@ -6,6 +6,7 @@ menu:
   influxdb_1_7:
     weight: 20
     parent: Guides
+v2: /influxdb/v2.0/query-data/
 ---
 
 ## Querying data with the InfluxDB API
diff --git a/content/influxdb/v1.7/guides/writing_data.md b/content/influxdb/v1.7/guides/writing_data.md
index 6029c251d..cf77adc4f 100644
--- a/content/influxdb/v1.7/guides/writing_data.md
+++ b/content/influxdb/v1.7/guides/writing_data.md
@@ -5,6 +5,7 @@ menu:
   influxdb_1_7:
     weight: 10
     parent: Guides
+v2: /influxdb/v2.0/write-data/
 ---
 
 Write data into InfluxDB using the [command line interface](/influxdb/v1.7/tools/shell/), [client libraries](/influxdb/v1.7/clients/api/), and plugins for common data formats such as [Graphite](/influxdb/v1.7/write_protocols/graphite/).
@@ -49,17 +50,17 @@ Anything that has to do with time in InfluxDB is always UTC.
 
 ### Configure gzip compression
 
-InfluxDB supports gzip compression. To reduce network traffic, consider the following options: 
+InfluxDB supports gzip compression. To reduce network traffic, consider the following options:
 
 * To accept compressed data from InfluxDB, add the `Accept-Encoding: gzip` header to InfluxDB API requests.
 
 * To compress data before sending it to InfluxDB, add the `Content-Encoding: gzip` header to InfluxDB API requests.
 
-For details about enabling gzip for client libraries, see your client library documentation. 
-  
+For details about enabling gzip for client libraries, see your client library documentation.
+
 #### Enable gzip compression in the Telegraf InfluxDB output plugin
-  
-* In the Telegraf configuration file (telegraf.conf), under [[outputs.influxdb]], change 
+
+* In the Telegraf configuration file (telegraf.conf), under [[outputs.influxdb]], change
   `content_encoding = "identity"` (default) to `content_encoding = "gzip"`
 
 >**Note**
diff --git a/content/influxdb/v1.7/introduction/getting-started.md b/content/influxdb/v1.7/introduction/getting-started.md
index a411861b3..4a0506815 100644
--- a/content/influxdb/v1.7/introduction/getting-started.md
+++ b/content/influxdb/v1.7/introduction/getting-started.md
@@ -7,6 +7,7 @@ menu:
     name: Getting started
     weight: 30
     parent: Introduction
+v2: /influxdb/v2.0/get-started/
 ---
 
 With InfluxDB open source (OSS) [installed](/influxdb/v1.7/introduction/installation), you're ready to start doing some awesome things.
diff --git a/content/influxdb/v1.7/query_language/continuous_queries.md b/content/influxdb/v1.7/query_language/continuous_queries.md
index fb4a0b691..60e0c166f 100644
--- a/content/influxdb/v1.7/query_language/continuous_queries.md
+++ b/content/influxdb/v1.7/query_language/continuous_queries.md
@@ -6,6 +6,7 @@ menu:
     name: Continuous Queries
     weight: 50
     parent: InfluxQL
+v2: /influxdb/v2.0/process-data/
 ---
 
 ## Introduction
@@ -405,7 +406,7 @@ See [ Description of Basic Syntax](/influxdb/v1.7/query_language/continuous_quer
 ##### Scheduling and coverage
 
 CQs operate on real-time data. With the advanced syntax, CQs use the local
-server’s timestamp, the information in the `RESAMPLE` clause, and the InfluxDB 
+server’s timestamp, the information in the `RESAMPLE` clause, and the InfluxDB
 server's preset time boundaries to determine when to execute and what time range to
 cover in the query.
 
diff --git a/content/influxdb/v1.7/query_language/data_download.md b/content/influxdb/v1.7/query_language/data_download.md
index 8bc98046b..51f4dc2bf 100644
--- a/content/influxdb/v1.7/query_language/data_download.md
+++ b/content/influxdb/v1.7/query_language/data_download.md
@@ -6,12 +6,13 @@ menu:
     parent: InfluxQL
 aliases:
   - /influxdb/v1.7/sample_data/data_download/
+v2: /influxdb/v2.0/reference/sample-data/
 ---
 
 In order to explore the query language further, these instructions help you create a database,
 download and write data to that database within your InfluxDB installation.
-The sample data is then used and referenced in [Data Exploration](../../query_language/data_exploration/),
-[Schema Exploration](../../query_language/schema_exploration/), and [Functions](../../query_language/functions/).
+The sample data is then used and referenced in [Data Exploration](/influxdb/v1.7/query_language/data_exploration/),
+[Schema Exploration](/influxdb/v1.7/query_language/schema_exploration/), and [Functions](/influxdb/v1.7/query_language/functions/).
 
 ## Creating a database
 
@@ -60,7 +61,7 @@ From your terminal, download the text file that contains the data in [line proto
 curl https://s3.amazonaws.com/noaa.water-database/NOAA_data.txt -o NOAA_data.txt
 ```
 
-Write the data to InfluxDB via the [CLI](../../tools/shell/):
+Write the data to InfluxDB via the [CLI](/influxdb/v1.7/tools/shell/):
 ```
 influx -import -path=NOAA_data.txt -precision=s -database=NOAA_water_database
 ```
@@ -114,8 +115,8 @@ The sample data is publicly available data from the [National Oceanic and Atmosp
 The data include 15,258 observations of water levels (ft) collected every six minutes at two stations (Santa Monica, CA (ID 9410840) and Coyote Creek, CA (ID 9414575)) over the period from August 18, 2015 through September 18, 2015.
 
 Note that the measurements `average_temperature`, `h2o_pH`, `h2o_quality`, and `h2o_temperature` contain fictional data.
-Those measurements serve to illuminate query functionality in [Schema Exploration](../../query_language/schema_exploration/).
+Those measurements serve to illuminate query functionality in [Schema Exploration](/influxdb/v1.7/query_language/schema_exploration/).
 
 
 The `h2o_feet` measurement is the only measurement that contains the NOAA data.
-Please note that the `level description` field isn't part of the original NOAA data - we snuck it in there for the sake of having a field key with a special character and string [field values](../../concepts/glossary/#field-value).
+Please note that the `level description` field isn't part of the original NOAA data - we snuck it in there for the sake of having a field key with a special character and string [field values](/influxdb/v1.7/concepts/glossary/#field-value).
diff --git a/content/influxdb/v1.7/query_language/data_exploration.md b/content/influxdb/v1.7/query_language/data_exploration.md
index 6f38c0b6d..6c6be8add 100644
--- a/content/influxdb/v1.7/query_language/data_exploration.md
+++ b/content/influxdb/v1.7/query_language/data_exploration.md
@@ -6,6 +6,7 @@ menu:
     name: Data exploration
     weight: 20
     parent: InfluxQL
+v2: /influxdb/v2.0/query-data/flux/query-fields/
 ---
 
 InfluxQL is an SQL-like query language for interacting with data in InfluxDB.
diff --git a/content/influxdb/v1.7/query_language/schema_exploration.md b/content/influxdb/v1.7/query_language/schema_exploration.md
index 84010078e..b945c136e 100644
--- a/content/influxdb/v1.7/query_language/schema_exploration.md
+++ b/content/influxdb/v1.7/query_language/schema_exploration.md
@@ -5,6 +5,7 @@ menu:
     name: Schema exploration
     weight: 30
     parent: InfluxQL
+v2: /influxdb/v2.0/query-data/flux/explore-schema/
 ---
 
 InfluxQL is an SQL-like query language for interacting with data in InfluxDB.
diff --git a/content/influxdb/v1.7/tools/_index.md b/content/influxdb/v1.7/tools/_index.md
index 82055387b..a0f14a46b 100644
--- a/content/influxdb/v1.7/tools/_index.md
+++ b/content/influxdb/v1.7/tools/_index.md
@@ -7,7 +7,7 @@ menu:
   influxdb_1_7:
     name: Tools
     weight: 60
-
+v2: /influxdb/v2.0/tools/
 ---
 
 This section covers the available tools for interacting with InfluxDB.
diff --git a/content/influxdb/v1.7/tools/api.md b/content/influxdb/v1.7/tools/api.md
index ea54a83f4..45dc5f640 100644
--- a/content/influxdb/v1.7/tools/api.md
+++ b/content/influxdb/v1.7/tools/api.md
@@ -8,6 +8,7 @@ menu:
     name: InfluxDB API reference
     weight: 20
     parent: Tools
+v2: /influxdb/v2.0/reference/api/
 ---
 
 The InfluxDB API provides a simple way to interact with the database.
diff --git a/content/influxdb/v1.7/tools/api_client_libraries.md b/content/influxdb/v1.7/tools/api_client_libraries.md
index be4ccb87e..509dc0613 100644
--- a/content/influxdb/v1.7/tools/api_client_libraries.md
+++ b/content/influxdb/v1.7/tools/api_client_libraries.md
@@ -9,6 +9,7 @@ menu:
   influxdb_1_7:
     weight: 30
     parent: Tools
+v2: /influxdb/v2.0/tools/client-libraries/
 ---
 
 InfluxDB client libraries are developed by the open source community. These client libraries support the InfluxDB 1.7 API and should be fully compatible with InfluxDB 1.5+. Functionality will vary as there are no standard features that all libraries must implement in order to be listed here.
diff --git a/content/influxdb/v1.7/tools/grafana.md b/content/influxdb/v1.7/tools/grafana.md
index 0a3eb33c5..12cae5f58 100644
--- a/content/influxdb/v1.7/tools/grafana.md
+++ b/content/influxdb/v1.7/tools/grafana.md
@@ -6,6 +6,7 @@ menu:
     url: "https://grafana.com/docs/grafana/latest/features/datasources/influxdb/"
     weight: 60
     parent: Tools
+v2: /influxdb/v2.0/tools/grafana/
 ---
 
 Please see [Grafana's InfluxDB documentation](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/).
diff --git a/content/influxdb/v1.7/tools/influx-cli/_index.md b/content/influxdb/v1.7/tools/influx-cli/_index.md
index 407d4f93e..9d1f8c5ad 100644
--- a/content/influxdb/v1.7/tools/influx-cli/_index.md
+++ b/content/influxdb/v1.7/tools/influx-cli/_index.md
@@ -5,6 +5,7 @@ menu:
     name: influx
     weight: 10
     parent: Tools
+v2: /influxdb/v2.0/reference/cli/influx/
 ---
 
 The `influx` command line interface (CLI) includes commands to manage many aspects of InfluxDB, including databases, organizations, users, and tasks.
diff --git a/content/influxdb/v1.7/tools/influx_inspect.md b/content/influxdb/v1.7/tools/influx_inspect.md
index 29a375de1..f055c680f 100644
--- a/content/influxdb/v1.7/tools/influx_inspect.md
+++ b/content/influxdb/v1.7/tools/influx_inspect.md
@@ -5,6 +5,7 @@ menu:
   influxdb_1_7:
     weight: 50
     parent: Tools
+v2: /influxdb/v2.0/reference/cli/influxd/inspect/
 ---
 
 Influx Inspect is an InfluxDB disk utility that can be used to:
diff --git a/content/influxdb/v1.7/tools/influxd-cli/_index.md b/content/influxdb/v1.7/tools/influxd-cli/_index.md
index 4244472be..159633f53 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/_index.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/_index.md
@@ -6,6 +6,7 @@ menu:
     name: influxd
     weight: 10
     parent: Tools
+v2: /influxdb/v2.0/reference/cli/influxd/
 ---
 
 The `influxd` command line interface (CLI) starts and runs all the processes necessary for InfluxDB to function.
diff --git a/content/influxdb/v1.7/tools/influxd-cli/backup.md b/content/influxdb/v1.7/tools/influxd-cli/backup.md
index 4941d0196..bde299fd8 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/backup.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/backup.md
@@ -6,6 +6,7 @@ menu:
     name: influxd backup
     weight: 10
     parent: influxd
+v2: /influxdb/v2.0/reference/cli/influx/backup/
 ---
 
 The `influxd backup` command crates a backup copy of specified InfluxDB OSS database(s) and saves the files in an Enterprise-compatible format to PATH (directory where backups are saved).
diff --git a/content/influxdb/v1.7/tools/influxd-cli/restore.md b/content/influxdb/v1.7/tools/influxd-cli/restore.md
index e122d95aa..81be8792f 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/restore.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/restore.md
@@ -6,6 +6,7 @@ menu:
     name: influxd restore
     weight: 10
     parent: influxd
+v2: /influxdb/v2.0/reference/cli/influxd/restore/
 ---
 The `influxd restore` command restores backup data and metadata from an InfluxDB backup directory.
 
diff --git a/content/influxdb/v1.7/tools/influxd-cli/run.md b/content/influxdb/v1.7/tools/influxd-cli/run.md
index 763711135..ff80ed747 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/run.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/run.md
@@ -6,6 +6,7 @@ menu:
     name: influxd run
     weight: 10
     parent: influxd
+v2: /influxdb/v2.0/reference/cli/influxd/run/
 ---
 
 The `influxd run` command is the default command for `influxd`.
diff --git a/content/influxdb/v1.7/tools/influxd-cli/version.md b/content/influxdb/v1.7/tools/influxd-cli/version.md
index a731c6fda..dd8995d0a 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/version.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/version.md
@@ -6,6 +6,7 @@ menu:
     name: influxd version
     weight: 10
     parent: influxd
+v2: /influxdb/v2.0/reference/cli/influxd/version/
 ---
 
 
diff --git a/content/influxdb/v1.7/write_protocols/_index.md b/content/influxdb/v1.7/write_protocols/_index.md
index 7a7a9517e..72a3f8201 100644
--- a/content/influxdb/v1.7/write_protocols/_index.md
+++ b/content/influxdb/v1.7/write_protocols/_index.md
@@ -5,6 +5,7 @@ menu:
   influxdb_1_7:
     name: Write protocols
     weight: 80
+v2: /influxdb/v2.0/reference/syntax/line-protocol/
 ---
 
 The InfluxDB line protocol is a text based format for writing points to InfluxDB databases.
diff --git a/content/influxdb/v1.7/write_protocols/line_protocol_reference.md b/content/influxdb/v1.7/write_protocols/line_protocol_reference.md
index 8c835d475..ff690ae88 100644
--- a/content/influxdb/v1.7/write_protocols/line_protocol_reference.md
+++ b/content/influxdb/v1.7/write_protocols/line_protocol_reference.md
@@ -8,6 +8,7 @@ menu:
     weight: 10
     parent: Write protocols
 canonical: /{{< latest "influxdb" "v2" >}}/reference/syntax/line-protocol/
+v2: /influxdb/v2.0/reference/syntax/line-protocol/
 ---
 
 InfluxDB line protocol is a text based format for writing points to InfluxDB.
diff --git a/content/influxdb/v1.7/write_protocols/line_protocol_tutorial.md b/content/influxdb/v1.7/write_protocols/line_protocol_tutorial.md
index 65d65c2f2..9646d95dc 100644
--- a/content/influxdb/v1.7/write_protocols/line_protocol_tutorial.md
+++ b/content/influxdb/v1.7/write_protocols/line_protocol_tutorial.md
@@ -6,6 +6,7 @@ menu:
   influxdb_1_7:
     weight: 20
     parent: Write protocols
+v2: /influxdb/v2.0/reference/syntax/line-protocol/
 ---
 
 The InfluxDB line protocol is a text based format for writing points to the
diff --git a/content/influxdb/v2.0/tools/client-libraries/_index.md b/content/influxdb/v2.0/tools/client-libraries/_index.md
index c78861937..938b7273a 100644
--- a/content/influxdb/v2.0/tools/client-libraries/_index.md
+++ b/content/influxdb/v2.0/tools/client-libraries/_index.md
@@ -6,13 +6,12 @@ description: >
 weight: 101
 aliases:
   - /influxdb/v2.0/reference/client-libraries/
+  - /influxdb/v2.0/reference/api/client-libraries/
 menu:
   influxdb_2_0:
     name: Use client libraries
     parent: Tools & integrations
 influxdb/v2.0/tags: [client libraries]
-aliases:
-  - /influxdb/v2.0/reference/api/client-libraries/
 ---
 
 InfluxDB client libraries are language-specific packages that integrate with the InfluxDB v2 API.