From c1ca5c8408c8fcfd91a6ff6781a5110a547bdbc4 Mon Sep 17 00:00:00 2001
From: Scott Anderson
Date: Fri, 19 Feb 2021 11:07:47 -0700
Subject: [PATCH] =?UTF-8?q?Fix=20broken=20internal=20links=20=E2=80=93=20S?=
=?UTF-8?q?EO=20link=20audit=20(#2189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* link audit, remove info about stopping influxd in restore docs, closes #2168
* fixed broken internal links for seo link audit
* updated canonical logic to be smarter
* fixed canonical links and broken images
* fixed errant find and replace
* fixed formatting of kapa event handler docs
* more link fixes
* more link fixes, support latest shortcode in telegraf plugin descriptions
---
content/chronograf/v1.6/_index.md | 2 +-
.../administration/managing-influxdb-users.md | 38 +-
.../transition-web-admin-interface.md | 2 +-
.../chronograf/v1.6/guides/analyzing-logs.md | 2 +-
.../monitoring-influxenterprise-clusters.md | 2 +-
content/chronograf/v1.7/_index.md | 2 +-
.../release-notes-changelog.md | 2 +-
.../v1.7/administration/chrono-on-clusters.md | 2 +-
.../managing-chronograf-users.md | 2 +-
.../administration/managing-influxdb-users.md | 10 +-
.../v1.7/administration/managing-security.md | 2 +-
.../transition-web-admin-interface.md | 6 +-
.../chronograf/v1.7/guides/analyzing-logs.md | 2 +-
.../monitoring-influxenterprise-clusters.md | 12 +-
.../chronograf/v1.7/guides/querying-data.md | 2 +-
.../guides/using-precreated-dashboards.md | 60 +--
.../v1.7/introduction/installation.md | 2 +-
.../frequently-asked-questions.md | 6 +-
content/chronograf/v1.8/_index.md | 2 +-
.../release-notes-changelog.md | 4 +-
.../v1.8/administration/chrono-on-clusters.md | 2 +-
.../managing-chronograf-users.md | 2 +-
.../administration/managing-influxdb-users.md | 10 +-
.../v1.8/administration/managing-security.md | 2 +-
.../chronograf/v1.8/guides/analyzing-logs.md | 2 +-
.../monitoring-influxenterprise-clusters.md | 12 +-
.../chronograf/v1.8/guides/querying-data.md | 2 +-
.../frequently-asked-questions.md | 6 +-
.../v1.5/administration/backup-and-restore.md | 2 +-
.../v1.5/administration/cluster-commands.md | 12 +-
.../v1.5/administration/configuration.md | 8 +-
.../v1.5/administration/security.md | 2 +-
.../v1.5/administration/upgrading.md | 2 +-
.../v1.5/concepts/clustering.md | 8 +-
.../v1.5/concepts/glossary.md | 4 +-
.../v1.5/features/users.md | 6 +-
.../v1.5/guides/https_setup.md | 50 +-
.../v1.5/guides/migration.md | 8 +-
.../v1.5/introduction/getting-started.md | 2 +-
.../introduction/installation_guidelines.md | 4 +-
.../v1.5/production_installation/_index.md | 6 +-
.../v1.5/quickstart_installation/_index.md | 6 +-
.../cluster_installation.md | 2 +-
.../frequently_asked_questions.md | 2 +-
.../v1.6/administration/anti-entropy.md | 2 +-
.../v1.6/administration/backup-and-restore.md | 2 +-
.../v1.6/concepts/glossary.md | 2 +-
.../production_installation/_index.md | 2 +-
.../v1.6/introduction/getting-started.md | 2 +-
.../v1.7/administration/anti-entropy.md | 2 +-
.../v1.7/administration/backup-and-restore.md | 2 +-
.../v1.7/concepts/glossary.md | 4 +-
.../v1.7/install-and-deploy/azure.md | 2 +-
.../v1.7/introduction/getting-started.md | 2 +-
.../v1.8/administration/cluster-commands.md | 1 +
.../v1.8/concepts/glossary.md | 2 +-
.../install-and-deploy/deploying/azure.md | 2 +
.../v1.8/introduction/getting-started.md | 2 +-
.../account-management/multi-user/_index.md | 1 +
.../cloud/query-data/get-started/_index.md | 4 +-
.../reference/cli/influx/restore/index.md | 66 ++-
.../flux/stdlib/contrib/sensu/endpoint.md | 2 +-
.../flux/stdlib/contrib/teams/endpoint.md | 2 +-
.../flux/stdlib/contrib/telegram/endpoint.md | 4 +-
.../flux/stdlib/contrib/telegram/message.md | 2 +-
content/influxdb/cloud/tools/chronograf.md | 5 +-
.../dashboards/control-dashboard.md | 6 -
.../cloud/visualize-data/explore-metrics.md | 6 -
.../variables/common-variables.md | 6 +-
content/influxdb/v1.3/_index.md | 2 +-
.../v1.3/administration/backup_and_restore.md | 12 +-
.../influxdb/v1.3/administration/config.md | 4 +-
.../v1.3/administration/differences.md | 4 +-
.../v1.3/administration/https_setup.md | 2 +-
.../administration/previous_differences.md | 14 +-
.../influxdb/v1.3/administration/upgrading.md | 4 +-
.../influxdb/v1.3/guides/hardware_sizing.md | 4 +-
.../authentication_and_authorization.md | 2 +-
content/influxdb/v1.3/query_language/spec.md | 2 +-
content/influxdb/v1.3/tools/_index.md | 6 +-
content/influxdb/v1.3/tools/web_admin.md | 4 +-
.../v1.3/troubleshooting/query_management.md | 6 +-
content/influxdb/v1.4/_index.md | 2 +-
.../v1.4/administration/backup_and_restore.md | 12 +-
.../administration/previous_differences.md | 16 +-
.../influxdb/v1.4/administration/upgrading.md | 4 +-
.../influxdb/v1.4/guides/hardware_sizing.md | 4 +-
.../v1.4/query_language/continuous_queries.md | 2 +-
content/influxdb/v1.4/query_language/spec.md | 2 +-
content/influxdb/v1.4/tools/_index.md | 2 +-
content/influxdb/v1.4/tools/api.md | 2 +-
.../influxdb/v1.4/troubleshooting/errors.md | 2 +-
.../v1.4/troubleshooting/query_management.md | 4 +-
content/influxdb/v1.5/_index.md | 2 +-
.../v1.5/guides/calculating_percentages.md | 4 +-
.../v1.5/query_language/continuous_queries.md | 2 +-
content/influxdb/v1.5/query_language/spec.md | 2 +-
content/influxdb/v1.5/tools/_index.md | 2 +-
.../influxdb/v1.5/troubleshooting/errors.md | 2 +-
.../v1.5/troubleshooting/query_management.md | 4 +-
content/influxdb/v1.6/_index.md | 2 +-
.../v1.6/query_language/continuous_queries.md | 2 +-
content/influxdb/v1.6/tools/_index.md | 2 +-
.../influxdb/v1.6/troubleshooting/errors.md | 2 +-
content/influxdb/v1.7/_index.md | 2 +-
.../authentication_and_authorization.md | 2 -
content/influxdb/v1.7/concepts/glossary.md | 2 +-
.../v1.7/flux/guides/flux-in-dashboards.md | 1 -
.../influxdb/v1.7/flux/guides/group-data.md | 8 +-
.../v1.7/flux/guides/mathematic-operations.md | 4 +-
.../v1.7/flux/guides/moving-average.md | 2 +-
.../v1.7/flux/guides/optimize-queries.md | 3 +-
content/influxdb/v1.7/flux/guides/rate.md | 4 +-
.../v1.7/query_language/continuous_queries.md | 2 +-
.../influxdb/v1.7/query_language/functions.md | 2 +-
.../influxdb/v1.7/tools/influxd-cli/_index.md | 1 +
.../influxdb/v1.7/tools/influxd-cli/backup.md | 1 +
.../influxdb/v1.7/tools/influxd-cli/config.md | 1 +
.../v1.7/tools/influxd-cli/restore.md | 3 +-
.../influxdb/v1.7/tools/influxd-cli/run.md | 1 +
.../v1.7/tools/influxd-cli/version.md | 1 +
.../influxdb/v1.7/troubleshooting/errors.md | 2 +-
content/influxdb/v1.8/_index.md | 2 +-
.../releasenotes-changelog.md | 4 +-
.../authentication_and_authorization.md | 2 +-
.../influxdb/v1.8/administration/config.md | 2 +-
content/influxdb/v1.8/concepts/glossary.md | 2 +-
.../v1.8/concepts/schema_and_data_layout.md | 2 +-
.../v1.8/flux/get-started/syntax-basics.md | 2 +-
.../v1.8/flux/guides/flux-in-dashboards.md | 1 -
.../influxdb/v1.8/flux/guides/group-data.md | 8 +-
.../v1.8/flux/guides/mathematic-operations.md | 4 +-
.../v1.8/flux/guides/moving-average.md | 2 +-
.../v1.8/flux/guides/optimize-queries.md | 3 +-
content/influxdb/v1.8/flux/guides/rate.md | 4 +-
.../v1.8/guides/calculate_percentages.md | 12 +-
.../v1.8/query_language/continuous_queries.md | 2 +-
.../influxdb/v1.8/query_language/functions.md | 2 +-
.../influxdb/v1.8/tools/influxd/restore.md | 2 +-
.../influxdb/v1.8/troubleshooting/errors.md | 2 +-
.../influxdb/v2.0/backup-restore/restore.md | 22 +-
.../v2.0/query-data/get-started/_index.md | 4 +-
.../reference/cli/influx/restore/index.md | 8 +-
.../v2.0/reference/flux/flux-vs-influxql.md | 10 +-
.../flux/stdlib/contrib/sensu/endpoint.md | 2 +-
.../flux/stdlib/contrib/teams/endpoint.md | 2 +-
.../flux/stdlib/contrib/telegram/endpoint.md | 4 +-
.../flux/stdlib/contrib/telegram/message.md | 2 +-
.../influxdb/v2.0/telegraf-configs/update.md | 2 +-
content/influxdb/v2.0/tools/chronograf.md | 5 +-
.../influxdb/v2.0/upgrade/v1-to-v2/_index.md | 2 +-
.../variables/common-variables.md | 6 +-
.../visualization-types/band.md | 6 +-
content/kapacitor/v1.4/_index.md | 2 +-
.../releasenotes-changelog.md | 2 +-
.../kapacitor/v1.4/administration/security.md | 2 +-
.../v1.4/administration/upgrading.md | 2 +-
.../v1.4/guides/event-handler-setup.md | 487 ++++++++++--------
.../kapacitor/v1.4/guides/join_backfill.md | 2 +-
.../v1.4/introduction/getting-started.md | 2 +-
.../v1.4/working/event-handler-setup.md | 2 +-
.../kapacitor/v1.4/working/template_tasks.md | 2 +-
content/kapacitor/v1.5/_index.md | 2 +-
.../releasenotes-changelog.md | 6 +-
.../kapacitor/v1.5/administration/security.md | 2 +-
.../administration/subscription-management.md | 2 +-
.../v1.5/administration/upgrading.md | 2 +-
.../kapacitor/v1.5/event_handlers/_index.md | 4 +-
.../kapacitor/v1.5/event_handlers/hipchat.md | 2 +-
.../v1.5/event_handlers/opsgenie/v1.md | 12 +-
.../v1.5/event_handlers/pagerduty/v1.md | 12 +-
.../v1.5/guides/event-handler-setup.md | 14 +-
.../kapacitor/v1.5/guides/join_backfill.md | 3 +-
.../install-and-deploy/install/_index.md | 2 +-
.../external-monitor-setup.md | 2 +-
content/platform/troubleshoot/disk-usage.md | 2 +-
content/platform/troubleshoot/oom-loops.md | 6 +-
content/telegraf/v1.10/plugins/aggregators.md | 2 +-
content/telegraf/v1.10/plugins/outputs.md | 4 +-
content/telegraf/v1.9/plugins/aggregators.md | 2 +-
content/telegraf/v1.9/plugins/outputs.md | 2 +-
data/telegraf_plugins.yml | 28 +-
deploy/edge.js | 3 +-
layouts/partials/article/stable-version.html | 5 +-
layouts/partials/header/canonical.html | 12 +-
layouts/shortcodes/telegraf/plugins.html | 20 +-
186 files changed, 769 insertions(+), 661 deletions(-)
diff --git a/content/chronograf/v1.6/_index.md b/content/chronograf/v1.6/_index.md
index 0ac57bf9e..4a63ed495 100644
--- a/content/chronograf/v1.6/_index.md
+++ b/content/chronograf/v1.6/_index.md
@@ -40,7 +40,7 @@ Chronograf offers a UI for [Kapacitor](https://github.com/influxdata/kapacitor),
* Create and delete databases and retention policies
* View currently-running queries and stop inefficient queries from overloading your system
-* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#authorization) and InfluxDB Enterprise user management)
+* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS 1.x](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#authorization) and InfluxDB Enterprise user management)
### Multi-organization and multi-user support
diff --git a/content/chronograf/v1.6/administration/managing-influxdb-users.md b/content/chronograf/v1.6/administration/managing-influxdb-users.md
index 65ac59b3d..5da0f38ad 100644
--- a/content/chronograf/v1.6/administration/managing-influxdb-users.md
+++ b/content/chronograf/v1.6/administration/managing-influxdb-users.md
@@ -58,7 +58,7 @@ Restart the InfluxDB service for your configuration changes to take effect:
### Step 3: Create an admin user.
-Because authentication is enabled, you need to create an [admin user](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-types-and-privileges) before you can do anything else in the database.
+Because authentication is enabled, you need to create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) before you can do anything else in the database.
Run the `curl` command below to create an admin user, replacing:
* `localhost` with the IP or hostname of your InfluxDB OSS instance or one of your InfluxDB Enterprise data nodes
@@ -92,7 +92,7 @@ On the **Chronograf Admin** page:

InfluxDB users are either admin users or non-admin users.
-See InfluxDB's [authentication and authorization](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-types-and-privileges) documentation for more information about those user types.
+See InfluxDB's [authentication and authorization](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) documentation for more information about those user types.
> ***Note:*** Note that Chronograf currently does not support assigning InfluxDB database `READ`or `WRITE` access to non-admin users.
>This is a known issue.
@@ -156,13 +156,13 @@ Assign permissions and roles to both admin and non-admin users.
#### AddRemoveNode
Permission to add or remove nodes from a cluster.
-**Relevant `influxd-ctl` arguments**:
-[`add-data`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#add-data),
-[`add-meta`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#add-meta),
-[`join`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#join),
-[`remove-data`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#remove-data),
-[`remove-meta`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#remove-meta), and
-[`leave`](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#leave)
+**Relevant `influxd-ctl` commands**:
+[`add-data`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#add-data),
+[`add-meta`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#add-meta),
+[`join`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#join),
+[`remove-data`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#remove-data),
+[`remove-meta`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#remove-meta), and
+[`leave`](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#leave)
**Pages in Chronograf that require this permission**: NA
@@ -170,7 +170,7 @@ Permission to add or remove nodes from a cluster.
Permission to copy shards.
**Relevant `influxd-ctl` arguments**:
-[copy-shard](/{{< latest "enterprise_influxdb" >}}/features/cluster-commands/#copy-shard)
+[copy-shard](/{{< latest "enterprise_influxdb" >}}/administration/cluster-commands/#copy-shard)
**Pages in Chronograf that require this permission**: NA
@@ -189,15 +189,15 @@ Permission to create databases, create [retention policies](/{{< latest "influxd
Permission to manage users and roles; create users, drop users, grant admin status to users, grant permissions to users, revoke admin status from users, revoke permissions from users, change user passwords, view user permissions, and view users and their admin status.
**Relevant InfluxQL queries**:
-[`CREATE USER`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-management-commands),
-[`DROP USER`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#general-admin-and-non-admin-user-management),
-[`GRANT ALL PRIVILEGES`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-management-commands),
-[`GRANT [READ,WRITE,ALL]`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#non-admin-user-management),
-[`REVOKE ALL PRIVILEGES`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-management-commands),
-[`REVOKE [READ,WRITE,ALL]`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#non-admin-user-management),
-[`SET PASSWORD`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#general-admin-and-non-admin-user-management),
-[`SHOW GRANTS`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#non-admin-user-management), and
-[`SHOW USERS`](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-management-commands)
+[`CREATE USER`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-management-commands),
+[`DROP USER`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#general-admin-and-non-admin-user-management),
+[`GRANT ALL PRIVILEGES`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-management-commands),
+[`GRANT [READ,WRITE,ALL]`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#non-admin-user-management),
+[`REVOKE ALL PRIVILEGES`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-management-commands),
+[`REVOKE [READ,WRITE,ALL]`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#non-admin-user-management),
+[`SET PASSWORD`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#general-admin-and-non-admin-user-management),
+[`SHOW GRANTS`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#non-admin-user-management), and
+[`SHOW USERS`](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-management-commands)
**Pages in Chronograf that require this permission**: Data Explorer, Dashboards, Users and Roles on the Admin page
diff --git a/content/chronograf/v1.6/administration/transition-web-admin-interface.md b/content/chronograf/v1.6/administration/transition-web-admin-interface.md
index fee1ae694..3f91d0c6b 100644
--- a/content/chronograf/v1.6/administration/transition-web-admin-interface.md
+++ b/content/chronograf/v1.6/administration/transition-web-admin-interface.md
@@ -8,7 +8,7 @@ aliases:
- /chronograf/v1.6/guides/transition-web-admin-interface/
---
-Versions 1.3 and later of [InfluxDB](/{{< latest "influxdb" "v1" >}}/) and [InfluxDB Enterprise](/enterprise/latest/) do not support the [web admin interface](/{{< latest "influxdb" "v1" >}}/tools/web_admin/), the builtin user interface for writing and querying data in InfluxDB.
+Versions 1.3 and later of [InfluxDB](/{{< latest "influxdb" "v1" >}}/) and [InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/) do not support the [web admin interface](https://archive.docs.influxdata.com/influxdb/v1.2/tools/web_admin/), the builtin user interface for writing and querying data in InfluxDB.
Chronograf replaces the web admin interface with improved tooling for querying data, writing data, and database management.
The following sections describe the Chronograf features that relate to the web admin interface:
diff --git a/content/chronograf/v1.6/guides/analyzing-logs.md b/content/chronograf/v1.6/guides/analyzing-logs.md
index b3474cf57..18e6aca33 100644
--- a/content/chronograf/v1.6/guides/analyzing-logs.md
+++ b/content/chronograf/v1.6/guides/analyzing-logs.md
@@ -11,7 +11,7 @@ Chronograf gives you the ability to view, search, filter, visualize, and analyze
This helps to recognize and diagnose patterns, then quickly dive into logged events that lead up to events.
## Logging setup
-Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/inputs/):
+Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/#input-plugins):
[syslog](https://github.com/influxdata/telegraf/tree/release-1.7/plugins/inputs/syslog)
diff --git a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
index 5ecca204d..edfcf340b 100644
--- a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
+++ b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
@@ -80,7 +80,7 @@ Next, start the InfluxDB process:
#### Step 4: Create an admin user
-Create an [admin user](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
+Create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
Because you enabled authentication, you must perform this step before moving on to the next section.
Run the command below to create an admin user, replacing `chronothan` and `supersecret` with your own username and password.
Note that the password requires single quotes.
diff --git a/content/chronograf/v1.7/_index.md b/content/chronograf/v1.7/_index.md
index e2ca75519..bdf424f19 100644
--- a/content/chronograf/v1.7/_index.md
+++ b/content/chronograf/v1.7/_index.md
@@ -38,7 +38,7 @@ Chronograf offers a UI for [Kapacitor](https://github.com/influxdata/kapacitor),
* Create and delete databases and retention policies
* View currently-running queries and stop inefficient queries from overloading your system
-* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#authorization) and InfluxEnterprise user management)
+* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#authorization) and InfluxDB Enterprise user management)
### Multi-organization and multi-user support
diff --git a/content/chronograf/v1.7/about_the_project/release-notes-changelog.md b/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
index 818fd9d2c..017b93ced 100644
--- a/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
@@ -919,7 +919,7 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
### Features
- * Add line-protocol proxy for InfluxDB/InfluxEnterprise Cluster data sources
+ * Add line-protocol proxy for InfluxDB/InfluxDB Enterprise Cluster data sources
* Add `:dashboardTime:` to support cell-specific time ranges on dashboards
* Add support for enabling and disabling [TICKscripts that were created outside Chronograf](/chronograf/v1.7/guides/advanced-kapacitor/#tickscript-management)
* Allow users to delete Kapacitor configurations
diff --git a/content/chronograf/v1.7/administration/chrono-on-clusters.md b/content/chronograf/v1.7/administration/chrono-on-clusters.md
index 22e93e47b..37b46bb90 100644
--- a/content/chronograf/v1.7/administration/chrono-on-clusters.md
+++ b/content/chronograf/v1.7/administration/chrono-on-clusters.md
@@ -19,4 +19,4 @@ Enter the HTTP bind address of one of your cluster's meta nodes into that input
Note that the example above assumes that you do not have authentication enabled.
If you have authentication enabled, the form requires username and password information.
-For details about monitoring InfluxEnterprise clusters, see [Monitoring InfluxDB Enterprise clusters](/chronograf/v1.7/guides/monitoring-influxenterprise-clusters).
+For details about monitoring InfluxDB Enterprise clusters, see [Monitoring InfluxDB Enterprise clusters](/chronograf/v1.7/guides/monitoring-influxenterprise-clusters).
diff --git a/content/chronograf/v1.7/administration/managing-chronograf-users.md b/content/chronograf/v1.7/administration/managing-chronograf-users.md
index af7c9d816..4d9df918e 100644
--- a/content/chronograf/v1.7/administration/managing-chronograf-users.md
+++ b/content/chronograf/v1.7/administration/managing-chronograf-users.md
@@ -31,7 +31,7 @@ menu:
## Managing Chronograf users and roles
-> ***Note:*** Support for organizations and user roles is available in Chronograf 1.4 or later. First, OAuth 2.0 authentication must be configured (if it is, you'll see the Chronograf Admin tab on the Admin menu). For more information, see [Managing security] (/chronograf/v1.7/administration/managing-security/).
+> ***Note:*** Support for organizations and user roles is available in Chronograf 1.4 or later. First, OAuth 2.0 authentication must be configured (if it is, you'll see the Chronograf Admin tab on the Admin menu). For more information, see [Managing security](/chronograf/v1.7/administration/managing-security/).
Chronograf includes four organization-bound user roles and one cross-organization SuperAdmin status. In an organization, admins (with the `admin` role) or users with SuperAdmin status can create, update, and assign roles to a user or remove a role assignment.
diff --git a/content/chronograf/v1.7/administration/managing-influxdb-users.md b/content/chronograf/v1.7/administration/managing-influxdb-users.md
index 1206c718e..2c9fd6bd1 100644
--- a/content/chronograf/v1.7/administration/managing-influxdb-users.md
+++ b/content/chronograf/v1.7/administration/managing-influxdb-users.md
@@ -23,9 +23,9 @@ The **Chronograf Admin** provides InfluxDB user management for InfluxDB OSS and
## Enabling authentication
Follow the steps below to enable authentication.
-The steps are the same for InfluxDB OSS instances and InfluxEnterprise clusters.
+The steps are the same for InfluxDB OSS instances and InfluxDB Enterprise clusters.
-> ***InfluxEnterprise clusters:***
+> ***InfluxDB Enterprise clusters:***
> Repeat the first three steps for each data node in a cluster.
### Step 1: Enable authentication.
@@ -60,7 +60,7 @@ Restart the InfluxDB service for your configuration changes to take effect:
Because authentication is enabled, you need to create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) before you can do anything else in the database.
Run the `curl` command below to create an admin user, replacing:
-* `localhost` with the IP or hostname of your InfluxDB OSS instance or one of your InfluxEnterprise data nodes
+* `localhost` with the IP or hostname of your InfluxDB OSS instance or one of your InfluxDB Enterprise data nodes
* `chronothan` with your own username
* `supersecret` with your own password (note that the password requires single quotes)
@@ -273,8 +273,8 @@ Permission to create, drop, and view [subscriptions](/{{< latest "influxdb" "v1"
Permission to view cluster statistics and diagnostics.
**Relevant InfluxQL queries**:
-[`SHOW DIAGNOSTICS`](/influxdb/administration/server_monitoring/#show-diagnostics) and
-[`SHOW STATS`](/influxdb/administration/server_monitoring/#show-stats)
+[`SHOW DIAGNOSTICS`](/{{< latest "influxdb" "v1" >}}/administration/server_monitoring/#show-diagnostics) and
+[`SHOW STATS`](/{{< latest "influxdb" "v1" >}}/administration/server_monitoring/#show-stats)
**Pages in Chronograf that require this permission**: Data Explorer, Dashboards
diff --git a/content/chronograf/v1.7/administration/managing-security.md b/content/chronograf/v1.7/administration/managing-security.md
index d8b5e12eb..63c537919 100644
--- a/content/chronograf/v1.7/administration/managing-security.md
+++ b/content/chronograf/v1.7/administration/managing-security.md
@@ -46,7 +46,7 @@ Chronograf will use this secret to generate the JWT Signature for all access tok
TOKEN_SECRET=
```
-> ***InfluxEnterprise clusters:*** If you are running multiple Chronograf servers in a high availability configuration,
+> ***InfluxDB Enterprise clusters:*** If you are running multiple Chronograf servers in a high availability configuration,
> set the `TOKEN_SECRET` environment variable on each server to ensure that users can stay logged in.
### JWKS Signature Verification (optional)
diff --git a/content/chronograf/v1.7/administration/transition-web-admin-interface.md b/content/chronograf/v1.7/administration/transition-web-admin-interface.md
index b2ddd8950..d64d174e0 100644
--- a/content/chronograf/v1.7/administration/transition-web-admin-interface.md
+++ b/content/chronograf/v1.7/administration/transition-web-admin-interface.md
@@ -8,7 +8,7 @@ aliases:
- /chronograf/v1.7/guides/transition-web-admin-interface/
---
-Versions 1.3 and later of [InfluxDB](/{{< latest "influxdb" "v1" >}}/) and [InfluxEnterprise](/enterprise/latest/) do not support the web admin interface, the previous built-in user interface for writing and querying data in InfluxDB.
+Versions 1.3 and later of [InfluxDB](/{{< latest "influxdb" "v1" >}}/) and [InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/) do not support the web admin interface, the previous built-in user interface for writing and querying data in InfluxDB.
Chronograf replaces the web admin interface with improved tooling for querying data, writing data, and database management.
The following sections describe the Chronograf features that relate to the web admin interface:
@@ -86,8 +86,8 @@ The `Admin` page allows users to:
* View, create, and delete users
* Change user passwords
* Assign and remove permissions to or from a user
-* Create, edit, and delete roles (available in InfluxEnterprise only)
-* Assign and remove roles to or from a user (available in InfluxEnterprise only)
+* Create, edit, and delete roles (available in InfluxDB Enterprise only)
+* Assign and remove roles to or from a user (available in InfluxDB Enterprise only)

diff --git a/content/chronograf/v1.7/guides/analyzing-logs.md b/content/chronograf/v1.7/guides/analyzing-logs.md
index 3f7354a77..56da1c06f 100644
--- a/content/chronograf/v1.7/guides/analyzing-logs.md
+++ b/content/chronograf/v1.7/guides/analyzing-logs.md
@@ -11,7 +11,7 @@ Chronograf gives you the ability to view, search, filter, visualize, and analyze
This helps to recognize and diagnose patterns, then quickly dive into logged events that lead up to events.
## Logging setup
-Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/inputs/):
+Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/#input-plugins):
[syslog](https://github.com/influxdata/telegraf/tree/release-1.7/plugins/inputs/syslog)
diff --git a/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md
index 852276864..282d4a7cb 100644
--- a/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md
+++ b/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md
@@ -10,15 +10,15 @@ menu:
---
-[InfluxEnterprise](/{{< latest "enterprise_influxdb" >}}/) offers high availability and a highly scalable clustering solution for your time series data needs.
+[InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/) offers high availability and a highly scalable clustering solution for your time series data needs.
Use Chronograf to assess your cluster's health and to monitor the infrastructure behind your project.
-This guide offers step-by-step instructions for using Chronograf, [InfluxDB](/{{< latest "influxdb" "v1" >}}/), and [Telegraf](/{{< latest "telegraf" >}}/) to monitor data nodes in your InfluxEnterprise cluster.
+This guide offers step-by-step instructions for using Chronograf, [InfluxDB](/{{< latest "influxdb" "v1" >}}/), and [Telegraf](/{{< latest "telegraf" >}}/) to monitor data nodes in your InfluxDB Enterprise cluster.
## Requirements
-You have a fully-functioning InfluxEnterprise cluster with authentication enabled.
-See the InfluxEnterprise documentation for
+You have a fully-functioning InfluxDB Enterprise cluster with authentication enabled.
+See the InfluxDB Enterprise documentation for
[detailed setup instructions](/{{< latest "enterprise_influxdb" >}}/production_installation/).
This guide uses an InfluxData Enterprise cluster with three meta nodes and three data nodes; the steps are also applicable to other cluster configurations.
@@ -34,7 +34,7 @@ Before we begin, here's an overview of the final monitoring setup:

-The diagram above shows an InfluxEnterprise cluster that consists of three meta nodes (M) and three data nodes (D).
+The diagram above shows an InfluxDB Enterprise cluster that consists of three meta nodes (M) and three data nodes (D).
Each data node has its own [Telegraf](/{{< latest "telegraf" >}}/) instance (T).
Each Telegraf instance is configured to collect node CPU, disk, and memory data using the Telegraf [system stats](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system) input plugin.
@@ -80,7 +80,7 @@ Next, start the InfluxDB process:
#### Step 4: Create an admin user
-Create an [admin user](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
+Create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
Because you enabled authentication, you must perform this step before moving on to the next section.
Run the command below to create an admin user, replacing `chronothan` and `supersecret` with your own username and password.
Note that the password requires single quotes.
diff --git a/content/chronograf/v1.7/guides/querying-data.md b/content/chronograf/v1.7/guides/querying-data.md
index d5e105b06..abf25f08f 100644
--- a/content/chronograf/v1.7/guides/querying-data.md
+++ b/content/chronograf/v1.7/guides/querying-data.md
@@ -33,7 +33,7 @@ InfluxQL is a SQL-like query language you can use to interact with data in Influ
## 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).
+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](/{{< latest "influxdb" "v2" >}}/query-data/get-started).
> ***Note:*** Flux v0.7 is a technical preview included with [InfluxDB v1.7](/influxdb/v1.7). It is still in active development and many functions provided by InfluxQL and TICKscript have yet to be implemented.
diff --git a/content/chronograf/v1.7/guides/using-precreated-dashboards.md b/content/chronograf/v1.7/guides/using-precreated-dashboards.md
index bbb88a026..5c1724843 100644
--- a/content/chronograf/v1.7/guides/using-precreated-dashboards.md
+++ b/content/chronograf/v1.7/guides/using-precreated-dashboards.md
@@ -65,7 +65,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## apache
-**Required Telegraf plugin:** [Apache input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#apache-http-server)
+**Required Telegraf plugin:** [Apache input plugin](/{{< latest "telegraf" >}}/plugins/#apache)
`apache.json`
@@ -75,7 +75,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## consul
-**Required Telegraf plugin:** [Consul input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#consul)
+**Required Telegraf plugin:** [Consul input plugin](/{{< latest "telegraf" >}}/plugins/#consul)
`consul_http.json`
@@ -95,7 +95,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## docker
-**Required Telegraf plugin:** [Docker input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#docker)
+**Required Telegraf plugin:** [Docker input plugin](/{{< latest "telegraf" >}}/plugins/#docker)
`docker.json`
@@ -115,7 +115,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## elasticsearch
-**Required Telegraf plugin:** [Elasticsearch input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#elasticsearch)
+**Required Telegraf plugin:** [Elasticsearch input plugin](/{{< latest "telegraf" >}}/plugins/#elasticsearch)
`elasticsearch.json`
@@ -132,7 +132,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## haproxy
-**Required Telegraf plugin:** [HAProxy input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#haproxy)
+**Required Telegraf plugin:** [HAProxy input plugin](/{{< latest "telegraf" >}}/plugins/#haproxy)
`haproxy.json`
@@ -154,7 +154,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## iis
-**Required Telegraf plugin:** [Windows Performance Counters input plugin](/telegraf/v1.8/plugins/inputs/#windows-performance-counters)
+**Required Telegraf plugin:** [Windows Performance Counters input plugin](/{{< latest "telegraf" >}}/plugins/#win_perf_counters)
`win_websvc.json`
@@ -162,7 +162,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## influxdb
-**Required Telegraf plugin:** [InfluxDB input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#influxdb-v-1)
+**Required Telegraf plugin:** [InfluxDB input plugin](/{{< latest "telegraf" >}}/plugins/#influxdb)
`influxdb_database.json`
@@ -207,7 +207,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## Memcached (`memcached`)
-**Required Telegraf plugin:** [Memcached input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#memcached)
+**Required Telegraf plugin:** [Memcached input plugin](/{{< latest "telegraf" >}}/plugins/#memcached)
`memcached.json`
@@ -227,7 +227,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## mesos
-**Required Telegraf plugin:** [Mesos input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#mesos)
+**Required Telegraf plugin:** [Mesos input plugin](/{{< latest "telegraf" >}}/plugins/#mesos)
`mesos.json`
@@ -242,7 +242,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## mongodb
-**Required Telegraf plugin:** [MongoDB input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#mongodb)
+**Required Telegraf plugin:** [MongoDB input plugin](/{{< latest "telegraf" >}}/plugins/#mongodb)
`mongodb.json`
@@ -254,7 +254,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## mysql
-**Required Telegraf plugin:** [MySQL input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#mysql)
+**Required Telegraf plugin:** [MySQL input plugin](/{{< latest "telegraf" >}}/plugins/#mysql)
`mysql.json`
@@ -265,7 +265,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## nginx
-**Required Telegraf plugin:** [NGINX input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#nginx)
+**Required Telegraf plugin:** [NGINX input plugin](/{{< latest "telegraf" >}}/plugins/#nginx)
`nginx.json`
@@ -276,7 +276,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## nsq
-**Required Telegraf plugin:** [NSQ input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#nsq)
+**Required Telegraf plugin:** [NSQ input plugin](/{{< latest "telegraf" >}}/plugins/#nsq)
`nsq_channel.json`
@@ -297,7 +297,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## phpfpm
-**Required Telegraf plugin:** [PHPfpm input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#php-fpm)
+**Required Telegraf plugin:** [PHPfpm input plugin](/{{< latest "telegraf" >}}/plugins/#phpfpm)
`phpfpm.json`
@@ -309,7 +309,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## ping
-**Required Telegraf plugin:** [Ping input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#ping)
+**Required Telegraf plugin:** [Ping input plugin](/{{< latest "telegraf" >}}/plugins/#ping)
`ping.json`
@@ -318,7 +318,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## postgresql
-**Required Telegraf plugin:** [PostgreSQL input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#postgresql)
+**Required Telegraf plugin:** [PostgreSQL input plugin](/{{< latest "telegraf" >}}/plugins/#postgresql)
`postgresql.json`
@@ -329,7 +329,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## rabbitmq
-**Required Telegraf plugin:** [RabbitMQ input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#rabbitmq)
+**Required Telegraf plugin:** [RabbitMQ input plugin](/{{< latest "telegraf" >}}/plugins/#rabbitmq)
`rabbitmq.json`
@@ -340,7 +340,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## redis
-**Required Telegraf plugin:** [Redis input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#redis)
+**Required Telegraf plugin:** [Redis input plugin](/{{< latest "telegraf" >}}/plugins/#redis)
`redis.json`
@@ -352,7 +352,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## riak
-**Required Telegraf plugin:** [Riak input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#riak)
+**Required Telegraf plugin:** [Riak input plugin](/{{< latest "telegraf" >}}/plugins/#riak)
`riak.json`
@@ -371,7 +371,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### cpu
-**Required Telegraf plugin:** [CPU input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#cpu)
+**Required Telegraf plugin:** [CPU input plugin](/{{< latest "telegraf" >}}/plugins/#cpu)
`cpu.json`
@@ -381,13 +381,13 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
`disk.json`
-**Required Telegraf plugin:** [Disk input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#disk)
+**Required Telegraf plugin:** [Disk input plugin](/{{< latest "telegraf" >}}/plugins/#disk)
* "System - Disk used %"
### diskio
-**Required Telegraf plugin:** [DiskIO input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#diskio)
+**Required Telegraf plugin:** [DiskIO input plugin](/{{< latest "telegraf" >}}/plugins/#diskio)
`diskio.json`
@@ -396,7 +396,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### mem
-**Required Telegraf plugin:** [Mem input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#mem)
+**Required Telegraf plugin:** [Mem input plugin](/{{< latest "telegraf" >}}/plugins/#mem)
`mem.json`
@@ -404,7 +404,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### net
-**Required Telegraf plugin:** [Net input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#net)
+**Required Telegraf plugin:** [Net input plugin](/{{< latest "telegraf" >}}/plugins/#net)
`net.json`
@@ -413,7 +413,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### netstat
-**Required Telegraf plugin:** [Netstat input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#netstat)
+**Required Telegraf plugin:** [Netstat input plugin](/{{< latest "telegraf" >}}/plugins/#netstat)
`netstat.json`
@@ -422,7 +422,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### processes
-**Required Telegraf plugin:** [Processes input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#processes)
+**Required Telegraf plugin:** [Processes input plugin](/{{< latest "telegraf" >}}/plugins/#processes)
`processes.json`
@@ -430,7 +430,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### procstat
-**Required Telegraf plugin:** [Procstat input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#procstat)
+**Required Telegraf plugin:** [Procstat input plugin](/{{< latest "telegraf" >}}/plugins/#procstat)
`procstat.json`
@@ -439,7 +439,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
### system
-**Required Telegraf plugin:** [Procstat input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#procstat)
+**Required Telegraf plugin:** [Procstat input plugin](/{{< latest "telegraf" >}}/plugins/#procstat)
`load.json`
@@ -447,7 +447,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## varnish
-**Required Telegraf plugin:** [Varnish](/{{< latest "telegraf" >}}/plugins/inputs/#varnish)
+**Required Telegraf plugin:** [Varnish](/{{< latest "telegraf" >}}/plugins/#varnish)
`varnish.json`
@@ -456,7 +456,7 @@ See [Telegraf configuration](https://github.com/influxdata/telegraf/blob/master/
## win_system
-**Required Telegraf plugin:** [Windows Performance Counters input plugin](/{{< latest "telegraf" >}}/plugins/inputs/#windows-performance-counters)
+**Required Telegraf plugin:** [Windows Performance Counters input plugin](/{{< latest "telegraf" >}}/plugins/#win_perf_counters)
`win_cpu.json`
diff --git a/content/chronograf/v1.7/introduction/installation.md b/content/chronograf/v1.7/introduction/installation.md
index 169c52ad4..de85bb25f 100644
--- a/content/chronograf/v1.7/introduction/installation.md
+++ b/content/chronograf/v1.7/introduction/installation.md
@@ -72,7 +72,7 @@ sudo yum localinstall chronograf-.x86_64.rpm
2. Fill out the form with the following details:
* **Connection String**: Enter the hostname or IP of the machine that InfluxDB is running on, and be sure to include InfluxDB's default port `8086`.
* **Connection Name**: Enter a name for your connection string.
- * **Username** and **Password**: These fields can remain blank unless you've [enabled authentication](/influxdb/v1.7/administration/authentication_and_authorization.md) in InfluxDB.
+ * **Username** and **Password**: These fields can remain blank unless you've [enabled authentication](/influxdb/v1.7/administration/authentication_and_authorization) in InfluxDB.
* **Telegraf Database Name**: Optionally, enter a name for your Telegraf database. The default name is Telegraf.
3. Click **Add Source**.
diff --git a/content/chronograf/v1.7/troubleshooting/frequently-asked-questions.md b/content/chronograf/v1.7/troubleshooting/frequently-asked-questions.md
index da7fa6fda..ba7bed0b5 100644
--- a/content/chronograf/v1.7/troubleshooting/frequently-asked-questions.md
+++ b/content/chronograf/v1.7/troubleshooting/frequently-asked-questions.md
@@ -7,9 +7,9 @@ menu:
parent: Troubleshooting
---
-## How do I connect Chronograf to an InfluxEnterprise cluster?
+## How do I connect Chronograf to an InfluxDB Enterprise cluster?
-The connection details form requires additional information when connecting Chronograf to an [InfluxEnterprise cluster](/{{< latest "enterprise_influxdb" >}}/).
+The connection details form requires additional information when connecting Chronograf to an [InfluxDB Enterprise cluster](/{{< latest "enterprise_influxdb" >}}/).
When you enter the InfluxDB HTTP bind address in the `Connection String` input, Chronograf automatically checks if that InfluxDB instance is a data node.
If it is a data node, Chronograf automatically adds the `Meta Service Connection URL` input to the connection details form.
@@ -19,4 +19,4 @@ Enter the HTTP bind address of one of your cluster's meta nodes into that input
Note that the example above assumes that you do not have authentication enabled.
If you have authentication enabled, the form requires username and password information.
-For more details about monitoring an InfluxEnterprise cluster, see the [Monitor an InfluxEnterprise Cluster](/chronograf/v1.7/guides/monitoring-influxenterprise-clusters/) guide.
+For more details about monitoring an InfluxDB Enterprise cluster, see the [Monitor an InfluxDB Enterprise Cluster](/chronograf/v1.7/guides/monitoring-influxenterprise-clusters/) guide.
diff --git a/content/chronograf/v1.8/_index.md b/content/chronograf/v1.8/_index.md
index e1d0506bf..9079a2395 100644
--- a/content/chronograf/v1.8/_index.md
+++ b/content/chronograf/v1.8/_index.md
@@ -42,7 +42,7 @@ Chronograf offers a UI for [Kapacitor](https://github.com/influxdata/kapacitor),
* Create and delete databases and retention policies
* View currently-running queries and stop inefficient queries from overloading your system
-* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#authorization) and InfluxEnterprise user management)
+* Create, delete, and assign permissions to users (Chronograf supports [InfluxDB OSS](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#authorization) and InfluxDB Enterprise user management)
### Multi-organization and multi-user support
diff --git a/content/chronograf/v1.8/about_the_project/release-notes-changelog.md b/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
index eacf86525..463739267 100644
--- a/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
@@ -155,7 +155,7 @@ TLS1.2 is now the default minimum required TLS version. If you have clients that
### Features
-- Update to [Flux v0.65.0](/flux/v0.65/about_the_project/releasenotes-changelog/#v0-65-0-2020-03-27).
+- Update to Flux v0.65.0.
### Bug Fixes
@@ -1112,7 +1112,7 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
### Features
- * Add line-protocol proxy for InfluxDB/InfluxEnterprise Cluster data sources
+ * Add line-protocol proxy for InfluxDB/InfluxDB Enterprise Cluster data sources
* Add `:dashboardTime:` to support cell-specific time ranges on dashboards
* Add support for enabling and disabling [TICKscripts that were created outside Chronograf](/chronograf/v1.8/guides/advanced-kapacitor/#tickscript-management)
* Allow users to delete Kapacitor configurations
diff --git a/content/chronograf/v1.8/administration/chrono-on-clusters.md b/content/chronograf/v1.8/administration/chrono-on-clusters.md
index 7c7d74240..9b5601996 100644
--- a/content/chronograf/v1.8/administration/chrono-on-clusters.md
+++ b/content/chronograf/v1.8/administration/chrono-on-clusters.md
@@ -19,4 +19,4 @@ Enter the HTTP bind address of one of your cluster's meta nodes into that input
Note that the example above assumes that you do not have authentication enabled.
If you have authentication enabled, the form requires username and password information.
-For details about monitoring InfluxEnterprise clusters, see [Monitoring InfluxDB Enterprise clusters](/{{chronograf/v1.8/guides/monitoring-influxenterprise-clusters).
+For details about monitoring InfluxDB Enterprise clusters, see [Monitoring InfluxDB Enterprise clusters](/chronograf/v1.8/guides/monitoring-influxenterprise-clusters).
diff --git a/content/chronograf/v1.8/administration/managing-chronograf-users.md b/content/chronograf/v1.8/administration/managing-chronograf-users.md
index 7c5198abb..db6e1624a 100644
--- a/content/chronograf/v1.8/administration/managing-chronograf-users.md
+++ b/content/chronograf/v1.8/administration/managing-chronograf-users.md
@@ -32,7 +32,7 @@ menu:
## Manage Chronograf users and roles
-> ***Note:*** Support for organizations and user roles is available in Chronograf 1.4 or later. First, OAuth 2.0 authentication must be configured (if it is, you'll see the Chronograf Admin tab on the Admin menu). For more information, see [Managing security] (/chronograf/v1.8/administration/managing-security/).
+> ***Note:*** Support for organizations and user roles is available in Chronograf 1.4 or later. First, OAuth 2.0 authentication must be configured (if it is, you'll see the Chronograf Admin tab on the Admin menu). For more information, see [Managing security](/chronograf/v1.8/administration/managing-security/).
Chronograf includes four organization-bound user roles and one cross-organization SuperAdmin permission. In an organization, admins (with the `admin` role) or users with SuperAdmin permission can create, update, and assign roles to a user or remove a role assignment.
diff --git a/content/chronograf/v1.8/administration/managing-influxdb-users.md b/content/chronograf/v1.8/administration/managing-influxdb-users.md
index cb0de1461..34a11ea13 100644
--- a/content/chronograf/v1.8/administration/managing-influxdb-users.md
+++ b/content/chronograf/v1.8/administration/managing-influxdb-users.md
@@ -32,9 +32,9 @@ interfaces, CLIs, or APIs to complete administrative tasks.
## Enable authentication
Follow the steps below to enable authentication.
-The steps are the same for InfluxDB OSS instances and InfluxEnterprise clusters.
+The steps are the same for InfluxDB OSS instances and InfluxDB Enterprise clusters.
-> ***InfluxEnterprise clusters:***
+> ***InfluxDB Enterprise clusters:***
> Repeat the first three steps for each data node in a cluster.
### Step 1: Enable authentication.
@@ -69,7 +69,7 @@ Restart the InfluxDB service for your configuration changes to take effect:
Because authentication is enabled, you need to create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) before you can do anything else in the database.
Run the `curl` command below to create an admin user, replacing:
-* `localhost` with the IP or hostname of your InfluxDB OSS instance or one of your InfluxEnterprise data nodes
+* `localhost` with the IP or hostname of your InfluxDB OSS instance or one of your InfluxDB Enterprise data nodes
* `chronothan` with your own username
* `supersecret` with your own password (note that the password requires single quotes)
@@ -282,8 +282,8 @@ Permission to create, drop, and view [subscriptions](/{{< latest "influxdb" "v1"
Permission to view cluster statistics and diagnostics.
**Relevant InfluxQL queries**:
-[`SHOW DIAGNOSTICS`](/influxdb/administration/server_monitoring/#show-diagnostics) and
-[`SHOW STATS`](/influxdb/administration/server_monitoring/#show-stats)
+[`SHOW DIAGNOSTICS`](/{{< latest "influxdb" "v1" >}}/administration/server_monitoring/#show-diagnostics) and
+[`SHOW STATS`](/{{< latest "influxdb" "v1" >}}/administration/server_monitoring/#show-stats)
**Pages in Chronograf that require this permission**: Data Explorer, Dashboards
diff --git a/content/chronograf/v1.8/administration/managing-security.md b/content/chronograf/v1.8/administration/managing-security.md
index 1be2c9c81..592cd8dc1 100644
--- a/content/chronograf/v1.8/administration/managing-security.md
+++ b/content/chronograf/v1.8/administration/managing-security.md
@@ -49,7 +49,7 @@ Chronograf will use this secret to generate the JWT Signature for all access tok
```
{{% note %}}
-***InfluxEnterprise clusters:*** If you are running multiple Chronograf servers in a high availability configuration,
+***InfluxDB Enterprise clusters:*** If you are running multiple Chronograf servers in a high availability configuration,
set the `TOKEN_SECRET` environment variable on each server to ensure that users can stay logged in.
{{% /note %}}
diff --git a/content/chronograf/v1.8/guides/analyzing-logs.md b/content/chronograf/v1.8/guides/analyzing-logs.md
index 2ef6d767c..740e7f590 100644
--- a/content/chronograf/v1.8/guides/analyzing-logs.md
+++ b/content/chronograf/v1.8/guides/analyzing-logs.md
@@ -11,7 +11,7 @@ Chronograf gives you the ability to view, search, filter, visualize, and analyze
This helps to recognize and diagnose patterns, then quickly dive into logged events that lead up to events.
## Logging setup
-Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/inputs/):
+Logs data is a first class citizen in InfluxDB and is populated using available log-related [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/#input-plugins):
[syslog](https://github.com/influxdata/telegraf/tree/release-1.8/plugins/inputs/syslog)
diff --git a/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md
index dbc86ef5d..8d378bfd7 100644
--- a/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md
+++ b/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md
@@ -10,15 +10,15 @@ menu:
---
-[InfluxEnterprise](/{{< latest "enterprise_influxdb" >}}/) offers high availability and a highly scalable clustering solution for your time series data needs.
+[InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/) offers high availability and a highly scalable clustering solution for your time series data needs.
Use Chronograf to assess your cluster's health and to monitor the infrastructure behind your project.
-This guide offers step-by-step instructions for using Chronograf, [InfluxDB](/{{< latest "influxdb" "v1" >}}/), and [Telegraf](/{{< latest "telegraf" >}}/) to monitor data nodes in your InfluxEnterprise cluster.
+This guide offers step-by-step instructions for using Chronograf, [InfluxDB](/{{< latest "influxdb" "v1" >}}/), and [Telegraf](/{{< latest "telegraf" >}}/) to monitor data nodes in your InfluxDB Enterprise cluster.
## Requirements
-You have a fully-functioning InfluxEnterprise cluster with authentication enabled.
-See the InfluxEnterprise documentation for
+You have a fully-functioning InfluxDB Enterprise cluster with authentication enabled.
+See the InfluxDB Enterprise documentation for
[detailed setup instructions](/{{< latest "enterprise_influxdb" >}}/production_installation/).
This guide uses an InfluxData Enterprise cluster with three meta nodes and three data nodes; the steps are also applicable to other cluster configurations.
@@ -34,7 +34,7 @@ Before we begin, here's an overview of the final monitoring setup:

-The diagram above shows an InfluxEnterprise cluster that consists of three meta nodes (M) and three data nodes (D).
+The diagram above shows an InfluxDB Enterprise cluster that consists of three meta nodes (M) and three data nodes (D).
Each data node has its own [Telegraf](/{{< latest "telegraf" >}}/) instance (T).
Each Telegraf instance is configured to collect node CPU, disk, and memory data using the Telegraf [system stats](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system) input plugin.
@@ -80,7 +80,7 @@ Next, start the InfluxDB process:
#### Step 4: Create an admin user
-Create an [admin user](/{{< latest "influxdb" "v1" >}}/query_language/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
+Create an [admin user](/{{< latest "influxdb" "v1" >}}/administration/authentication_and_authorization/#user-types-and-privileges) on your InfluxDB instance.
Because you enabled authentication, you must perform this step before moving on to the next section.
Run the command below to create an admin user, replacing `chronothan` and `supersecret` with your own username and password.
Note that the password requires single quotes.
diff --git a/content/chronograf/v1.8/guides/querying-data.md b/content/chronograf/v1.8/guides/querying-data.md
index 1fe27719a..093c98e72 100644
--- a/content/chronograf/v1.8/guides/querying-data.md
+++ b/content/chronograf/v1.8/guides/querying-data.md
@@ -42,7 +42,7 @@ For more information, see [InfluxQL support](/influxdb/cloud/query-data/influxql
## 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).
+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](/{{< latest "influxdb" "v2" >}}/query-data/get-started).
1. Open the Data Explorer and click **Add a Query**.
2. To the right of the source dropdown above the graph placeholder, select **Flux** as the source type.
diff --git a/content/chronograf/v1.8/troubleshooting/frequently-asked-questions.md b/content/chronograf/v1.8/troubleshooting/frequently-asked-questions.md
index 08681533f..028625d8f 100644
--- a/content/chronograf/v1.8/troubleshooting/frequently-asked-questions.md
+++ b/content/chronograf/v1.8/troubleshooting/frequently-asked-questions.md
@@ -8,9 +8,9 @@ menu:
parent: Troubleshoot
---
-## How do I connect Chronograf to an InfluxEnterprise cluster?
+## How do I connect Chronograf to an InfluxDB Enterprise cluster?
-The connection details form requires additional information when connecting Chronograf to an [InfluxEnterprise cluster](/{{< latest "enterprise_influxdb" >}}/).
+The connection details form requires additional information when connecting Chronograf to an [InfluxDB Enterprise cluster](/{{< latest "enterprise_influxdb" >}}/).
When you enter the InfluxDB HTTP bind address in the `Connection String` input, Chronograf automatically checks if that InfluxDB instance is a data node.
If it is a data node, Chronograf automatically adds the `Meta Service Connection URL` input to the connection details form.
@@ -20,4 +20,4 @@ Enter the HTTP bind address of one of your cluster's meta nodes into that input
Note that the example above assumes that you do not have authentication enabled.
If you have authentication enabled, the form requires username and password information.
-For more details about monitoring an InfluxEnterprise cluster, see the [Monitor an InfluxEnterprise Cluster](/chronograf/v1.8/guides/monitoring-influxenterprise-clusters/) guide.
+For more details about monitoring an InfluxDB Enterprise cluster, see the [Monitor an InfluxDB Enterprise Cluster](/chronograf/v1.8/guides/monitoring-influxenterprise-clusters/) guide.
diff --git a/content/enterprise_influxdb/v1.5/administration/backup-and-restore.md b/content/enterprise_influxdb/v1.5/administration/backup-and-restore.md
index ce6cf81cb..a9b100a80 100644
--- a/content/enterprise_influxdb/v1.5/administration/backup-and-restore.md
+++ b/content/enterprise_influxdb/v1.5/administration/backup-and-restore.md
@@ -317,7 +317,7 @@ Restored from my-incremental-backup/ in 66.715524ms, transferred 588800 bytes
In this example, our `telegraf` database was mistakenly dropped, but you have a recent backup so you've only lost a small amount of data.
-If [Telegraf](/telegraf/v1.5/) is still running, it will recreate the `telegraf` database shortly after the database is dropped.
+If [Telegraf](/{{< latest "telegraf" >}}/) is still running, it will recreate the `telegraf` database shortly after the database is dropped.
You might try to directly restore your `telegraf` backup just to find that you can't restore.
```
diff --git a/content/enterprise_influxdb/v1.5/administration/cluster-commands.md b/content/enterprise_influxdb/v1.5/administration/cluster-commands.md
index a4a942979..31d49f1df 100644
--- a/content/enterprise_influxdb/v1.5/administration/cluster-commands.md
+++ b/content/enterprise_influxdb/v1.5/administration/cluster-commands.md
@@ -153,7 +153,7 @@ Error: authorization failed.
Adds a data node to a cluster.
By default, `influxd-ctl` adds the specified data node to the local meta node's cluster.
-Use `add-data` instead of the [`join` argument](#join) when performing a [production installation](/enterprise_influxdb/v1.5/production_installation/data_node_installation/) of an InfluxEnterprise cluster.
+Use `add-data` instead of the [`join` argument](#join) when performing a [production installation](/enterprise_influxdb/v1.5/production_installation/data_node_installation/) of an InfluxDB Enterprise cluster.
#### Syntax
@@ -191,7 +191,7 @@ Added data node 3 at cluster-data-node:8088
Adds a meta node to a cluster.
By default, `influxd-ctl` adds the specified meta node to the local meta node's cluster.
-Use `add-meta` instead of the [`join` argument](#join) when performing a [Production Installation](/enterprise_influxdb/v1.5/production_installation/meta_node_installation/) of an InfluxEnterprise cluster.
+Use `add-meta` instead of the [`join` argument](#join) when performing a [Production Installation](/enterprise_influxdb/v1.5/production_installation/meta_node_installation/) of an InfluxDB Enterprise cluster.
Resources: [Production installation](/enterprise_influxdb/v1.5/production_installation/data_node_installation/)
@@ -368,7 +368,7 @@ cluster-data-node-02:8088 cluster-data-node-03:8088 telegraf autogen 34
Joins a meta node and/or data node to a cluster.
By default, `influxd-ctl` joins the local meta node and/or data node into a new cluster.
-Use `join` instead of the [`add-meta`](#add-meta) or [`add-data`](#add-data) arguments when performing a [QuickStart Installation](/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation/) of an InfluxEnterprise cluster.
+Use `join` instead of the [`add-meta`](#add-meta) or [`add-data`](#add-data) arguments when performing a [QuickStart Installation](/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation/) of an InfluxDB Enterprise cluster.
#### Syntax
@@ -507,7 +507,7 @@ Killed shard copy 39 from cluster-data-node-02:8088 to cluster-data-node-03:8088
### `leave`
Removes a meta node and/or data node from the cluster.
-Use `leave` instead of the [`remove-meta`](#remove-meta) and [`remove-data`](#remove-data) arguments if you set up your InfluxEnterprise cluster with the [QuickStart Installation](/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation/) process.
+Use `leave` instead of the [`remove-meta`](#remove-meta) and [`remove-data`](#remove-data) arguments if you set up your InfluxDB Enterprise cluster with the [QuickStart Installation](/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation/) process.
{{% warn %}}The `leave` argument is destructive; it erases all metastore information from meta nodes and all data from data nodes.
Use `leave` only if you want to *permanently* remove a node from a cluster.
@@ -589,7 +589,7 @@ Successfully left cluster
### `remove-data`
Removes a data node from a cluster.
-Use `remove-data` instead of the [`leave`](#leave) argument if you set up your InfluxEnterprise cluster with the [Production Installation](/enterprise_influxdb/v1.5/production_installation/) process.
+Use `remove-data` instead of the [`leave`](#leave) argument if you set up your InfluxDB Enterprise cluster with the [Production Installation](/enterprise_influxdb/v1.5/production_installation/) process.
{{% warn %}}The `remove-data` argument is destructive; it erases all data from the specified data node.
Use `remove-data` only if you want to *permanently* remove a data node from a cluster.
@@ -624,7 +624,7 @@ Removed data node at cluster-data-node-03:8088
### `remove-meta`
Removes a meta node from the cluster.
-Use `remove-meta` instead of the [`leave`](#leave) command if you set up your InfluxEnterprise cluster with the [Production Installation](/enterprise_influxdb/v1.5/production_installation/) process.
+Use `remove-meta` instead of the [`leave`](#leave) command if you set up your InfluxDB Enterprise cluster with the [Production Installation](/enterprise_influxdb/v1.5/production_installation/) process.
{{% warn %}}The `remove-meta` argument is destructive; it erases all metastore information from the specified meta node.
Use `remove-meta` only if you want to *permanently* remove a meta node from a cluster.
diff --git a/content/enterprise_influxdb/v1.5/administration/configuration.md b/content/enterprise_influxdb/v1.5/administration/configuration.md
index fbe53e237..9ef738a2c 100644
--- a/content/enterprise_influxdb/v1.5/administration/configuration.md
+++ b/content/enterprise_influxdb/v1.5/administration/configuration.md
@@ -194,7 +194,7 @@ Environment variable: `INFLUXDB_HOSTNAME`
## [enterprise]
The `[enterprise]` section contains the parameters for the meta node's
-registration with the [InfluxEnterprise License Portal](https://portal.influxdata.com/).
+registration with the [InfluxDB Enterprise License Portal](https://portal.influxdata.com/).
### license-key = ""
@@ -457,7 +457,7 @@ Environment variable: `INFLUXDB_GOSSIP_FREQUENCY`
## [enterprise]
The `[enterprise]` section contains the parameters for the meta node's
-registration with the [InfluxEnterprise License Portal](https://portal.influxdata.com/).
+registration with the [InfluxDB Enterprise License Portal](https://portal.influxdata.com/).
### license-key = ""
@@ -767,7 +767,7 @@ Environment variable: `INFLUXDB_SHARD_PRECREATION_ADVANCE_PERIOD`
By default, InfluxDB writes system monitoring data to the `_internal` database. If that database does not exist, InfluxDB creates it automatically. The `DEFAULT` retention policy on the `internal` database is seven days. To change the default seven-day retention policy, you must [create](/influxdb/v1.5/query_language/database_management/#retention-policy-management) it.
-For InfluxDB Enterprise production systems, InfluxData recommends including a dedicated InfluxDB (OSS) monitoring instance for monitoring InfluxEnterprise cluster nodes.
+For InfluxDB Enterprise production systems, InfluxData recommends including a dedicated InfluxDB (OSS) monitoring instance for monitoring InfluxDB Enterprise cluster nodes.
* On the dedicated InfluxDB monitoring instance, set `store-enabled = false` to avoid potential performance and storage issues.
* On each InfluxDB cluster node, install a Telegraf input plugin and Telegraf output plugin configured to report data to the dedicated InfluxDB monitoring instance.
@@ -909,7 +909,7 @@ Environment variable: `INFLUXDB_HTTP_MAX_CONNECTION_LIMIT`
See the [InfluxDB OSS documentation](/influxdb/v1.5/administration/config/#shared-secret).
-This setting is required and must match on each data node if the cluster is using the InfluxEnterprise Web Console.
+This setting is required and must match on each data node if the cluster is using the InfluxDB Enterprise Web Console.
Environment variable: `INFLUXDB_HTTP_SHARED_SECRET`
diff --git a/content/enterprise_influxdb/v1.5/administration/security.md b/content/enterprise_influxdb/v1.5/administration/security.md
index 40e063922..69d06d980 100644
--- a/content/enterprise_influxdb/v1.5/administration/security.md
+++ b/content/enterprise_influxdb/v1.5/administration/security.md
@@ -40,7 +40,7 @@ Resources:
## Secure your Host
### Ports
-For InfluxEnterprise Data Nodes, close all ports on each host except for port `8086`.
+For InfluxDB Enterprise Data Nodes, close all ports on each host except for port `8086`.
You can also use a proxy to port `8086`. By default, data nodes and meta nodes communicate with each other over '8088','8089',and'8091'
For InfluxDB Enterprise, [backuping and restoring](/enterprise_influxdb/v1.5/administration/backup-and-restore/) is performed from the meta nodes.
diff --git a/content/enterprise_influxdb/v1.5/administration/upgrading.md b/content/enterprise_influxdb/v1.5/administration/upgrading.md
index 576e89dde..a8afedf4f 100644
--- a/content/enterprise_influxdb/v1.5/administration/upgrading.md
+++ b/content/enterprise_influxdb/v1.5/administration/upgrading.md
@@ -231,4 +231,4 @@ rk-upgrading-03:8091 1.5.4_c1.5.4
```
If you have any issues upgrading your cluster, please do not hesitate to contact InfluxData Support at the email address
-provided to you when you received your InfluxEnterprise license.
+provided to you when you received your InfluxDB Enterprise license.
diff --git a/content/enterprise_influxdb/v1.5/concepts/clustering.md b/content/enterprise_influxdb/v1.5/concepts/clustering.md
index 80482f956..0ce8b2da4 100644
--- a/content/enterprise_influxdb/v1.5/concepts/clustering.md
+++ b/content/enterprise_influxdb/v1.5/concepts/clustering.md
@@ -9,11 +9,11 @@ menu:
parent: Concepts
---
-This document describes in detail how clustering works in InfluxEnterprise. It starts with a high level description of the different components of a cluster and then delves into the implementation details.
+This document describes in detail how clustering works in InfluxDB Enterprise. It starts with a high level description of the different components of a cluster and then delves into the implementation details.
## Architectural overview
-An InfluxEnterprise installation consists of three separate software processes: Data nodes, Meta nodes, and the Enterprise Web server. To run an InfluxDB cluster, only the meta and data nodes are required. Communication within a cluster looks like this:
+An InfluxDB Enterprise installation consists of three separate software processes: Data nodes, Meta nodes, and the Enterprise Web server. To run an InfluxDB cluster, only the meta and data nodes are required. Communication within a cluster looks like this:
{{< diagram >}}
flowchart TB
@@ -66,7 +66,7 @@ On disk, the data is always organized by `//}}/introduction/).
-If you are transitioning from the Enterprise Web Console to Chronograf and helpful [transition guide](/{{< latest "chronograf" >}}/guides/transition-web-admin-interface/) is available.
+If you are transitioning from the Enterprise Web Console to Chronograf, see how to [transition from the InfluxDB Web Admin Interface](/chronograf/v1.7/guides/transition-web-admin-interface/).
diff --git a/content/enterprise_influxdb/v1.5/features/users.md b/content/enterprise_influxdb/v1.5/features/users.md
index fd77583f8..207a9036b 100644
--- a/content/enterprise_influxdb/v1.5/features/users.md
+++ b/content/enterprise_influxdb/v1.5/features/users.md
@@ -43,7 +43,7 @@ view Chronograf.
Roles are groups of permissions.
A single role can belong to several cluster accounts.
-InfluxEnterprise clusters have two built-in roles:
+InfluxDB Enterprise clusters have two built-in roles:
#### Global Admin
@@ -60,7 +60,7 @@ permissions to:
* Rebalance
### Permissions
-InfluxEnterprise clusters have 16 permissions:
+InfluxDB Enterprise clusters have 16 permissions:
#### View Admin
Permission to view or edit admin screens.
@@ -114,7 +114,7 @@ The following table describes permissions required to execute the associated dat
|Determined by type of select statement|SelectStatement|
### Statement to Permission
-The following table describes database statements and the permissions required to execute them. It also describes whether these permissions apply just to InfluxDB (Database) or InfluxEnterprise (Cluster).
+The following table describes database statements and the permissions required to execute them. It also describes whether these permissions apply just to InfluxDB (Database) or InfluxDB Enterprise (Cluster).
|Statment|Permissions|Scope|
|---|---|---|
diff --git a/content/enterprise_influxdb/v1.5/guides/https_setup.md b/content/enterprise_influxdb/v1.5/guides/https_setup.md
index 7424c85b2..0c53d063e 100644
--- a/content/enterprise_influxdb/v1.5/guides/https_setup.md
+++ b/content/enterprise_influxdb/v1.5/guides/https_setup.md
@@ -8,30 +8,30 @@ menu:
---
This guide describes how to enable HTTPS for InfluxDB Enterprise.
-Setting up HTTPS secures the communication between clients and the InfluxEnterprise
+Setting up HTTPS secures the communication between clients and the InfluxDB Enterprise
server,
-and, in some cases, HTTPS verifies the authenticity of the InfluxEnterprise server to
+and, in some cases, HTTPS verifies the authenticity of the InfluxDB Enterprise server to
clients.
-If you plan on sending requests to InfluxEnterprise over a network, we
+If you plan on sending requests to InfluxDB Enterprise over a network, we
[strongly recommend](/enterprise_influxdb/v1.5/administration/security/)
that you set up HTTPS.
## Requirements
-To set up HTTPS with InfluxEnterprise, you'll need an existing or new InfluxEnterprise instance
+To set up HTTPS with InfluxDB Enterprise, you'll need an existing or new InfluxDB Enterprise instance
and a Transport Layer Security (TLS) certificate (also known as a Secured Sockets Layer (SSL) certificate).
-InfluxEnterprise supports three types of TLS/SSL certificates:
+InfluxDB Enterprise supports three types of TLS/SSL certificates:
* **Single domain certificates signed by a [Certificate Authority](https://en.wikipedia.org/wiki/Certificate_authority)**
- These certificates provide cryptographic security to HTTPS requests and allow clients to verify the identity of the InfluxEnterprise server.
- With this certificate option, every InfluxEnterprise instance requires a unique single domain certificate.
+ These certificates provide cryptographic security to HTTPS requests and allow clients to verify the identity of the InfluxDB Enterprise server.
+ With this certificate option, every InfluxDB Enterprise instance requires a unique single domain certificate.
* **Wildcard certificates signed by a Certificate Authority**
These certificates provide cryptographic security to HTTPS requests and allow clients to verify the identity of the InfluxDB server.
- Wildcard certificates can be used across multiple InfluxEnterprise instances on different servers.
+ Wildcard certificates can be used across multiple InfluxDB Enterprise instances on different servers.
* **Self-signed certificates**
@@ -39,13 +39,13 @@ InfluxEnterprise supports three types of TLS/SSL certificates:
Unlike CA-signed certificates, self-signed certificates only provide cryptographic security to HTTPS requests.
They do not allow clients to verify the identity of the InfluxDB server.
We recommend using a self-signed certificate if you are unable to obtain a CA-signed certificate.
- With this certificate option, every InfluxEnterprise instance requires a unique self-signed certificate.
+ With this certificate option, every InfluxDB Enterprise instance requires a unique self-signed certificate.
-Regardless of your certificate's type, InfluxEnterprise supports certificates composed of
+Regardless of your certificate's type, InfluxDB Enterprise supports certificates composed of
a private key file (`.key`) and a signed certificate file (`.crt`) file pair, as well as certificates
that combine the private key file and the signed certificate file into a single bundled file (`.pem`).
-The following two sections outline how to set up HTTPS with InfluxEnterprise [using a CA-signed
+The following two sections outline how to set up HTTPS with InfluxDB Enterprise [using a CA-signed
certificate](#setup-https-with-a-ca-signed-certificate) and [using a self-signed certificate](#setup-https-with-a-self-signed-certificate)
on Ubuntu 16.04.
Specific steps may be different for other operating systems.
@@ -130,14 +130,14 @@ Second, Configure the Data Nodes to use HTTPS when communicating with the Meta N
meta-tls-enabled = true
```
-#### Step 5: Restart InfluxEnterprise
+#### Step 5: Restart InfluxDB Enterprise
-Restart the InfluxEnterprise meta node processes for the configuration changes to take effect:
+Restart the InfluxDB Enterprise meta node processes for the configuration changes to take effect:
```
sudo systemctl start influxdb-meta
```
-Restart the InfluxEnterprise data node processes for the configuration changes to take effect:
+Restart the InfluxDB Enterprise data node processes for the configuration changes to take effect:
```
sudo systemctl restart influxdb
```
@@ -169,7 +169,7 @@ enterprise-meta-03:8091 1.x.y-c1.x.z
```
-Next, verify that HTTPS is working by connecting to InfluxEnterprise with the [CLI tool](/influxdb/v1.5/tools/shell/):
+Next, verify that HTTPS is working by connecting to InfluxDB Enterprise with the [CLI tool](/influxdb/v1.5/tools/shell/):
```
influx -ssl -host .com
```
@@ -181,7 +181,7 @@ InfluxDB shell version: 1.x.y
>
```
-That's it! You've successfully set up HTTPS with InfluxEnterprise.
+That's it! You've successfully set up HTTPS with InfluxDB Enterprise.
## Setup HTTPS with a Self-Signed Certificate
@@ -189,7 +189,7 @@ That's it! You've successfully set up HTTPS with InfluxEnterprise.
The following command generates a private key file (`.key`) and a self-signed
certificate file (`.crt`) which remain valid for the specified `NUMBER_OF_DAYS`.
-It outputs those files to InfluxEnterprise's default certificate file paths and gives them
+It outputs those files to InfluxDB Enterprise's default certificate file paths and gives them
the required permissions.
```
@@ -273,14 +273,14 @@ Second, Configure the Data Nodes to use HTTPS when communicating with the Meta N
meta-insecure-tls = true
```
-#### Step 4: Restart InfluxEnterprise
+#### Step 4: Restart InfluxDB Enterprise
-Restart the InfluxEnterprise meta node processes for the configuration changes to take effect:
+Restart the InfluxDB Enterprise meta node processes for the configuration changes to take effect:
```
sudo systemctl restart influxdb-meta
```
-Restart the InfluxEnterprise data node processes for the configuration changes to take effect:
+Restart the InfluxDB Enterprise data node processes for the configuration changes to take effect:
```
sudo systemctl restart influxdb
```
@@ -312,7 +312,7 @@ enterprise-meta-03:8091 1.x.y-c1.x.z
```
-Next, verify that HTTPS is working by connecting to InfluxEnterprise with the [CLI tool](/influxdb/v1.5/tools/shell/):
+Next, verify that HTTPS is working by connecting to InfluxDB Enterprise with the [CLI tool](/influxdb/v1.5/tools/shell/):
```
influx -ssl -unsafeSsl -host .com
```
@@ -324,12 +324,12 @@ InfluxDB shell version: 1.x.y
>
```
-That's it! You've successfully set up HTTPS with InfluxEnterprise.
+That's it! You've successfully set up HTTPS with InfluxDB Enterprise.
-## Connect Telegraf to a secured InfluxEnterprise instance
+## Connect Telegraf to a secured InfluxDB Enterprise instance
-Connecting [Telegraf](/telegraf/v1.5/) to an InfluxEnterprise instance that's using
+Connecting [Telegraf](/{{< latest "telegraf" >}}/) to an InfluxDB Enterprise instance that's using
HTTPS requires some additional steps.
In Telegraf's configuration file (`/etc/telegraf/telegraf.conf`), under the OUTPUT PLUGINS section, edit the `urls`
@@ -348,7 +348,7 @@ setting and set it to `true`.
# Configuration for influxdb server to send metrics to
[[outputs.influxdb]]
- ## The full HTTP or UDP endpoint URL for your InfluxEnterprise instance.
+ ## The full HTTP or UDP endpoint URL for your InfluxDB Enterprise instance.
## Multiple urls can be specified as part of the same cluster,
## this means that only ONE of the urls will be written to each interval.
# urls = ["udp://localhost:8089"] # UDP endpoint example
diff --git a/content/enterprise_influxdb/v1.5/guides/migration.md b/content/enterprise_influxdb/v1.5/guides/migration.md
index 8297bf6ea..9a72e6f30 100644
--- a/content/enterprise_influxdb/v1.5/guides/migration.md
+++ b/content/enterprise_influxdb/v1.5/guides/migration.md
@@ -32,16 +32,16 @@ of three or more meta nodes and zero or more data nodes. If you need instruction
Please note that this migration process:
* Deletes all data from any data nodes that are already part of the InfluxDB Enterprise cluster
-* Will transfer all users from the OSS instance to the InfluxEnterprise Cluster*
+* Will transfer all users from the OSS instance to the InfluxDB Enterprise Cluster*
* Requires downtime for writes and reads for the OSS instance
{{% warn %}}
If you're using an InfluxDB Enterprise cluster version prior to 0.7.4, the
following steps will **not** transfer users from the OSS instance to the
-InfluxEnterprise Cluster.
+InfluxDB Enterprise Cluster.
{{% /warn %}}
-In addition, please refrain from creating a Global Admin user in the InfluxEnterprise Web Console before implementing these steps. If you’ve already created a Global Admin user, contact InfluxData Support.
+In addition, please refrain from creating a Global Admin user in the InfluxDB Enterprise Web Console before implementing these steps. If you’ve already created a Global Admin user, contact InfluxData Support.
## Modify the `/etc/hosts` file
@@ -184,7 +184,7 @@ Note: it may take a few minutes before the existing data become available in the
### 1. Add any data nodes that you removed from cluster back into the cluster
-From a **meta** node in the InfluxEnterprise Cluster, run:
+From a **meta** node in the InfluxDB Enterprise Cluster, run:
```
influxd-ctl add-data :8088
```
diff --git a/content/enterprise_influxdb/v1.5/introduction/getting-started.md b/content/enterprise_influxdb/v1.5/introduction/getting-started.md
index 32709bc35..1887c6ad3 100644
--- a/content/enterprise_influxdb/v1.5/introduction/getting-started.md
+++ b/content/enterprise_influxdb/v1.5/introduction/getting-started.md
@@ -10,7 +10,7 @@ menu:
parent: Introduction
---
-Now that you successfully [installed and set up](/enterprise_influxdb/v1.5/introduction/meta_node_installation/) InfluxDB Enterprise, you can configure Chronograf for [monitoring InfluxDB Enterprise clusters](/{{< latest "chronograf" >}}/guides/monitor-an-influxenterprise-cluster/).
+Now that you successfully [installed and set up](/enterprise_influxdb/v1.5/introduction/meta_node_installation/) InfluxDB Enterprise, you can configure Chronograf for [monitoring InfluxDB Enterprise clusters](/{{< latest "chronograf" >}}/guides/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/).
See [Getting started with Chronograf](/{{< latest "chronograf" >}}/introduction/getting-started/) to learn more about using Chronograf with the InfluxData time series platform.
diff --git a/content/enterprise_influxdb/v1.5/introduction/installation_guidelines.md b/content/enterprise_influxdb/v1.5/introduction/installation_guidelines.md
index d90eb5d02..622df76fe 100644
--- a/content/enterprise_influxdb/v1.5/introduction/installation_guidelines.md
+++ b/content/enterprise_influxdb/v1.5/introduction/installation_guidelines.md
@@ -46,13 +46,13 @@ If you alter the default ports in the configuration file(s), ensure the configur
#### Synchronize time between hosts
-InfluxEnterprise uses hosts' local time in UTC to assign timestamps to data and for coordination purposes.
+InfluxDB Enterprise uses hosts' local time in UTC to assign timestamps to data and for coordination purposes.
Use the Network Time Protocol (NTP) to synchronize time between hosts.
#### Use SSDs
Clusters require sustained availability of 1000-2000 IOPS from the attached storage.
-SANs must guarantee at least 1000 IOPS is always available to InfluxEnterprise
+SANs must guarantee at least 1000 IOPS is always available to InfluxDB Enterprise
nodes or they may not be sufficient.
SSDs are strongly recommended, and we have had no reports of IOPS contention from any customers running on SSDs.
diff --git a/content/enterprise_influxdb/v1.5/production_installation/_index.md b/content/enterprise_influxdb/v1.5/production_installation/_index.md
index d92b677aa..b659e4ad0 100644
--- a/content/enterprise_influxdb/v1.5/production_installation/_index.md
+++ b/content/enterprise_influxdb/v1.5/production_installation/_index.md
@@ -8,9 +8,9 @@ menu:
---
The Production Installation process is designed for users looking to deploy
-InfluxEnterprise in a production environment.
+InfluxDB Enterprise in a production environment.
-If you wish to evaluate InfluxEnterprise in a non-production
+If you wish to evaluate InfluxDB Enterprise in a non-production
environment, feel free to follow the instructions outlined in the
[QuickStart installation](/enterprise_influxdb/v1.5/quickstart_installation) section.
Please note that if you install InfluxDB Enterprise with the QuickStart Installation process you
@@ -20,6 +20,6 @@ process before using the product in a production environment.
## Production installation
-Follow the links below to get up and running with InfluxEnterprise.
+Follow the links below to get up and running with InfluxDB Enterprise.
{{< children hlevel="h2" >}}
diff --git a/content/enterprise_influxdb/v1.5/quickstart_installation/_index.md b/content/enterprise_influxdb/v1.5/quickstart_installation/_index.md
index 8c57face2..778e52500 100644
--- a/content/enterprise_influxdb/v1.5/quickstart_installation/_index.md
+++ b/content/enterprise_influxdb/v1.5/quickstart_installation/_index.md
@@ -8,19 +8,19 @@ menu:
---
The QuickStart installation process is designed for users looking to quickly
-get up and running with InfluxEnterprise and for users who are looking to
+get up and running with InfluxDB Enterprise and for users who are looking to
evaluate the product.
The QuickStart installation process **is not** designed for use
in a production environment.
Follow the instructions outlined in the [Production installation](/enterprise_influxdb/v1.5/production_installation/) section
if you wish to use InfluxDB Enterprise in a production environment.
-Please note that if you install InfluxEnterprise with the QuickStart Installation process you
+Please note that if you install InfluxDB Enterprise with the QuickStart Installation process you
will need to reinstall InfluxDB Enterprise with the Production Installation
process before using the product in a production environment.
## QuickStart installation
-Follow the links below to get up and running with InfluxEnterprise.
+Follow the links below to get up and running with InfluxDB Enterprise.
{{< children hlevel="h2" >}}
diff --git a/content/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation.md b/content/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation.md
index 1835792f8..354b6e02d 100644
--- a/content/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation.md
+++ b/content/enterprise_influxdb/v1.5/quickstart_installation/cluster_installation.md
@@ -55,7 +55,7 @@ setting in the meta node and data node configuration files.
#### Load balancer
-InfluxEnterprise does not function as a load balancer.
+InfluxDB Enterprise does not function as a load balancer.
You will need to configure your own load balancer to send client traffic to the
data nodes on port `8086` (the default port for the [HTTP API](/influxdb/v1.5/tools/api/)).
diff --git a/content/enterprise_influxdb/v1.5/troubleshooting/frequently_asked_questions.md b/content/enterprise_influxdb/v1.5/troubleshooting/frequently_asked_questions.md
index 9e5b5a1e2..bc04d8cd0 100644
--- a/content/enterprise_influxdb/v1.5/troubleshooting/frequently_asked_questions.md
+++ b/content/enterprise_influxdb/v1.5/troubleshooting/frequently_asked_questions.md
@@ -81,7 +81,7 @@ Note that for some [write consistency](/enterprise_influxdb/v1.5/concepts/cluste
[stats] 2016/10/18 10:35:21 error writing count stats for FOO_grafana: partial write
```
-The `_internal` database collects per-node and also cluster-wide information about the InfluxEnterprise cluster. The cluster metrics are replicated to other nodes using `consistency=all`. For a [write consistency](/enterprise_influxdb/v1.5/concepts/clustering/#write-consistency) of `all`, InfluxDB returns a write error (500) for the write attempt even if the points are successfully queued in hinted handoff. Thus, if there are points still in hinted handoff, the `_internal` writes will fail the consistency check and log the error, even though the data is in the durable hinted handoff queue and should eventually persist.
+The `_internal` database collects per-node and also cluster-wide information about the InfluxDB Enterprise cluster. The cluster metrics are replicated to other nodes using `consistency=all`. For a [write consistency](/enterprise_influxdb/v1.5/concepts/clustering/#write-consistency) of `all`, InfluxDB returns a write error (500) for the write attempt even if the points are successfully queued in hinted handoff. Thus, if there are points still in hinted handoff, the `_internal` writes will fail the consistency check and log the error, even though the data is in the durable hinted handoff queue and should eventually persist.
## Why am I seeing `queue is full` errors in my data node logs?
diff --git a/content/enterprise_influxdb/v1.6/administration/anti-entropy.md b/content/enterprise_influxdb/v1.6/administration/anti-entropy.md
index 3c705044b..b0771d6d3 100644
--- a/content/enterprise_influxdb/v1.6/administration/anti-entropy.md
+++ b/content/enterprise_influxdb/v1.6/administration/anti-entropy.md
@@ -86,7 +86,7 @@ A "flapping" dashboard means data visualizations changing when data is refreshed
and pulled from a node with entropy (inconsistent data).
It is the visual manifestation of getting [different results from the same query](#different-results-for-the-same-query).
-
+
## Technical details
diff --git a/content/enterprise_influxdb/v1.6/administration/backup-and-restore.md b/content/enterprise_influxdb/v1.6/administration/backup-and-restore.md
index f54babfa3..9bc7436b6 100644
--- a/content/enterprise_influxdb/v1.6/administration/backup-and-restore.md
+++ b/content/enterprise_influxdb/v1.6/administration/backup-and-restore.md
@@ -278,7 +278,7 @@ Restored from my-incremental-backup/ in 66.715524ms, transferred 588800 bytes
Your `telegraf` database was mistakenly dropped, but you have a recent backup so you've only lost a small amount of data.
-If [Telegraf](/telegraf/v1.7/) is still running, it will recreate the `telegraf` database shortly after the database is dropped.
+If [Telegraf](/{{< latest "telegraf" >}}/) is still running, it will recreate the `telegraf` database shortly after the database is dropped.
You might try to directly restore your `telegraf` backup just to find that you can't restore:
```
diff --git a/content/enterprise_influxdb/v1.6/concepts/glossary.md b/content/enterprise_influxdb/v1.6/concepts/glossary.md
index f0a767011..ed91c83fb 100644
--- a/content/enterprise_influxdb/v1.6/concepts/glossary.md
+++ b/content/enterprise_influxdb/v1.6/concepts/glossary.md
@@ -73,4 +73,4 @@ Legacy user interface for the InfluxDB Enterprise.
This has been deprecated and the suggestion is to use [Chronograf](/{{< latest "chronograf" >}}/introduction/).
-If you are transitioning from the Enterprise Web Console to Chronograf and helpful [transition guide](/{{< latest "chronograf" >}}/guides/transition-web-admin-interface/) is available.
+If you are transitioning from the Enterprise Web Console to Chronograf, see how to [transition from the InfluxDB Web Admin Interface](/chronograf/v1.7/guides/transition-web-admin-interface/).
diff --git a/content/enterprise_influxdb/v1.6/install-and-deploy/production_installation/_index.md b/content/enterprise_influxdb/v1.6/install-and-deploy/production_installation/_index.md
index ec4b35aac..86533b6f5 100644
--- a/content/enterprise_influxdb/v1.6/install-and-deploy/production_installation/_index.md
+++ b/content/enterprise_influxdb/v1.6/install-and-deploy/production_installation/_index.md
@@ -21,4 +21,4 @@ Learn how to deploy a cluster on the cloud provider of your choice:
- [GCP](/enterprise_influxdb/v1.7/install-and-deploy/google-cloud-platform/)
- [AWS](/enterprise_influxdb/v1.7/install-and-deploy/aws/)
- - [Azure](/enterprise_influxdb/v1.7/install-and-deploy/deploying/azure/)
+ - [Azure](/enterprise_influxdb/v1.7/install-and-deploy/azure/)
diff --git a/content/enterprise_influxdb/v1.6/introduction/getting-started.md b/content/enterprise_influxdb/v1.6/introduction/getting-started.md
index 4be7f2b22..e70fb46e6 100644
--- a/content/enterprise_influxdb/v1.6/introduction/getting-started.md
+++ b/content/enterprise_influxdb/v1.6/introduction/getting-started.md
@@ -10,7 +10,7 @@ menu:
parent: Introduction
---
-Now that you successfully [installed and set up](/enterprise_influxdb/v1.6/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitor-an-influxenterprise-cluster/)
+Now that you successfully [installed and set up](/enterprise_influxdb/v1.6/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/)
More details on leveraging [Chronograf and getting started are available.](/{{< latest "chronograf" >}}/introduction/getting-started/)
diff --git a/content/enterprise_influxdb/v1.7/administration/anti-entropy.md b/content/enterprise_influxdb/v1.7/administration/anti-entropy.md
index 885274225..42ae05ee4 100644
--- a/content/enterprise_influxdb/v1.7/administration/anti-entropy.md
+++ b/content/enterprise_influxdb/v1.7/administration/anti-entropy.md
@@ -91,7 +91,7 @@ A "flapping" dashboard means data visualizations change when data is refreshed
and pulled from a node with entropy (inconsistent data).
It is the visual manifestation of getting [different results from the same query](#different-results-for-the-same-query).
-
+
## Technical details
diff --git a/content/enterprise_influxdb/v1.7/administration/backup-and-restore.md b/content/enterprise_influxdb/v1.7/administration/backup-and-restore.md
index 1f0da808b..cf57a1354 100644
--- a/content/enterprise_influxdb/v1.7/administration/backup-and-restore.md
+++ b/content/enterprise_influxdb/v1.7/administration/backup-and-restore.md
@@ -24,7 +24,7 @@ To choose a strategy that best suits your use case, we recommend considering you
- [Backup and restore utilities](#backup-and-restore-utilities) (suits **most InfluxDB Enterprise applications**)
- [Export and import commands](#export-and-import-commands) (best for **backfill or recovering shards as files**)
-- [Take AWS snapshots as backup](/backup-and-restore/#take-aws-snapshots-as-backup) (optimal **convenience if budget permits**)
+- [Take AWS snapshots as backup](#take-aws-snapshots-as-backup) (optimal **convenience if budget permits**)
- [Run two clusters in separate AWS regions](#run-two-clusters-in-separate-aws-regions) (also optimal **convenience if budget permits**, more custom work upfront)
> Test your backup and restore strategy for all applicable scenarios.
diff --git a/content/enterprise_influxdb/v1.7/concepts/glossary.md b/content/enterprise_influxdb/v1.7/concepts/glossary.md
index 6a924c9c7..c64221df9 100644
--- a/content/enterprise_influxdb/v1.7/concepts/glossary.md
+++ b/content/enterprise_influxdb/v1.7/concepts/glossary.md
@@ -61,7 +61,7 @@ The number of data nodes in a cluster **must be evenly divisible by the replicat
> **Important:** If the replication factor isn't evenly divisible into the number of data nodes, data may be distributed unevenly across the cluster and cause poor performance. Likewise, decreasing the replication factor (fewer copies of data in a cluster) may reduce performance.
-Related entries: [cluster](/influxdb/v0.10/concepts/glossary/#cluster), [duration](/influxdb/v1.7/concepts/glossary/#duration), [node](/influxdb/v1.7/concepts/glossary/#node),
+Related entries: [duration](/influxdb/v1.7/concepts/glossary/#duration), [node](/influxdb/v1.7/concepts/glossary/#node),
[retention policy](/influxdb/v1.7/concepts/glossary/#retention-policy-rp)
## web console
@@ -70,4 +70,4 @@ Legacy user interface for the InfluxDB Enterprise.
This has been deprecated and the suggestion is to use [Chronograf](/{{< latest "chronograf" >}}/introduction/).
-If you are transitioning from the Enterprise Web Console to Chronograf and helpful [transition guide](/{{< latest "chronograf" >}}/guides/transition-web-admin-interface/) is available.
+If you are transitioning from the Enterprise Web Console to Chronograf, see how to [transition from the InfluxDB Web Admin Interface](/chronograf/v1.7/guides/transition-web-admin-interface/).
diff --git a/content/enterprise_influxdb/v1.7/install-and-deploy/azure.md b/content/enterprise_influxdb/v1.7/install-and-deploy/azure.md
index ef4031073..0e982f723 100644
--- a/content/enterprise_influxdb/v1.7/install-and-deploy/azure.md
+++ b/content/enterprise_influxdb/v1.7/install-and-deploy/azure.md
@@ -18,7 +18,7 @@ This guide requires the following:
- Microsoft Azure account with access to the [Azure Marketplace](https://azuremarketplace.microsoft.com/).
- SSH access to cluster instances.
-To deploy InfluxDB Enterprise clusters on platforms other than Azure, see [Deploy InfluxDB Enterprise](/enterprise_influxdb/v1.8/install-and-deploy/_index).
+To deploy InfluxDB Enterprise clusters on platforms other than Azure, see [Deploy InfluxDB Enterprise](/enterprise_influxdb/v1.8/install-and-deploy/).
## Deploy a cluster
diff --git a/content/enterprise_influxdb/v1.7/introduction/getting-started.md b/content/enterprise_influxdb/v1.7/introduction/getting-started.md
index 1b1b6e7d8..73344d0b6 100644
--- a/content/enterprise_influxdb/v1.7/introduction/getting-started.md
+++ b/content/enterprise_influxdb/v1.7/introduction/getting-started.md
@@ -10,7 +10,7 @@ menu:
parent: Introduction
---
-Now that you successfully [installed and set up](/enterprise_influxdb/v1.7/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitor-an-influxenterprise-cluster/)
+Now that you successfully [installed and set up](/enterprise_influxdb/v1.7/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/)
More details on leveraging [Chronograf and getting started are available.](/{{< latest "chronograf" >}}/introduction/getting-started/)
diff --git a/content/enterprise_influxdb/v1.8/administration/cluster-commands.md b/content/enterprise_influxdb/v1.8/administration/cluster-commands.md
index 01a5e0ecc..a980ddcc8 100644
--- a/content/enterprise_influxdb/v1.8/administration/cluster-commands.md
+++ b/content/enterprise_influxdb/v1.8/administration/cluster-commands.md
@@ -4,6 +4,7 @@ description: >
Use the `influxd-ctl` and `influx` command line tools to manage InfluxDB Enterprise clusters and data.
aliases:
- /enterprise/v1.8/features/cluster-commands/
+ - /enterprise_influxdb/v1.8/features/cluster-commands/
menu:
enterprise_influxdb_1_8:
name: Manage clusters
diff --git a/content/enterprise_influxdb/v1.8/concepts/glossary.md b/content/enterprise_influxdb/v1.8/concepts/glossary.md
index a07727ae6..7b6c6000d 100644
--- a/content/enterprise_influxdb/v1.8/concepts/glossary.md
+++ b/content/enterprise_influxdb/v1.8/concepts/glossary.md
@@ -74,4 +74,4 @@ Legacy user interface for the InfluxDB Enterprise.
This has been deprecated and the suggestion is to use [Chronograf](/{{< latest "chronograf" >}}/introduction/).
-If you are transitioning from the Enterprise Web Console to Chronograf and helpful [transition guide](/{{< latest "chronograf" >}}/guides/transition-web-admin-interface/) is available.
+If you are transitioning from the Enterprise Web Console to Chronograf, see how to [transition from the InfluxDB Web Admin Interface](/chronograf/v1.7/guides/transition-web-admin-interface/).
diff --git a/content/enterprise_influxdb/v1.8/install-and-deploy/deploying/azure.md b/content/enterprise_influxdb/v1.8/install-and-deploy/deploying/azure.md
index 793084fd5..6bcaa813f 100644
--- a/content/enterprise_influxdb/v1.8/install-and-deploy/deploying/azure.md
+++ b/content/enterprise_influxdb/v1.8/install-and-deploy/deploying/azure.md
@@ -2,6 +2,8 @@
title: Deploy an InfluxDB Enterprise cluster on Azure Cloud Platform
description: >
Deploy an InfluxDB Enterprise cluster on Microsoft Azure cloud computing service.
+aliases:
+ - /enterprise_influxdb/v1.8/install-and-deploy/azure/
menu:
enterprise_influxdb_1_8:
name: Azure
diff --git a/content/enterprise_influxdb/v1.8/introduction/getting-started.md b/content/enterprise_influxdb/v1.8/introduction/getting-started.md
index df3a18653..01ea0387b 100644
--- a/content/enterprise_influxdb/v1.8/introduction/getting-started.md
+++ b/content/enterprise_influxdb/v1.8/introduction/getting-started.md
@@ -11,7 +11,7 @@ menu:
parent: Introduction
---
-Now that you successfully [installed and set up](/enterprise_influxdb/v1.8/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitor-an-influxenterprise-cluster/)
+Now that you successfully [installed and set up](/enterprise_influxdb/v1.8/introduction/meta_node_installation/) InfluxDB Enterprise, use [Chronograf to setup your cluster as a data source.](/{{< latest "chronograf" >}}/guides/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/monitoring-influxenterprise-cluster/)
More details on leveraging [Chronograf and getting started are available.](/{{< latest "chronograf" >}}/introduction/getting-started/)
diff --git a/content/influxdb/cloud/account-management/multi-user/_index.md b/content/influxdb/cloud/account-management/multi-user/_index.md
index 8a88600c3..d665126b8 100644
--- a/content/influxdb/cloud/account-management/multi-user/_index.md
+++ b/content/influxdb/cloud/account-management/multi-user/_index.md
@@ -9,6 +9,7 @@ menu:
name: Manage multiple users
aliases:
- /influxdb/v2.0/account-management/multi-user/
+ - /influxdb/cloud/users/
---
{{< cloud-name >}} accounts support multiple users in an organization.
diff --git a/content/influxdb/cloud/query-data/get-started/_index.md b/content/influxdb/cloud/query-data/get-started/_index.md
index 00dd08ee8..bc7249c77 100644
--- a/content/influxdb/cloud/query-data/get-started/_index.md
+++ b/content/influxdb/cloud/query-data/get-started/_index.md
@@ -87,6 +87,6 @@ The [Execute queries](/influxdb/cloud/query-data/execute-queries) guide walks th
the different tools available for querying InfluxDB with Flux.
diff --git a/content/influxdb/cloud/reference/cli/influx/restore/index.md b/content/influxdb/cloud/reference/cli/influx/restore/index.md
index 6714246b0..be9de33c1 100644
--- a/content/influxdb/cloud/reference/cli/influx/restore/index.md
+++ b/content/influxdb/cloud/reference/cli/influx/restore/index.md
@@ -19,4 +19,68 @@ For information about restoring data in InfluxDB Cloud, see
[contact InfluxData Support](mailto:support@influxdata.com).
{{% /note %}}
-{{< duplicate-oss >}}
+The `influx restore` command restores backup data and metadata from an InfluxDB OSS backup directory.
+
+### The restore process
+When restoring data from a backup file set, InfluxDB temporarily moves existing
+data and metadata while `restore` runs.
+After `restore` completes, the temporary data is deleted.
+If the restore process fails, InfluxDB preserves the data in the temporary location.
+
+_For information about recovering from a failed restore process, see
+[Restore data](/influxdb/v2.0/backup-restore/restore/#recover-from-a-failed-restore)._
+
+## Usage
+
+```
+influx restore [flags]
+```
+
+## Flags
+
+| Flag | | Description | Input type | {{< cli/mapped >}} |
+|:---- |:--- |:----------- |:----------: |:------------------ |
+| `-c` | `--active-config` | CLI configuration to use for command | string | |
+| `-b` | `--bucket` | Name of the bucket to restore (mutually exclusive with `--bucket-id`) | string | |
+| | `--bucket-id` | ID of the bucket to restore (mutually exclusive with `--bucket`) | string | |
+| | `--configs-path` | Path to `influx` CLI configurations (default `~/.influxdbv2/configs`) | string |`INFLUX_CONFIGS_PATH` |
+| | `--full` | Fully restore and replace all data on server | | |
+| `-h` | `--help` | Help for the `restore` command | | |
+| | `--hide-headers` | Hide table headers (default `false`) | | `INFLUX_HIDE_HEADERS` |
+| | `--host` | HTTP address of InfluxDB (default `http://localhost:8086`) | string | `INFLUX_HOST` |
+| | `--input` | ({{< req >}}) Path to local backup directory | string | |
+| | `--json` | Output data as JSON (default `false`) | | `INFLUX_OUTPUT_JSON` |
+| | `--new-bucket` | Name of the bucket to restore to | string | |
+| | `--new-org` | Name of the organization to restore to | string | |
+| `-o` | `--org` | Organization name (mutually exclusive with `--org-id`) | string | |
+| | `--org-id` | Organization ID (mutually exclusive with `--org`) | string | |
+| | `--skip-verify` | Skip TLS certificate verification | | |
+| `-t` | `--token` | Authentication token | string | `INFLUX_TOKEN` |
+
+## Examples
+
+{{< cli/influx-creds-note >}}
+
+- [Restore and replace all data](#restore-and-replace-all-data)
+- [Restore backup data to an existing bucket](#restore-backup-data-to-an-existing-bucket)
+- [Create a bucket and restore data to it](#create-a-bucket-and-restore-data-to-it)
+
+##### Restore and replace all data
+```sh
+influx restore --full --input /path/to/backup/dir/
+```
+
+##### Restore backup data to an existing bucket
+```sh
+influx restore \
+ --bucket example-bucket \
+ --input /path/to/backup/dir/
+```
+
+##### Create a bucket and restore data to it
+```sh
+influx restore \
+ --new-bucket new-example-bucket \
+ --input /path/to/backup/dir/
+```
+
diff --git a/content/influxdb/cloud/reference/flux/stdlib/contrib/sensu/endpoint.md b/content/influxdb/cloud/reference/flux/stdlib/contrib/sensu/endpoint.md
index 05a9167c0..e79b7ae8a 100644
--- a/content/influxdb/cloud/reference/flux/stdlib/contrib/sensu/endpoint.md
+++ b/content/influxdb/cloud/reference/flux/stdlib/contrib/sensu/endpoint.md
@@ -85,7 +85,7 @@ following fields:
- `text`
- `status`
-_For more information, see [`sensu.event()` parameters](/v2.0/reference/flux/stdlib/contrib/sensu/event/#parameters)._
+_For more information, see [`sensu.event()` parameters](/influxdb/cloud/reference/flux/stdlib/contrib/sensu/event/#parameters)._
## Examples
diff --git a/content/influxdb/cloud/reference/flux/stdlib/contrib/teams/endpoint.md b/content/influxdb/cloud/reference/flux/stdlib/contrib/teams/endpoint.md
index bc7ad5dfd..7c302e790 100644
--- a/content/influxdb/cloud/reference/flux/stdlib/contrib/teams/endpoint.md
+++ b/content/influxdb/cloud/reference/flux/stdlib/contrib/teams/endpoint.md
@@ -47,7 +47,7 @@ following fields:
- `text`
- `summary`
-_For more information, see [`teams.message()` parameters](/v2.0/reference/flux/stdlib/contrib/teams/message/#parameters)._
+_For more information, see [`teams.message()` parameters](/influxdb/v2.0/reference/flux/stdlib/contrib/teams/message/#parameters)._
## Examples
diff --git a/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/endpoint.md b/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/endpoint.md
index f60cda65b..fdb21238a 100644
--- a/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/endpoint.md
+++ b/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/endpoint.md
@@ -28,7 +28,7 @@ telegram.endpoint(
{{% note %}}
For information about retrieving your Telegram **bot token** and **channel ID**,
-see [Set up a Telegram bot](/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
+see [Set up a Telegram bot](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
{{% /note %}}
## Parameters
@@ -74,7 +74,7 @@ following fields:
- `text`
- `silent`
-_For more information, see [`telegram.message()` parameters](/v2.0/reference/flux/stdlib/contrib/telegram/message/#parameters)._
+_For more information, see [`telegram.message()` parameters](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message/#parameters)._
## Examples
diff --git a/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/message.md b/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/message.md
index c43e3df38..839f53f90 100644
--- a/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/message.md
+++ b/content/influxdb/cloud/reference/flux/stdlib/contrib/telegram/message.md
@@ -31,7 +31,7 @@ telegram.message(
{{% note %}}
For information about retrieving your Telegram **bot token** and **channel ID**,
-see [Set up a Telegram bot](/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
+see [Set up a Telegram bot](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
{{% /note %}}
## Parameters
diff --git a/content/influxdb/cloud/tools/chronograf.md b/content/influxdb/cloud/tools/chronograf.md
index 97a320d19..d35ff0d4f 100644
--- a/content/influxdb/cloud/tools/chronograf.md
+++ b/content/influxdb/cloud/tools/chronograf.md
@@ -1,9 +1,8 @@
---
title: Use Chronograf with InfluxDB Cloud
description: >
- [Chronograf](/{{< latest "chronograf" >}}/) is a data visualization and dashboarding
- tool designed to visualize data in InfluxDB 1.x. It is part of the [TICKstack](/platform/)
- that provides an InfluxQL data explorer, Kapacitor integrations, and more.
+ Chronograf is a data visualization and dashboarding tool designed to visualize data in InfluxDB 1.x.
+ It is part of the [TICKstack](/platform/) that provides an InfluxQL data explorer, Kapacitor integrations, and more.
Continue to use Chronograf with **InfluxDB Cloud** and **InfluxDB OSS 2.0** and the
[1.x compatibility API](/influxdb/v2.0/reference/api/influxdb-1x/).
menu:
diff --git a/content/influxdb/cloud/visualize-data/dashboards/control-dashboard.md b/content/influxdb/cloud/visualize-data/dashboards/control-dashboard.md
index 1a2e7bc01..7f1f77a06 100644
--- a/content/influxdb/cloud/visualize-data/dashboards/control-dashboard.md
+++ b/content/influxdb/cloud/visualize-data/dashboards/control-dashboard.md
@@ -33,12 +33,6 @@ Click the timezone dropdown to select a timezone to use for the dashboard. Selec
{{< img-hd src="/img/influxdb/2-0-controls-timezone.png" alt="Select timezone" />}}
-### Select auto-refresh interval
-
-Select how frequently to refresh the dashboard's data. By default, refreshing is paused.
-
-{{< img-hd src="/img/influxdb/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}}
-
### Manually refresh dashboard
Click the refresh button (**{{< icon "refresh" >}}**) to manually refresh the dashboard's data.
diff --git a/content/influxdb/cloud/visualize-data/explore-metrics.md b/content/influxdb/cloud/visualize-data/explore-metrics.md
index cc792f19e..913f7b588 100644
--- a/content/influxdb/cloud/visualize-data/explore-metrics.md
+++ b/content/influxdb/cloud/visualize-data/explore-metrics.md
@@ -66,12 +66,6 @@ Toggle the **View Raw Data** {{< icon "toggle" >}} option to see your data in ta
Click the CSV icon to save the cells contents as a CSV file.
-### Select auto-refresh interval
-
-Select how frequently to refresh the dashboard's data. By default, refreshing is paused.
-
-{{< img-hd src="/img/influxdb-influxdb/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}}
-
### Manually refresh dashboard
Click the refresh button ({{< icon "refresh" >}}) to manually refresh the dashboard's data.
diff --git a/content/influxdb/cloud/visualize-data/variables/common-variables.md b/content/influxdb/cloud/visualize-data/variables/common-variables.md
index a068a44b3..2238491cf 100644
--- a/content/influxdb/cloud/visualize-data/variables/common-variables.md
+++ b/content/influxdb/cloud/visualize-data/variables/common-variables.md
@@ -64,7 +64,7 @@ v1.tagValues(bucket: "bucket-name", tag: "host")
## List Docker containers
List all Docker containers when using the Docker Telegraf plugin.
-_**Telegraf plugin:** [Docker](/{{< latest "telegraf" >}}/plugins/inputs/#docker)_
+_**Telegraf plugin:** [Docker](/{{< latest "telegraf" >}}/plugins/#docker)_
_**Flux package:** [InfluxDB v1](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/)_
_**Flux functions:** [v1.tagValues()](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/tagvalues/)_
@@ -76,7 +76,7 @@ v1.tagValues(bucket: "bucket-name", tag: "container_name")
## List Kubernetes pods
List all Kubernetes pods when using the Kubernetes Telegraf plugin.
-_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/inputs/#kubernetes)_
+_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/#kubernetes)_
_**Flux package:** [InfluxDB v1](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/)_
_**Flux functions:** [v1.measurementTagValues()](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/measurementtagvalues/)_
@@ -92,7 +92,7 @@ v1.measurementTagValues(
## List Kubernetes nodes
List all Kubernetes nodes when using the Kubernetes Telegraf plugin.
-_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/inputs/#kubernetes)_
+_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/#kubernetes)_
_**Flux package:** [InfluxDB v1](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/)_
_**Flux functions:** [v1.measurementTagValues()](/influxdb/cloud/reference/flux/stdlib/influxdb-v1/measurementtagvalues/)_
diff --git a/content/influxdb/v1.3/_index.md b/content/influxdb/v1.3/_index.md
index 4018b1ba2..a600b848c 100644
--- a/content/influxdb/v1.3/_index.md
+++ b/content/influxdb/v1.3/_index.md
@@ -29,4 +29,4 @@ It compiles into a single binary with no external dependencies.
* Built in web admin interface.
However, the open source edition of InfluxDB runs on a single node. If your requirements dictate a high-availability setup
-to eliminate a single point of failure, you should explore [InfluxDB Enterprise Edition](/influxdb/v1.3/high_availability/).
+to eliminate a single point of failure, you should explore [InfluxDB Enterprise Edition](/{{< latest "enterprise_influxdb" >}}/).
diff --git a/content/influxdb/v1.3/administration/backup_and_restore.md b/content/influxdb/v1.3/administration/backup_and_restore.md
index 6ad385cd5..0a6b6cda2 100644
--- a/content/influxdb/v1.3/administration/backup_and_restore.md
+++ b/content/influxdb/v1.3/administration/backup_and_restore.md
@@ -16,13 +16,13 @@ There are two types of data to backup, the metastore and the metrics themselves.
The [metastore](/influxdb/v1.3/concepts/glossary/#metastore) is backed up in its entirety.
The metrics are backed up per-database in a separate operation from the metastore backup.
-> **Note:** Backups are not interchangeable between InfluxDB OSS and [InfluxEnterprise](/enterprise/v1.3/).
-You cannot restore an OSS backup to an InfluxEnterprise data node, nor can you restore
-an InfluxEnterprise backup to an OSS instance.
+> **Note:** Backups are not interchangeable between InfluxDB OSS and [InfluxDB Enterprise](https://archive.docs.influxdata.com/enterprise_influxdb/v1.3/).
+You cannot restore an OSS backup to an InfluxDB Enterprise data node, nor can you restore
+an InfluxDB Enterprise backup to an OSS instance.
>
-If you are working with an InfluxEnterprise cluster, please see the [Backup
-and Restore Guide](/enterprise/v1.3/guides/backup-and-restore/) in the
-InfluxEnterprise documentation.
+If you are working with an InfluxDB Enterprise cluster, please see the [Backup
+and Restore Guide](https://archive.docs.influxdata.com/enterprise_influxdb/v1.3/guides/backup-and-restore/) in the
+InfluxDB Enterprise documentation.
### Backing up the Metastore
diff --git a/content/influxdb/v1.3/administration/config.md b/content/influxdb/v1.3/administration/config.md
index 295fb47e6..8133dd21c 100644
--- a/content/influxdb/v1.3/administration/config.md
+++ b/content/influxdb/v1.3/administration/config.md
@@ -560,8 +560,8 @@ Environment variable: `INFLUXDB_MONITOR_STORE_INTERVAL`
{{% warn %}} In version 1.3, the web admin interface is no longer available in InfluxDB.
The interface does not run on port `8083` and InfluxDB ignores the `[admin]` section in the configuration file if that section is present.
-[Chronograf](/chronograf/v1.3/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
-See [Chronograf's transition guide](/chronograf/v1.3/guides/transition-web-admin-interface/) for more information.
+[Chronograf](/{{< latest "chronograf" >}}/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
+See [Chronograf's transition guide](/chronograf/v1.7/guides/transition-web-admin-interface/) for more information.
{{% /warn %}}
## [http]
diff --git a/content/influxdb/v1.3/administration/differences.md b/content/influxdb/v1.3/administration/differences.md
index 8e047a429..189776f75 100644
--- a/content/influxdb/v1.3/administration/differences.md
+++ b/content/influxdb/v1.3/administration/differences.md
@@ -49,8 +49,8 @@ Next, restart your InfluxDB instance.
In version 1.3, the web admin interface is no longer available in InfluxDB.
The interface does not run on port `8083` and InfluxDB ignores the `[admin]` section in the configuration file if that section is present.
-[Chronograf](/chronograf/v1.3/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
-See [Chronograf's transition guide](/chronograf/v1.3/guides/transition-web-admin-interface/) for more information.
+[Chronograf](/{{< latest "chronograf" >}}/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
+See [Chronograf's transition guide](/chronograf/v1.7/guides/transition-web-admin-interface/) for more information.
## Duration Unit Updates
diff --git a/content/influxdb/v1.3/administration/https_setup.md b/content/influxdb/v1.3/administration/https_setup.md
index f44f836c4..207ef5082 100644
--- a/content/influxdb/v1.3/administration/https_setup.md
+++ b/content/influxdb/v1.3/administration/https_setup.md
@@ -186,7 +186,7 @@ That's it! You've successfully set up HTTPS with InfluxDB.
>
## Connect Telegraf to a secured InfluxDB instance
>
-Connecting [Telegraf](/telegraf/v1.3/) to an InfluxDB instance that's using
+Connecting [Telegraf](/{{< latest "telegraf" >}}/) to an InfluxDB instance that's using
HTTPS requires some additional steps.
>
In Telegraf's configuration file (`/etc/telegraf/telegraf.conf`), edit the `urls`
diff --git a/content/influxdb/v1.3/administration/previous_differences.md b/content/influxdb/v1.3/administration/previous_differences.md
index 9c852beb1..03c712dae 100644
--- a/content/influxdb/v1.3/administration/previous_differences.md
+++ b/content/influxdb/v1.3/administration/previous_differences.md
@@ -17,25 +17,25 @@ If you're using version 1.2, please see [Differences Between InfluxDB 1.3 and 1.
Users looking to upgrade to InfluxDB 1.3 from versions prior to 1.2 should view the following pages in our documentation.
##### 1.1 users:
-[Differences Between InfluxDB 1.2 and 1.1](https://archive.docs.influxdata.com/influxdb/v1.2/administration/differences/)
+[Differences Between InfluxDB 1.2 and 1.1](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v1.2/administration/differences/)
##### 1.0 users:
-[Differences Between InfluxDB 1.1 and 1.0](https://archive.docs.influxdata.com/influxdb/v1.1/administration/differences/)
+[Differences Between InfluxDB 1.1 and 1.0](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v1.1/administration/differences/)
##### 0.13 users:
-[Differences Between InfluxDB 1.0 and 0.13](https://archive.docs.influxdata.com/influxdb/v1.0/administration/013_vs_1/)
+[Differences Between InfluxDB 1.0 and 0.13](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v1.0/administration/013_vs_1/)
##### 0.12 users:
-[Differences Between InfluxDB 0.13 and 0.12](https://archive.docs.influxdata.com/influxdb/v0.13/administration/012_vs_013/)
+[Differences Between InfluxDB 0.13 and 0.12](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v0.13/administration/012_vs_013/)
##### 0.11 users:
-[Differences between InfluxDB 0.12 and InfluxDB 0.11](https://archive.docs.influxdata.com/influxdb/v0.12/concepts/011_vs_012/)
+[Differences between InfluxDB 0.12 and InfluxDB 0.11](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v0.12/concepts/011_vs_012/)
##### 0.10 users:
[Differences between InfluxDB 0.11 and InfluxDB 0.10](https://archive.docs.influxdata.com/influxdb/v0.11/concepts/010_vs_011/)
##### 0.9 users:
-[Differences between InfluxDB 0.9 and InfluxDB 0.10](https://archive.docs.influxdata.com/influxdb/v0.10/concepts/09_vs_010/)
+[Differences between InfluxDB 0.9 and InfluxDB 0.10](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v0.10/concepts/09_vs_010/)
##### 0.8 users:
-[Differences between InfluxDB 0.8 and InfluxDB 0.10](https://archive.docs.influxdata.com/influxdb/v0.10/concepts/08_vs_010/)
+[Differences between InfluxDB 0.8 and InfluxDB 0.10](https://archive.docs.influxdata.comhttps://archive.docs.influxdata.com/influxdb/v0.10/concepts/08_vs_010/)
diff --git a/content/influxdb/v1.3/administration/upgrading.md b/content/influxdb/v1.3/administration/upgrading.md
index 242b8452d..178105461 100644
--- a/content/influxdb/v1.3/administration/upgrading.md
+++ b/content/influxdb/v1.3/administration/upgrading.md
@@ -33,7 +33,7 @@ This page outlines process for upgrading from:
## Upgrade from 0.10 or 0.11 to 1.3
> **Note:** 0.10 users will need to
-[convert](/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1)
+[convert](https://archive.docs.influxdata.com/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1)
any remaining `b1` and `bz1` shards to `TSM` format before following the
instructions below.
InfluxDB 1.3 cannot read non-`TSM` shards.
@@ -55,7 +55,7 @@ new configuration file.
To start out, you must be working with version 0.10 or 0.11 (don't upgrade the
`influxd` binary yet!).
-If you've already upgraded the binary to 1.3, [reinstall 0.11.1](/influxdb/v0.12/administration/upgrading/#urls-for-influxdb-0-11);
+If you've already upgraded the binary to 1.3, [reinstall 0.11.1](https://archive.docs.influxdata.com/influxdb/v0.12/administration/upgrading/#urls-for-influxdb-0-11);
InfluxDB 1.3 will yield an error
(`run: create server: detected /var/lib/influxdb/meta/raft.db. [...]`) if you
attempt to start the process without completing the steps below.
diff --git a/content/influxdb/v1.3/guides/hardware_sizing.md b/content/influxdb/v1.3/guides/hardware_sizing.md
index 696940731..54c83de49 100644
--- a/content/influxdb/v1.3/guides/hardware_sizing.md
+++ b/content/influxdb/v1.3/guides/hardware_sizing.md
@@ -6,7 +6,7 @@ menu:
parent: Guides
---
-This guide offers general hardware recommendations for InfluxDB and addresses some frequently asked questions about hardware sizing. The recommendations are only for the [Time Structured Merge](/influxdb/v1.3/concepts/storage_engine/#the-new-influxdb-storage-engine-from-lsm-tree-to-b-tree-and-back-again-to-create-the-time-structured-merge-tree) tree (`TSM`) storage engine, the only storage engine available with InfluxDB 1.3. Users running older versions of InfluxDB with [unconverted](/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1) `b1` or `bz1` shards may have different performance characteristics. See the [InfluxDB 0.9 sizing guide](/influxdb/v0.9/guides/hardware_sizing/) for more detail.
+This guide offers general hardware recommendations for InfluxDB and addresses some frequently asked questions about hardware sizing. The recommendations are only for the [Time Structured Merge](/influxdb/v1.3/concepts/storage_engine/#the-new-influxdb-storage-engine-from-lsm-tree-to-b-tree-and-back-again-to-create-the-time-structured-merge-tree) tree (`TSM`) storage engine, the only storage engine available with InfluxDB 1.3. Users running older versions of InfluxDB with [unconverted](https://archive.docs.influxdata.com/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1) `b1` or `bz1` shards may have different performance characteristics. See the [InfluxDB 0.9 sizing guide](https://archive.docs.influxdata.com/influxdb/v0.9/guides/hardware_sizing/) for more detail.
* [Single node or Cluster?](/influxdb/v1.3/guides/hardware_sizing/#single-node-or-cluster)
* [General hardware guidelines for a single node](/influxdb/v1.3/guides/hardware_sizing/#general-hardware-guidelines-for-a-single-node)
@@ -93,7 +93,7 @@ Meta nodes do not need very much computing power. Regardless of the cluster load
* IOPS: 50
## Data Nodes
-A cluster with only one data node is valid but has no data redundancy. The redundancy is set by the [replication factor](/influxdb/v0.13/concepts/glossary/#replication-factor) on the retention policy to which the data is written. A cluster can lose `n - 1` data nodes and still return complete query results, where `n` is the replication factor. For optimal data distribution within the cluster, InfluxData recommends using an even number of data nodes.
+A cluster with only one data node is valid but has no data redundancy. The redundancy is set by the [replication factor](/influxdb/v1.3/concepts/glossary/#replication-factor) on the retention policy to which the data is written. A cluster can lose `n - 1` data nodes and still return complete query results, where `n` is the replication factor. For optimal data distribution within the cluster, InfluxData recommends using an even number of data nodes.
The hardware recommendations for cluster data nodes are similar to the standalone instance recommendations. Data nodes should always have at least 2 CPU cores, as they must handle regular read and write traffic, as well as intra-cluster read and write traffic. Due to the cluster communication overhead, data nodes in a cluster handle less throughput than a standalone instance on the same hardware.
diff --git a/content/influxdb/v1.3/query_language/authentication_and_authorization.md b/content/influxdb/v1.3/query_language/authentication_and_authorization.md
index ccd64928c..78eff6fa5 100644
--- a/content/influxdb/v1.3/query_language/authentication_and_authorization.md
+++ b/content/influxdb/v1.3/query_language/authentication_and_authorization.md
@@ -152,7 +152,7 @@ password:
>
## Authenticate Telegraf requests to InfluxDB
>
-Authenticating [Telegraf](/telegraf/v1.3/) requests to an InfluxDB instance with
+Authenticating [Telegraf](/{{< latest "telegraf" >}}/) requests to an InfluxDB instance with
authentication enabled requires some additional steps.
In Telegraf's configuration file (`/etc/telegraf/telegraf.conf`), uncomment
and edit the `username` and `password` settings:
diff --git a/content/influxdb/v1.3/query_language/spec.md b/content/influxdb/v1.3/query_language/spec.md
index 1ddb9ddc3..aa139a427 100644
--- a/content/influxdb/v1.3/query_language/spec.md
+++ b/content/influxdb/v1.3/query_language/spec.md
@@ -409,7 +409,7 @@ CREATE RETENTION POLICY "10m.events" ON "somedb" DURATION 60m REPLICATION 2 SHAR
### CREATE SUBSCRIPTION
-Subscriptions tell InfluxDB to send all the data it receives to [Kapacitor](/kapacitor/v1.3/introduction/).
+Subscriptions tell InfluxDB to send all the data it receives to [Kapacitor](/{{< latest "kapacitor" >}}/).
```
create_subscription_stmt = "CREATE SUBSCRIPTION" subscription_name "ON" db_name "." retention_policy "DESTINATIONS" ("ANY"|"ALL") host { "," host} .
diff --git a/content/influxdb/v1.3/tools/_index.md b/content/influxdb/v1.3/tools/_index.md
index bbfee68c1..dfe37b98f 100644
--- a/content/influxdb/v1.3/tools/_index.md
+++ b/content/influxdb/v1.3/tools/_index.md
@@ -46,8 +46,8 @@ The list of [client libraries](/influxdb/v1.3/tools/api_client_libraries/) for i
In version 1.3, the web admin interface is no longer available in InfluxDB.
The interface does not run on port `8083` and InfluxDB ignores the `[admin]` section in the configuration file if that section is present.
-[Chronograf](/chronograf/v1.3/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
-See [Chronograf's transition guide](/chronograf/v1.3/guides/transition-web-admin-interface/) for more information.
+[Chronograf](/{{< latest "chronograf" >}}/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
+See [Chronograf's transition guide](/chronograf/v1.7/guides/transition-web-admin-interface/) for more information.
## Influx Inspect
@@ -60,7 +60,7 @@ is a convenient dashboard tool for visualizing time series data.
It was originally built for Graphite, modeled after Kibana, and since been updated to support InfluxDB.
{{% warn %}}
-Because of the [changes](/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3 will not work with the Query Editor in Grafana 2.6.
+Because of the [changes](https://archive.docs.influxdata.com/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3 will not work with the Query Editor in Grafana 2.6.
This issue does not affect existing queries and dashboards or users working with Grafana 3.0.
{{% /warn %}}
diff --git a/content/influxdb/v1.3/tools/web_admin.md b/content/influxdb/v1.3/tools/web_admin.md
index d372da13d..d9adf5ebc 100644
--- a/content/influxdb/v1.3/tools/web_admin.md
+++ b/content/influxdb/v1.3/tools/web_admin.md
@@ -10,6 +10,6 @@ menu:
{{% warn %}}
In version 1.3, the web admin interface is no longer available in InfluxDB.
The interface does not run on port `8083` and InfluxDB ignores the `[admin]` section in the configuration file if that section is present.
-[Chronograf](/chronograf/v1.3/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
-See [Chronograf's transition guide](/chronograf/v1.3/guides/transition-web-admin-interface/) for more information.
+[Chronograf](/{{< latest "chronograf" >}}/) replaces the web admin interface with improved tooling for querying data, writing data, and database management.
+See [Chronograf's transition guide](/chronograf/v1.7/guides/transition-web-admin-interface/) for more information.
{{% /warn %}}
diff --git a/content/influxdb/v1.3/troubleshooting/query_management.md b/content/influxdb/v1.3/troubleshooting/query_management.md
index b12dc5140..3f8bdc6d7 100644
--- a/content/influxdb/v1.3/troubleshooting/query_management.md
+++ b/content/influxdb/v1.3/troubleshooting/query_management.md
@@ -23,7 +23,7 @@ and prevent and halt the execution of inefficient queries with several configura
## List currently-running queries with `SHOW QUERIES`
`SHOW QUERIES` lists the query ID, query text, relevant database, and duration
of all currently-running queries on your InfluxDB instance.
-For InfluxEnterprise clusters, the `SHOW QUERIES` output also includes the TCP host.
+For InfluxDB Enterprise clusters, the `SHOW QUERIES` output also includes the TCP host.
#### Syntax:
```
@@ -57,7 +57,7 @@ Where `qid` is the query ID, displayed in the [`SHOW QUERIES`](/influxdb/v1.3/tr
```
KILL QUERY
```
-***InfluxEnterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
+***InfluxDB Enterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
available in the `SHOW QUERIES` output.
```
@@ -74,7 +74,7 @@ A successful `KILL QUERY` query returns no results.
>
```
```
--- kill query on InfluxEnterprise cluster
+-- kill query on InfluxDB Enterprise cluster
> KILL QUERY 53 ON "myhost:8088"
>
```
diff --git a/content/influxdb/v1.4/_index.md b/content/influxdb/v1.4/_index.md
index 882df00f4..06e461a75 100644
--- a/content/influxdb/v1.4/_index.md
+++ b/content/influxdb/v1.4/_index.md
@@ -28,4 +28,4 @@ It compiles into a single binary with no external dependencies.
* Continuous queries automatically compute aggregate data to make frequent queries more efficient.
However, InfluxDB OSS runs on a single node. If you require a high-availability clustering
-to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/influxdb/v1.4/high_availability/).
+to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/{{< latest "enterprise_influxdb" >}}/).
diff --git a/content/influxdb/v1.4/administration/backup_and_restore.md b/content/influxdb/v1.4/administration/backup_and_restore.md
index c666ca57b..68d8b17ce 100644
--- a/content/influxdb/v1.4/administration/backup_and_restore.md
+++ b/content/influxdb/v1.4/administration/backup_and_restore.md
@@ -14,13 +14,13 @@ The [metastore](/influxdb/v1.4/concepts/glossary/#metastore) is backed up in its
The metrics are backed up per-database in a separate operation from the metastore backup.
Per-database backups can be full, incremental (since a RFC3339 formatted time), or for a specific shard ID.
-> **Note:** Backups are not interchangeable between InfluxDB OSS and [InfluxEnterprise](/enterprise/latest/).
-You cannot restore an OSS backup to an InfluxEnterprise data node, nor can you restore
-an InfluxEnterprise backup to an OSS instance.
+> **Note:** Backups are not interchangeable between InfluxDB OSS and [InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/).
+You cannot restore an OSS backup to an InfluxDB Enterprise data node, nor can you restore
+an InfluxDB Enterprise backup to an OSS instance.
>
-If you are working with an InfluxEnterprise cluster, please see the [Backup
-and Restore Guide](/enterprise/latest/guides/backup-and-restore/) in the
-InfluxEnterprise documentation.
+If you are working with an InfluxDB Enterprise cluster, please see the [Backup
+and Restore Guide](/{{< latest "enterprise_influxdb" >}}/administration/backup-and-restore/) in the
+InfluxDB Enterprise documentation.
### Backing up the metastore
diff --git a/content/influxdb/v1.4/administration/previous_differences.md b/content/influxdb/v1.4/administration/previous_differences.md
index c745acb31..aad98cd83 100644
--- a/content/influxdb/v1.4/administration/previous_differences.md
+++ b/content/influxdb/v1.4/administration/previous_differences.md
@@ -20,25 +20,25 @@ Users looking to upgrade to InfluxDB 1.4 from versions prior to 1.3 should view
[Differences Between InfluxDB 1.3 and 1.2](/influxdb/v1.3/administration/differences/)
##### 1.1 users:
-[Differences Between InfluxDB 1.2 and 1.1](/influxdb/v1.2/administration/differences/)
+[Differences Between InfluxDB 1.2 and 1.1](https://archive.docs.influxdata.com/influxdb/v1.2/administration/differences/)
##### 1.0 users:
-[Differences Between InfluxDB 1.1 and 1.0](/influxdb/v1.1/administration/differences/)
+[Differences Between InfluxDB 1.1 and 1.0](https://archive.docs.influxdata.com/influxdb/v1.1/administration/differences/)
##### 0.13 users:
-[Differences Between InfluxDB 1.0 and 0.13](/influxdb/v1.0/administration/013_vs_1/)
+[Differences Between InfluxDB 1.0 and 0.13](https://archive.docs.influxdata.com/influxdb/v1.0/administration/013_vs_1/)
##### 0.12 users:
-[Differences Between InfluxDB 0.13 and 0.12](/influxdb/v0.13/administration/012_vs_013/)
+[Differences Between InfluxDB 0.13 and 0.12](https://archive.docs.influxdata.com/influxdb/v0.13/administration/012_vs_013/)
##### 0.11 users:
-[Differences between InfluxDB 0.12 and InfluxDB 0.11](/influxdb/v0.12/concepts/011_vs_012/)
+[Differences between InfluxDB 0.12 and InfluxDB 0.11](https://archive.docs.influxdata.com/influxdb/v0.12/concepts/011_vs_012/)
##### 0.10 users:
-[Differences between InfluxDB 0.11 and InfluxDB 0.10](/influxdb/v1.3/concepts/010_vs_011/)
+[Differences between InfluxDB 0.11 and InfluxDB 0.10](/influxdb/v1.3/administration/previous_differences/)
##### 0.9 users:
-[Differences between InfluxDB 0.9 and InfluxDB 0.10](/influxdb/v0.10/concepts/09_vs_010/)
+[Differences between InfluxDB 0.9 and InfluxDB 0.10](https://archive.docs.influxdata.com/influxdb/v0.10/concepts/09_vs_010/)
##### 0.8 users:
-[Differences between InfluxDB 0.8 and InfluxDB 0.10](/influxdb/v0.10/concepts/08_vs_010/)
+[Differences between InfluxDB 0.8 and InfluxDB 0.10](https://archive.docs.influxdata.com/influxdb/v0.10/concepts/08_vs_010/)
diff --git a/content/influxdb/v1.4/administration/upgrading.md b/content/influxdb/v1.4/administration/upgrading.md
index 53beec428..538a75a8c 100644
--- a/content/influxdb/v1.4/administration/upgrading.md
+++ b/content/influxdb/v1.4/administration/upgrading.md
@@ -34,7 +34,7 @@ This page outlines process for upgrading from:
## Upgrade from 0.10 or 0.11 to 1.4
> **Note:** 0.10 users will need to
-[convert](/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1)
+[convert](https://archive.docs.influxdata.com/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1)
any remaining `b1` and `bz1` shards to `TSM` format before following the
instructions below.
InfluxDB 1.4 cannot read non-`TSM` shards.
@@ -56,7 +56,7 @@ new configuration file.
To start out, you must be working with version 0.10 or 0.11 (don't upgrade the
`influxd` binary yet!).
-If you've already upgraded the binary to 1.4, [reinstall 0.11.1](/influxdb/v0.12/administration/upgrading/#urls-for-influxdb-0-11);
+If you've already upgraded the binary to 1.4, [reinstall 0.11.1](https://archive.docs.influxdata.com/influxdb/v0.12/administration/upgrading/#urls-for-influxdb-0-11);
InfluxDB 1.4 will yield an error
(`run: create server: detected /var/lib/influxdb/meta/raft.db. [...]`) if you
attempt to start the process without completing the steps below.
diff --git a/content/influxdb/v1.4/guides/hardware_sizing.md b/content/influxdb/v1.4/guides/hardware_sizing.md
index 9f6969b03..6fee54529 100644
--- a/content/influxdb/v1.4/guides/hardware_sizing.md
+++ b/content/influxdb/v1.4/guides/hardware_sizing.md
@@ -6,7 +6,7 @@ menu:
parent: Guides
---
-This guide offers general hardware recommendations for InfluxDB and addresses some frequently asked questions about hardware sizing. The recommendations are only for the [Time Structured Merge](/influxdb/v1.4/concepts/storage_engine/#the-new-influxdb-storage-engine-from-lsm-tree-to-b-tree-and-back-again-to-create-the-time-structured-merge-tree) tree (`TSM`) storage engine, the only storage engine available with InfluxDB 1.4. Users running older versions of InfluxDB with [unconverted](/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1) `b1` or `bz1` shards may have different performance characteristics. See the [InfluxDB 0.9 sizing guide](/influxdb/v0.9/guides/hardware_sizing/) for more detail.
+This guide offers general hardware recommendations for InfluxDB and addresses some frequently asked questions about hardware sizing. The recommendations are only for the [Time Structured Merge](/influxdb/v1.4/concepts/storage_engine/#the-new-influxdb-storage-engine-from-lsm-tree-to-b-tree-and-back-again-to-create-the-time-structured-merge-tree) tree (`TSM`) storage engine, the only storage engine available with InfluxDB 1.4. Users running older versions of InfluxDB with [unconverted](https://archive.docs.influxdata.com/influxdb/v0.10/administration/upgrading/#convert-b1-and-bz1-shards-to-tsm1) `b1` or `bz1` shards may have different performance characteristics. See the [InfluxDB 0.9 sizing guide](https://archive.docs.influxdata.com/influxdb/v0.9/guides/hardware_sizing/) for more detail.
* [Single node or Cluster?](/influxdb/v1.4/guides/hardware_sizing/#single-node-or-cluster)
* [General hardware guidelines for a single node](/influxdb/v1.4/guides/hardware_sizing/#general-hardware-guidelines-for-a-single-node)
@@ -93,7 +93,7 @@ Meta nodes do not need very much computing power. Regardless of the cluster load
* IOPS: 50
## Data Nodes
-A cluster with only one data node is valid but has no data redundancy. The redundancy is set by the [replication factor](/influxdb/v0.13/concepts/glossary/#replication-factor) on the retention policy to which the data is written. A cluster can lose `n - 1` data nodes and still return complete query results, where `n` is the replication factor. For optimal data distribution within the cluster, InfluxData recommends using an even number of data nodes.
+A cluster with only one data node is valid but has no data redundancy. The redundancy is set by the [replication factor](/influxdb/v1.3/concepts/glossary/#replication-factor) on the retention policy to which the data is written. A cluster can lose `n - 1` data nodes and still return complete query results, where `n` is the replication factor. For optimal data distribution within the cluster, InfluxData recommends using an even number of data nodes.
The hardware recommendations for cluster data nodes are similar to the standalone instance recommendations. Data nodes should always have at least 2 CPU cores, as they must handle regular read and write traffic, as well as intra-cluster read and write traffic. Due to the cluster communication overhead, data nodes in a cluster handle less throughput than a standalone instance on the same hardware.
diff --git a/content/influxdb/v1.4/query_language/continuous_queries.md b/content/influxdb/v1.4/query_language/continuous_queries.md
index f1e5dca64..9ea784a46 100644
--- a/content/influxdb/v1.4/query_language/continuous_queries.md
+++ b/content/influxdb/v1.4/query_language/continuous_queries.md
@@ -949,6 +949,6 @@ precision data.
Kapacitor, InfluxData's data processing engine, can do the same work as
InfluxDB's CQs.
Check out the
-[Kapacitor documentation](/{{< latest "kapacitor" >}}/examples/continuous_queries/) for when
+[Kapacitor documentation](/{{< latest "kapacitor" >}}/guides/continuous_queries/) for when
to use Kapacitor instead of InfluxDB and how to perform the same CQ
functionality with a TICKscript.
diff --git a/content/influxdb/v1.4/query_language/spec.md b/content/influxdb/v1.4/query_language/spec.md
index 7dc7d7da8..541bc25d4 100644
--- a/content/influxdb/v1.4/query_language/spec.md
+++ b/content/influxdb/v1.4/query_language/spec.md
@@ -714,7 +714,7 @@ KILL QUERY ON ""
KILL QUERY 36
```
```sql
--- kill query on InfluxEnterprise cluster
+-- kill query on InfluxDB Enterprise cluster
KILL QUERY 53 ON "myhost:8088"
```
diff --git a/content/influxdb/v1.4/tools/_index.md b/content/influxdb/v1.4/tools/_index.md
index 80233845b..e4f133854 100644
--- a/content/influxdb/v1.4/tools/_index.md
+++ b/content/influxdb/v1.4/tools/_index.md
@@ -54,5 +54,5 @@ line protocol that can be inserted back into the database.
is a convenient dashboard tool for visualizing time series data.
It was originally built for Graphite, modeled after Kibana, and since been updated to support InfluxDB.
-{{% warn %}} Because of the [changes](/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
+{{% warn %}} Because of the [changes](https://archive.docs.influxdata.com/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
This issue does not affect existing queries and dashboards or users working with Grafana 3.0. {{% /warn %}}
diff --git a/content/influxdb/v1.4/tools/api.md b/content/influxdb/v1.4/tools/api.md
index a507d7084..3f78ef805 100644
--- a/content/influxdb/v1.4/tools/api.md
+++ b/content/influxdb/v1.4/tools/api.md
@@ -497,7 +497,7 @@ POST http://localhost:8086/write
| Query String Parameter | Optional/Required | Description |
| :--------------------- | :---------------- | :---------- |
-| consistency=[any,one,quorum,all] | Optional, available with [InfluxEnterprise clusters](/enterprise/v1.3/) only. | Sets the write consistency for the point. InfluxDB assumes that the write consistency is `one` if you do not specify `consistency`. See the [InfluxEnterprise documentation](/enterprise_influxdb/v1.3/concepts/clustering#write-consistency) for detailed descriptions of each consistency option. |
+| consistency=[any,one,quorum,all] | Optional, available with [InfluxDB Enterprise clusters](/enterprise_influxdb/v1.3/) only. | Sets the write consistency for the point. InfluxDB assumes that the write consistency is `one` if you do not specify `consistency`. See the [InfluxDB Enterprise documentation](/enterprise_influxdb/v1.3/concepts/clustering#write-consistency) for detailed descriptions of each consistency option. |
| db=\ | Required | Sets the target [database](/influxdb/v1.4/concepts/glossary/#database) for the write. |
| p=\ | Optional if you haven't [enabled authentication](/influxdb/v1.4/query_language/authentication_and_authorization/#set-up-authentication). Required if you've enabled authentication.* | Sets the password for authentication if you've enabled authentication. Use with the query string parameter `u`. |
| precision=[ns,u,ms,s,m,h] | Optional | Sets the precision for the supplied Unix time values. InfluxDB assumes that timestamps are in nanoseconds if you do not specify `precision`.** |
diff --git a/content/influxdb/v1.4/troubleshooting/errors.md b/content/influxdb/v1.4/troubleshooting/errors.md
index a4896dc0f..2ed483d9e 100644
--- a/content/influxdb/v1.4/troubleshooting/errors.md
+++ b/content/influxdb/v1.4/troubleshooting/errors.md
@@ -318,4 +318,4 @@ It will be in the `killed` state, which means the signal has been sent, but the
query itself has not hit an interrupt point.
**Resources:**
-[Query Management](/influxdb/v1.0/troubleshooting/query_management/)
+[Query Management](/influxdb/v1.4/troubleshooting/query_management/)
diff --git a/content/influxdb/v1.4/troubleshooting/query_management.md b/content/influxdb/v1.4/troubleshooting/query_management.md
index 167131b05..108d9c74d 100644
--- a/content/influxdb/v1.4/troubleshooting/query_management.md
+++ b/content/influxdb/v1.4/troubleshooting/query_management.md
@@ -55,7 +55,7 @@ Where `qid` is the query ID, displayed in the [`SHOW QUERIES`](/influxdb/v1.3/tr
```
KILL QUERY
```
-***InfluxEnterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
+***InfluxDB Enterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
available in the `SHOW QUERIES` output.
```
@@ -72,7 +72,7 @@ A successful `KILL QUERY` query returns no results.
>
```
```
--- kill query on InfluxEnterprise cluster
+-- kill query on InfluxDB Enterprise cluster
> KILL QUERY 53 ON "myhost:8088"
>
```
diff --git a/content/influxdb/v1.5/_index.md b/content/influxdb/v1.5/_index.md
index 325a70636..c0768b5d4 100644
--- a/content/influxdb/v1.5/_index.md
+++ b/content/influxdb/v1.5/_index.md
@@ -28,4 +28,4 @@ It compiles into a single binary with no external dependencies.
* Continuous queries automatically compute aggregate data to make frequent queries more efficient.
The open source edition of InfluxDB runs on a single node.
-If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/influxdb/v1.5/high_availability/).
+If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/enterprise_influxdb/v1.5/).
diff --git a/content/influxdb/v1.5/guides/calculating_percentages.md b/content/influxdb/v1.5/guides/calculating_percentages.md
index 411b92dd4..dfad3cc7f 100644
--- a/content/influxdb/v1.5/guides/calculating_percentages.md
+++ b/content/influxdb/v1.5/guides/calculating_percentages.md
@@ -80,7 +80,7 @@ FROM "apple_stand"."autogen"."variety"
FROM "apple_stand"."autogen"."variety"'>
\*
-If visualized as a [stacked graph](/chronograf/v1.5/guides/visualization-types/#stacked-graph)
+If visualized as a [stacked graph](/{{< latest "chronograf" >}}/guides/visualization-types/#stacked-graph)
in Chronograf, it would look like:

@@ -109,7 +109,7 @@ _**Note the following about this query:**_
- It includes an explicitly limited time window. Without it, aggregate functions
are very resource-intensive.
-If visualized as a [stacked graph](/chronograf/v1.5/guides/visualization-types/#stacked-graph)
+If visualized as a [stacked graph](/{{< latest "chronograf" >}}/guides/visualization-types/#stacked-graph)
in Chronograf, it would look like:

diff --git a/content/influxdb/v1.5/query_language/continuous_queries.md b/content/influxdb/v1.5/query_language/continuous_queries.md
index a54c9ce10..4a6b0ae97 100644
--- a/content/influxdb/v1.5/query_language/continuous_queries.md
+++ b/content/influxdb/v1.5/query_language/continuous_queries.md
@@ -949,6 +949,6 @@ precision data.
Kapacitor, InfluxData's data processing engine, can do the same work as
InfluxDB's CQs.
-Check out [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/examples/continuous_queries/) to learn when
+Check out [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/guides/continuous_queries/) to learn when
to use Kapacitor instead of InfluxDB and how to perform the same CQ
functionality with a TICKscript.
diff --git a/content/influxdb/v1.5/query_language/spec.md b/content/influxdb/v1.5/query_language/spec.md
index ef9da1129..983da2b97 100644
--- a/content/influxdb/v1.5/query_language/spec.md
+++ b/content/influxdb/v1.5/query_language/spec.md
@@ -750,7 +750,7 @@ KILL QUERY 36
```
```sql
--- kill query on InfluxEnterprise cluster
+-- kill query on InfluxDB Enterprise cluster
KILL QUERY 53 ON "myhost:8088"
```
diff --git a/content/influxdb/v1.5/tools/_index.md b/content/influxdb/v1.5/tools/_index.md
index e135001bd..83fdcbf7d 100644
--- a/content/influxdb/v1.5/tools/_index.md
+++ b/content/influxdb/v1.5/tools/_index.md
@@ -54,6 +54,6 @@ is a convenient dashboard tool for visualizing time series data.
It was originally built for Graphite, modeled after Kibana, and since been updated to support InfluxDB.
{{% warn %}}
-Because of the [changes](/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
+Because of the [changes](https://archive.docs.influxdata.com/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
This issue does not affect existing queries and dashboards or users working with Grafana 3.0.
{{% /warn %}}
diff --git a/content/influxdb/v1.5/troubleshooting/errors.md b/content/influxdb/v1.5/troubleshooting/errors.md
index 2f44f9cef..9b5e433b5 100644
--- a/content/influxdb/v1.5/troubleshooting/errors.md
+++ b/content/influxdb/v1.5/troubleshooting/errors.md
@@ -320,4 +320,4 @@ It will be in the `killed` state, which means the signal has been sent, but the
query itself has not hit an interrupt point.
**Resources:**
-[Query Management](/influxdb/v1.0/troubleshooting/query_management/)
+[Query Management](/influxdb/v1.5/troubleshooting/query_management/)
diff --git a/content/influxdb/v1.5/troubleshooting/query_management.md b/content/influxdb/v1.5/troubleshooting/query_management.md
index 5924f7eb9..89c5400f3 100644
--- a/content/influxdb/v1.5/troubleshooting/query_management.md
+++ b/content/influxdb/v1.5/troubleshooting/query_management.md
@@ -56,7 +56,7 @@ Where `qid` is the query ID, displayed in the [`SHOW QUERIES`](/influxdb/v1.3/tr
```
KILL QUERY
```
-***InfluxEnterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
+***InfluxDB Enterprise clusters:*** To kill queries on a cluster, you need to specify the query ID (qid) and the TCP host (for example, `myhost:8088`),
available in the `SHOW QUERIES` output.
```
@@ -73,7 +73,7 @@ A successful `KILL QUERY` query returns no results.
>
```
```
--- kill query on InfluxEnterprise cluster
+-- kill query on InfluxDB Enterprise cluster
> KILL QUERY 53 ON "myhost:8088"
>
```
diff --git a/content/influxdb/v1.6/_index.md b/content/influxdb/v1.6/_index.md
index 8b2a8bd83..c01aa022f 100644
--- a/content/influxdb/v1.6/_index.md
+++ b/content/influxdb/v1.6/_index.md
@@ -28,4 +28,4 @@ It compiles into a single binary with no external dependencies.
* Continuous queries automatically compute aggregate data to make frequent queries more efficient.
The open source edition of InfluxDB runs on a single node.
-If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/influxdb/v1.6/high_availability/).
+If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/enterprise_influxdb/v1.6/).
diff --git a/content/influxdb/v1.6/query_language/continuous_queries.md b/content/influxdb/v1.6/query_language/continuous_queries.md
index 4c819560d..d6b97b881 100644
--- a/content/influxdb/v1.6/query_language/continuous_queries.md
+++ b/content/influxdb/v1.6/query_language/continuous_queries.md
@@ -949,6 +949,6 @@ precision data.
Kapacitor, InfluxData's data processing engine, can do the same work as
InfluxDB's CQs.
-Check out [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/examples/continuous_queries/) to learn when
+Check out [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/guides/continuous_queries/) to learn when
to use Kapacitor instead of InfluxDB and how to perform the same CQ
functionality with a TICKscript.
diff --git a/content/influxdb/v1.6/tools/_index.md b/content/influxdb/v1.6/tools/_index.md
index 90a7efcce..1b8d13fcf 100644
--- a/content/influxdb/v1.6/tools/_index.md
+++ b/content/influxdb/v1.6/tools/_index.md
@@ -54,6 +54,6 @@ is a convenient dashboard tool for visualizing time series data.
It was originally built for Graphite, modeled after Kibana, and since been updated to support InfluxDB.
{{% warn %}}
-Because of the [changes](/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
+Because of the [changes](https://archive.docs.influxdata.com/influxdb/v0.11/concepts/010_vs_011/#breaking-api-changes) to the `SHOW SERIES` and `SHOW TAG VALUES` formats in InfluxDB 0.11, InfluxDB 1.3+ will not work with the Query Editor in Grafana 2.6.
This issue does not affect existing queries and dashboards or users working with Grafana 3.0.
{{% /warn %}}
diff --git a/content/influxdb/v1.6/troubleshooting/errors.md b/content/influxdb/v1.6/troubleshooting/errors.md
index b4deddd7b..48c1efb2f 100644
--- a/content/influxdb/v1.6/troubleshooting/errors.md
+++ b/content/influxdb/v1.6/troubleshooting/errors.md
@@ -320,4 +320,4 @@ It will be in the `killed` state, which means the signal has been sent, but the
query itself has not hit an interrupt point.
**Resources:**
-[Query Management](/influxdb/v1.0/troubleshooting/query_management/)
+[Query Management](/influxdb/v1.6/troubleshooting/query_management/)
diff --git a/content/influxdb/v1.7/_index.md b/content/influxdb/v1.7/_index.md
index 1cfd0ea04..ba0c13a63 100644
--- a/content/influxdb/v1.7/_index.md
+++ b/content/influxdb/v1.7/_index.md
@@ -28,4 +28,4 @@ It compiles into a single binary with no external dependencies.
* Continuous queries automatically compute aggregate data to make frequent queries more efficient.
The open source edition of InfluxDB runs on a single node.
-If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/influxdb/v1.7/high_availability/).
+If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/enterprise_influxdb/v1.7/).
diff --git a/content/influxdb/v1.7/administration/authentication_and_authorization.md b/content/influxdb/v1.7/administration/authentication_and_authorization.md
index e8e04f6ea..d3fab0421 100644
--- a/content/influxdb/v1.7/administration/authentication_and_authorization.md
+++ b/content/influxdb/v1.7/administration/authentication_and_authorization.md
@@ -1,7 +1,5 @@
---
title: Authentication and authorization in InfluxDB
-aliases:
- - influxdb/v1.7/administration/authentication_and_authorization/
menu:
influxdb_1_7:
name: Authentication and authorization
diff --git a/content/influxdb/v1.7/concepts/glossary.md b/content/influxdb/v1.7/concepts/glossary.md
index b8263aa42..d8b527853 100644
--- a/content/influxdb/v1.7/concepts/glossary.md
+++ b/content/influxdb/v1.7/concepts/glossary.md
@@ -168,7 +168,7 @@ The number of data nodes in a cluster **must be evenly divisible by the replicat
> **Important:** If the replication factor isn't evenly divisible into the number of data nodes, data may be distributed unevenly across the cluster and cause poor performance. Likewise, decreasing the replication factor (fewer copies of data in a cluster) may reduce performance depending on query and write load.
-Related entries: [cluster](/influxdb/v0.10/concepts/glossary/#cluster), [duration](/influxdb/v1.7/concepts/glossary/#duration), [node](/influxdb/v1.7/concepts/glossary/#node),
+Related entries: [duration](/influxdb/v1.7/concepts/glossary/#duration), [node](/influxdb/v1.7/concepts/glossary/#node),
[retention policy](/influxdb/v1.7/concepts/glossary/#retention-policy-rp)
## retention policy (RP)
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 6fe8ec838..33f636060 100644
--- a/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md
+++ b/content/influxdb/v1.7/flux/guides/flux-in-dashboards.md
@@ -9,7 +9,6 @@ menu:
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 7621ec77e..aa45fbbf0 100644
--- a/content/influxdb/v1.7/flux/guides/group-data.md
+++ b/content/influxdb/v1.7/flux/guides/group-data.md
@@ -160,7 +160,7 @@ Table: keys: [_start, _stop, _field, _measurement, cpu]
**Note that the group key is output with each table: `Table: keys: `.**
-
+
### Group by CPU
Group the `dataSet` stream by the `cpu` column.
@@ -249,7 +249,7 @@ Table: keys: [cpu]
The visualization remains the same.
-
+
### Group by time
Grouping data by the `_time` column is a good illustration of how grouping changes the structure of your data.
@@ -374,7 +374,7 @@ Table: keys: [_time]
Because each timestamp is structured as a separate table, when visualized, all
points that share the same timestamp appear connected.
-
+
{{% note %}}
With some further processing, you could calculate the average CPU usage across all CPUs per point
@@ -666,7 +666,7 @@ Table: keys: [_time, cpu]
When visualized, tables appear as individual, unconnected points.
-
+
Grouping by `cpu` and `_time` is a good illustration of how grouping works.
diff --git a/content/influxdb/v1.7/flux/guides/mathematic-operations.md b/content/influxdb/v1.7/flux/guides/mathematic-operations.md
index ccb9a429f..ac30cf98c 100644
--- a/content/influxdb/v1.7/flux/guides/mathematic-operations.md
+++ b/content/influxdb/v1.7/flux/guides/mathematic-operations.md
@@ -67,7 +67,7 @@ For example:
{{% /note %}}
## Custom mathematic functions
-Flux lets you [create custom functions](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/custom-functions) that use mathematic operations.
+Flux lets you [create custom functions](/{{< latest "influxdb" "v2" >}}/query-data/flux/custom-functions) that use mathematic operations.
View the examples below.
###### Custom multiplication function
@@ -89,7 +89,7 @@ percent(sample: 20.0, total: 80.0)
### Transform values in a data stream
To transform multiple values in an input stream, your function needs to:
-- [Handle piped-forward data](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/custom-functions/#functions-that-manipulate-piped-forward-data).
+- [Handle piped-forward data](/{{< latest "influxdb" "v2" >}}/query-data/flux/custom-functions/#functions-that-manipulate-piped-forward-data).
- Each operand necessary for the calculation exists in each row _(see [Pivot vs join](#pivot-vs-join) below)_.
- Use the [`map()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/map) to iterate over each row.
diff --git a/content/influxdb/v1.7/flux/guides/moving-average.md b/content/influxdb/v1.7/flux/guides/moving-average.md
index 2b662e32a..a0f5e7aea 100644
--- a/content/influxdb/v1.7/flux/guides/moving-average.md
+++ b/content/influxdb/v1.7/flux/guides/moving-average.md
@@ -14,7 +14,7 @@ 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/)
+Use the [`movingAverage()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/movingaverage/)
or [`timedMovingAverage()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/timedmovingaverage/)
functions to return the moving average of data.
diff --git a/content/influxdb/v1.7/flux/guides/optimize-queries.md b/content/influxdb/v1.7/flux/guides/optimize-queries.md
index d8a0a72dc..271f232ab 100644
--- a/content/influxdb/v1.7/flux/guides/optimize-queries.md
+++ b/content/influxdb/v1.7/flux/guides/optimize-queries.md
@@ -7,8 +7,7 @@ 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/
+canonical: /influxdb/v2.0/query-data/optimize-queries/
---
Optimize your Flux queries to reduce their memory and compute (CPU) requirements.
diff --git a/content/influxdb/v1.7/flux/guides/rate.md b/content/influxdb/v1.7/flux/guides/rate.md
index 8f5dcbd73..6e730a600 100644
--- a/content/influxdb/v1.7/flux/guides/rate.md
+++ b/content/influxdb/v1.7/flux/guides/rate.md
@@ -18,7 +18,7 @@ v2: /influxdb/v2.0/query-data/flux/rate/
---
-Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/derivative/)
+Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/derivative/)
to calculate the rate of change between subsequent values or the
[`aggregate.rate()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/experimental/aggregate/rate/)
to calculate the average rate of change per window of time.
@@ -26,7 +26,7 @@ If time between points varies, these functions normalize points to a common time
making values easily comparable.
## Rate of change between subsequent values
-Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/derivative/)
+Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/derivative/)
to calculate the rate of change per unit of time between subsequent _non-null_ values.
```js
diff --git a/content/influxdb/v1.7/query_language/continuous_queries.md b/content/influxdb/v1.7/query_language/continuous_queries.md
index 60e0c166f..bf1c914d5 100644
--- a/content/influxdb/v1.7/query_language/continuous_queries.md
+++ b/content/influxdb/v1.7/query_language/continuous_queries.md
@@ -983,4 +983,4 @@ Kapacitor, InfluxData's data processing engine, can do the same work as
continuous queries in InfluxDB databases.
To learn when to use Kapacitor instead of InfluxDB and how to perform the same CQ
-functionality with a TICKscript, see [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/examples/continuous_queries/).
+functionality with a TICKscript, see [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/guides/continuous_queries/).
diff --git a/content/influxdb/v1.7/query_language/functions.md b/content/influxdb/v1.7/query_language/functions.md
index c10759ade..8cc5bd4dd 100644
--- a/content/influxdb/v1.7/query_language/functions.md
+++ b/content/influxdb/v1.7/query_language/functions.md
@@ -4374,7 +4374,7 @@ InfluxDB then rounds those averages down to the nearest integer.
_InfluxQL does not currently support histogram generation.
For information about creating histograms with data stored in InfluxDB, see
-[Flux's `histogram()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/transformations/histogram)._
+[Flux's `histogram()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/histogram)._
### LN()
diff --git a/content/influxdb/v1.7/tools/influxd-cli/_index.md b/content/influxdb/v1.7/tools/influxd-cli/_index.md
index 159633f53..760a74a77 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
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/
v2: /influxdb/v2.0/reference/cli/influxd/
---
diff --git a/content/influxdb/v1.7/tools/influxd-cli/backup.md b/content/influxdb/v1.7/tools/influxd-cli/backup.md
index bde299fd8..e5e48b297 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
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/backup/
v2: /influxdb/v2.0/reference/cli/influx/backup/
---
diff --git a/content/influxdb/v1.7/tools/influxd-cli/config.md b/content/influxdb/v1.7/tools/influxd-cli/config.md
index 825e2bdd9..01433ded7 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/config.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/config.md
@@ -6,6 +6,7 @@ menu:
name: influxd config
weight: 10
parent: influxd
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/config/
---
The `influxd config` command displays the default configuration.
diff --git a/content/influxdb/v1.7/tools/influxd-cli/restore.md b/content/influxdb/v1.7/tools/influxd-cli/restore.md
index 81be8792f..3a00dc72d 100644
--- a/content/influxdb/v1.7/tools/influxd-cli/restore.md
+++ b/content/influxdb/v1.7/tools/influxd-cli/restore.md
@@ -6,7 +6,8 @@ menu:
name: influxd restore
weight: 10
parent: influxd
-v2: /influxdb/v2.0/reference/cli/influxd/restore/
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/restore/
+v2: /influxdb/v2.0/reference/cli/influx/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 ff80ed747..1ee47d171 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
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/run/
v2: /influxdb/v2.0/reference/cli/influxd/run/
---
diff --git a/content/influxdb/v1.7/tools/influxd-cli/version.md b/content/influxdb/v1.7/tools/influxd-cli/version.md
index dd8995d0a..333ed36d8 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
+canonical: /{{< latest "influxdb" "v1" >}}/tools/influxd/version/
v2: /influxdb/v2.0/reference/cli/influxd/version/
---
diff --git a/content/influxdb/v1.7/troubleshooting/errors.md b/content/influxdb/v1.7/troubleshooting/errors.md
index bb135df8f..d5c144bb1 100644
--- a/content/influxdb/v1.7/troubleshooting/errors.md
+++ b/content/influxdb/v1.7/troubleshooting/errors.md
@@ -349,7 +349,7 @@ It will be in the `killed` state, which means the signal has been sent, but the
query itself has not hit an interrupt point.
**Resources:**
-[Query management](/influxdb/v1.0/troubleshooting/query_management/)
+[Query management](/influxdb/v1.7/troubleshooting/query_management/)
## Common `-import` errors
diff --git a/content/influxdb/v1.8/_index.md b/content/influxdb/v1.8/_index.md
index 43799a992..8fba033fc 100644
--- a/content/influxdb/v1.8/_index.md
+++ b/content/influxdb/v1.8/_index.md
@@ -28,4 +28,4 @@ It compiles into a single binary with no external dependencies.
* Continuous queries automatically compute aggregate data to make frequent queries more efficient.
The open source edition of InfluxDB runs on a single node.
-If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/{{< latest "enterprise_influxdb" "v1" >}}/high_availability/).
+If you require high availability to eliminate a single point of failure, consider the [InfluxDB Enterprise Edition](/{{< latest "enterprise_influxdb" "v1" >}}/).
diff --git a/content/influxdb/v1.8/about_the_project/releasenotes-changelog.md b/content/influxdb/v1.8/about_the_project/releasenotes-changelog.md
index e31c77022..cc4ba964b 100644
--- a/content/influxdb/v1.8/about_the_project/releasenotes-changelog.md
+++ b/content/influxdb/v1.8/about_the_project/releasenotes-changelog.md
@@ -22,7 +22,7 @@ v2: /influxdb/v2.0/reference/release-notes/influxdb/
- `stat_total_duration`
- `stat_compile_duration`
- `stat_execute_duration`
-
+
Now, these durations are logged correctly.
## v1.8.3 [2020-09-30]
@@ -96,7 +96,7 @@ This release updates support for the Flux language and queries. To learn about F
#### Forward compatibility
-- [InfluxDB 2.0 API compatibility endpoints](/v1.8/tools/api/#influxdb-2-0-api-compatibility-endpoints) are now part of the InfluxDB 1.x line.
+- [InfluxDB 2.0 API compatibility endpoints](/influxdb/v1.8/tools/api/#influxdb-20-api-compatibility-endpoints) are now part of the InfluxDB 1.x line.
This allows you to leverage the new InfluxDB 2.0 [client libraries](/influxdb/v1.8/tools/api_client_libraries/)
for both writing and querying data with Flux. Take advantage of the latest client libraries
while readying your implementation for a move to InfluxDB 2.0 Cloud when you're ready to scale.
diff --git a/content/influxdb/v1.8/administration/authentication_and_authorization.md b/content/influxdb/v1.8/administration/authentication_and_authorization.md
index 3a6120fce..246c01862 100644
--- a/content/influxdb/v1.8/administration/authentication_and_authorization.md
+++ b/content/influxdb/v1.8/administration/authentication_and_authorization.md
@@ -2,7 +2,7 @@
title: Authentication and authorization in InfluxDB
description: Set up and manage authentication and authorization in InfluxDB OSS.
aliases:
- - influxdb/v1.8/administration/authentication_and_authorization/
+ /influxdb/v1.8/query_language/authentication_and_authorization/
menu:
influxdb_1_8:
name: Manage authentication and authorization
diff --git a/content/influxdb/v1.8/administration/config.md b/content/influxdb/v1.8/administration/config.md
index 78fbde5d2..495102fa6 100644
--- a/content/influxdb/v1.8/administration/config.md
+++ b/content/influxdb/v1.8/administration/config.md
@@ -1242,7 +1242,7 @@ Environment variable: `INFLUXDB_CONTINUOUS_QUERIES_RUN_INTERVAL`
### `[tls]`
Global configuration settings for Transport Layer Security (TLS) in InfluxDB.
-For more information, see [Enabling HTTPS](/v1.8/administration/https_setup/).
+For more information, see [Enabling HTTPS](/influxdb/v1.8/administration/https_setup/).
If the TLS configuration settings is not specified,
InfluxDB supports all of the cipher suite IDs listed and all TLS versions implemented in the [Constants section of the Go `crypto/tls` package documentation](https://golang.org/pkg/crypto/tls/#pkg-constants),
diff --git a/content/influxdb/v1.8/concepts/glossary.md b/content/influxdb/v1.8/concepts/glossary.md
index 514c4c569..30994458d 100644
--- a/content/influxdb/v1.8/concepts/glossary.md
+++ b/content/influxdb/v1.8/concepts/glossary.md
@@ -170,7 +170,7 @@ The attribute of the retention policy that determines how many copies of data to
For three nodes or less, the default replication factor equals the number of data nodes.
For more than three nodes, the default replication factor is 3. To change the default replication factor, specify the replication factor `n` in the retention policy.
-Related entries: [cluster](/influxdb/v0.10/concepts/glossary/#cluster), [duration](/influxdb/v1.8/concepts/glossary/#duration), [node](/influxdb/v1.8/concepts/glossary/#node),
+Related entries: [duration](/influxdb/v1.8/concepts/glossary/#duration), [node](/influxdb/v1.8/concepts/glossary/#node),
[retention policy](/influxdb/v1.8/concepts/glossary/#retention-policy-rp)
## retention policy (RP)
diff --git a/content/influxdb/v1.8/concepts/schema_and_data_layout.md b/content/influxdb/v1.8/concepts/schema_and_data_layout.md
index 593301b3c..65e722972 100644
--- a/content/influxdb/v1.8/concepts/schema_and_data_layout.md
+++ b/content/influxdb/v1.8/concepts/schema_and_data_layout.md
@@ -47,7 +47,7 @@ In general, your queries should guide what gets stored as a tag and what gets st
Not required, but simplifies writing queries because you won't have to wrap tag or field names in double quotes.
See [InfluxQL](https://github.com/influxdata/influxql/blob/master/README.md#keywords) and [Flux](https://github.com/influxdata/flux/blob/master/docs/SPEC.md#keywords) keywords to avoid.
-Also, if a tag or field name contains characters other than `[A-z,_]`, you must wrap it in double quotes in InfluxQL or use [bracket notation](/flux/latest/introduction/getting-started/syntax-basics/#objects) in Flux.
+Also, if a tag or field name contains characters other than `[A-z,_]`, you must wrap it in double quotes in InfluxQL or use [bracket notation](/{{< latest "influxdb" "v2" >}}/query-data/get-started/syntax-basics/#records) in Flux.
### Discouraged schema design
diff --git a/content/influxdb/v1.8/flux/get-started/syntax-basics.md b/content/influxdb/v1.8/flux/get-started/syntax-basics.md
index 0364b5e6b..14c9a34ae 100644
--- a/content/influxdb/v1.8/flux/get-started/syntax-basics.md
+++ b/content/influxdb/v1.8/flux/get-started/syntax-basics.md
@@ -220,7 +220,7 @@ Then using Flux's `sort()` and `limit()` functions to find the top `n` results i
topN = (tables=<-, n) => tables |> sort(desc: true) |> limit(n: n)
```
-_More information about creating custom functions is available in the [Custom functions](/{{< latest "influxdb" "v2" >}}/query-data-/flux/custom-functions) documentation._
+_More information about creating custom functions is available in the [Custom functions](/{{< latest "influxdb" "v2" >}}/query-data/flux/custom-functions) documentation._
Using the `cpuUsageUser` data stream variable defined [above](#define-data-stream-variables),
find the top five data points with the custom `topN` function and yield the results.
diff --git a/content/influxdb/v1.8/flux/guides/flux-in-dashboards.md b/content/influxdb/v1.8/flux/guides/flux-in-dashboards.md
index ff32c3e74..5b7d80cf8 100644
--- a/content/influxdb/v1.8/flux/guides/flux-in-dashboards.md
+++ b/content/influxdb/v1.8/flux/guides/flux-in-dashboards.md
@@ -9,7 +9,6 @@ menu:
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.8/flux/guides/group-data.md b/content/influxdb/v1.8/flux/guides/group-data.md
index e2f000fa7..b09711d1d 100644
--- a/content/influxdb/v1.8/flux/guides/group-data.md
+++ b/content/influxdb/v1.8/flux/guides/group-data.md
@@ -160,7 +160,7 @@ Table: keys: [_start, _stop, _field, _measurement, cpu]
**Note that the group key is output with each table: `Table: keys: `.**
-
+
### Group by CPU
Group the `dataSet` stream by the `cpu` column.
@@ -249,7 +249,7 @@ Table: keys: [cpu]
The visualization remains the same.
-
+
### Group by time
Grouping data by the `_time` column is a good illustration of how grouping changes the structure of your data.
@@ -374,7 +374,7 @@ Table: keys: [_time]
Because each timestamp is structured as a separate table, when visualized, all
points that share the same timestamp appear connected.
-
+
{{% note %}}
With some further processing, you could calculate the average CPU usage across all CPUs per point
@@ -666,7 +666,7 @@ Table: keys: [_time, cpu]
When visualized, tables appear as individual, unconnected points.
-
+
Grouping by `cpu` and `_time` is a good illustration of how grouping works.
diff --git a/content/influxdb/v1.8/flux/guides/mathematic-operations.md b/content/influxdb/v1.8/flux/guides/mathematic-operations.md
index 2decce92b..0b430df44 100644
--- a/content/influxdb/v1.8/flux/guides/mathematic-operations.md
+++ b/content/influxdb/v1.8/flux/guides/mathematic-operations.md
@@ -67,7 +67,7 @@ For example:
{{% /note %}}
## Custom mathematic functions
-Flux lets you [create custom functions](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/custom-functions) that use mathematic operations.
+Flux lets you [create custom functions](/{{< latest "influxdb" "v2" >}}/query-data/flux/custom-functions) that use mathematic operations.
View the examples below.
###### Custom multiplication function
@@ -89,7 +89,7 @@ percent(sample: 20.0, total: 80.0)
### Transform values in a data stream
To transform multiple values in an input stream, your function needs to:
-- [Handle piped-forward data](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/custom-functions/#functions-that-manipulate-piped-forward-data).
+- [Handle piped-forward data](/{{< latest "influxdb" "v2" >}}/query-data/flux/custom-functions/#functions-that-manipulate-piped-forward-data).
- Each operand necessary for the calculation exists in each row _(see [Pivot vs join](#pivot-vs-join) below)_.
- Use the [`map()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/map) to iterate over each row.
diff --git a/content/influxdb/v1.8/flux/guides/moving-average.md b/content/influxdb/v1.8/flux/guides/moving-average.md
index 13715a46f..42e331e50 100644
--- a/content/influxdb/v1.8/flux/guides/moving-average.md
+++ b/content/influxdb/v1.8/flux/guides/moving-average.md
@@ -14,7 +14,7 @@ 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/)
+Use the [`movingAverage()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/movingaverage/)
or [`timedMovingAverage()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/timedmovingaverage/)
functions to return the moving average of data.
diff --git a/content/influxdb/v1.8/flux/guides/optimize-queries.md b/content/influxdb/v1.8/flux/guides/optimize-queries.md
index d0540379e..321386951 100644
--- a/content/influxdb/v1.8/flux/guides/optimize-queries.md
+++ b/content/influxdb/v1.8/flux/guides/optimize-queries.md
@@ -7,8 +7,7 @@ menu:
influxdb_1_8:
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/
+canonical: /influxdb/v2.0/query-data/optimize-queries/
---
Optimize your Flux queries to reduce their memory and compute (CPU) requirements.
diff --git a/content/influxdb/v1.8/flux/guides/rate.md b/content/influxdb/v1.8/flux/guides/rate.md
index 73c8fcff5..fc4c27563 100644
--- a/content/influxdb/v1.8/flux/guides/rate.md
+++ b/content/influxdb/v1.8/flux/guides/rate.md
@@ -18,7 +18,7 @@ v2: /influxdb/v2.0/query-data/flux/rate/
---
-Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/derivative/)
+Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/derivative/)
to calculate the rate of change between subsequent values or the
[`aggregate.rate()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/experimental/aggregate/rate/)
to calculate the average rate of change per window of time.
@@ -29,7 +29,7 @@ making values easily comparable.
- [Average rate of change per window of time](#average-rate-of-change-per-window-of-time)
## Rate of change between subsequent values
-Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/derivative/)
+Use the [`derivative()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/derivative/)
to calculate the rate of change per unit of time between subsequent _non-null_ values.
```js
diff --git a/content/influxdb/v1.8/guides/calculate_percentages.md b/content/influxdb/v1.8/guides/calculate_percentages.md
index b19fba2db..09433103c 100644
--- a/content/influxdb/v1.8/guides/calculate_percentages.md
+++ b/content/influxdb/v1.8/guides/calculate_percentages.md
@@ -39,13 +39,13 @@ Learn how to calculate a percentage using the following examples:
When performing any math operation in a Flux query, you must complete the following steps:
-1. Specify the [bucket](/flux/latest/introduction/getting-started/#buckets) to query from and the time range to query.
+1. Specify the [bucket](/{{< latest "influxdb" "v2" >}}/query-data/get-started/#buckets) to query from and the time range to query.
2. Filter your data by measurements, fields, and other applicable criteria.
3. Align values in one row (required to perform math in Flux) by using one of the following functions:
- - To query **from multiple** data sources, use the [`join()` function](/flux/latest/stdlib/built-in/transformations/join/).
- - To query **from the same** data source, use the [`pivot()` function](/flux/latest/stdlib/built-in/transformations/pivot/).
+ - To query **from multiple** data sources, use the [`join()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/join/).
+ - To query **from the same** data source, use the [`pivot()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/pivot/).
-For examples using the `join()` function to calculate percentages and more examples of calculating percentages, see [Calculate percentages with Flux](/flux/latest/guides/calculate-percentages/).
+For examples using the `join()` function to calculate percentages and more examples of calculating percentages, see [Calculate percentages with Flux](/{{< latest "influxdb" "v2" >}}/query-data/flux/calculate-percentages/).
#### Data variable
@@ -73,7 +73,7 @@ data
## Calculate a percentage from two fields
-Use the `data` variable created above, and then use the [`map()` function](/flux/latest/stdlib/built-in/transformations) to divide one field by another, multiply by 100, and add a new `percent` field to store the percentage values in.
+Use the `data` variable created above, and then use the [`map()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/map/) to divide one field by another, multiply by 100, and add a new `percent` field to store the percentage values in.
```js
data
@@ -89,7 +89,7 @@ data
## Calculate a percentage using aggregate functions
-Use [`aggregateWindow()`](/flux/latest/stdlib/built-in/transformations/aggregates/aggregatewindow) to window data by time and perform an aggregate function on each window.
+Use [`aggregateWindow()`](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/aggregates/aggregatewindow) to window data by time and perform an aggregate function on each window.
```js
from(bucket:"/")
diff --git a/content/influxdb/v1.8/query_language/continuous_queries.md b/content/influxdb/v1.8/query_language/continuous_queries.md
index bfdeb1b6e..6c60c8b0f 100644
--- a/content/influxdb/v1.8/query_language/continuous_queries.md
+++ b/content/influxdb/v1.8/query_language/continuous_queries.md
@@ -984,4 +984,4 @@ Kapacitor, InfluxData's data processing engine, can do the same work as
continuous queries in InfluxDB databases.
To learn when to use Kapacitor instead of InfluxDB and how to perform the same CQ
-functionality with a TICKscript, see [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/examples/continuous_queries/).
+functionality with a TICKscript, see [examples of continuous queries in Kapacitor](/{{< latest "kapacitor" >}}/guides/continuous_queries/).
diff --git a/content/influxdb/v1.8/query_language/functions.md b/content/influxdb/v1.8/query_language/functions.md
index 3db4ef896..09979e1e0 100644
--- a/content/influxdb/v1.8/query_language/functions.md
+++ b/content/influxdb/v1.8/query_language/functions.md
@@ -4375,7 +4375,7 @@ InfluxDB then rounds those averages down to the nearest integer.
_InfluxQL does not currently support histogram generation.
For information about creating histograms with data stored in InfluxDB, see
-[Flux's `histogram()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/transformations/histogram)._
+[Flux's `histogram()` function](/{{< latest "influxdb" "v2" >}}/reference/flux/stdlib/built-in/transformations/histogram)._
### LN()
diff --git a/content/influxdb/v1.8/tools/influxd/restore.md b/content/influxdb/v1.8/tools/influxd/restore.md
index 28604b7c0..3860f3c57 100644
--- a/content/influxdb/v1.8/tools/influxd/restore.md
+++ b/content/influxdb/v1.8/tools/influxd/restore.md
@@ -7,7 +7,7 @@ menu:
name: influxd restore
weight: 10
parent: influxd
-v2: /influxdb/v2.0/reference/cli/influxd/restore/
+v2: /influxdb/v2.0/reference/cli/influx/restore/
---
The `influxd restore` command restores backup data and metadata from an InfluxDB backup directory.
diff --git a/content/influxdb/v1.8/troubleshooting/errors.md b/content/influxdb/v1.8/troubleshooting/errors.md
index 3952c2de4..84a0010e3 100644
--- a/content/influxdb/v1.8/troubleshooting/errors.md
+++ b/content/influxdb/v1.8/troubleshooting/errors.md
@@ -350,7 +350,7 @@ It will be in the `killed` state, which means the signal has been sent, but the
query itself has not hit an interrupt point.
**Resources:**
-[Query management](/influxdb/v1.0/troubleshooting/query_management/)
+[Query management](/influxdb/v1.8/troubleshooting/query_management/)
## Common `-import` errors
diff --git a/content/influxdb/v2.0/backup-restore/restore.md b/content/influxdb/v2.0/backup-restore/restore.md
index a81ad38e3..57d306daa 100644
--- a/content/influxdb/v2.0/backup-restore/restore.md
+++ b/content/influxdb/v2.0/backup-restore/restore.md
@@ -14,8 +14,7 @@ related:
products: [oss]
---
-Use the `influx restore` command to restore backup data and metadata from InfluxDB.
-You must stop InfluxDB before restoring data.
+Use the `influx restore` command to restore backup data and metadata from InfluxDB OSS.
{{% cloud %}}
The `influx restore` command only restores data to InfluxDB OSS, **not {{< cloud-name "short" >}}**.
@@ -28,19 +27,18 @@ If the restore process fails, InfluxDB preserves the data in the temporary locat
_See [Recover from a failed restore](#recover-from-a-failed-restore)._
## Restore data with the influx CLI
-1. **Stop the `influxd` server.**
-2. Use the `influx restore` command and specify the path to the backup directory in the first argument.
+Use the `influx restore` command and specify the path to the backup directory in the first argument.
- ```sh
- # Syntax
- influx restore
+```sh
+# Syntax
+influx restore
- # Example
- influx restore ~/backups/2020-01-20_12-00/
- ```
+# Example
+influx restore ~/backups/2020-01-20_12-00/
+```
- _For more information about restore options and flags, see the
- [`influx restore` documentation](/influxdb/v2.0/reference/cli/influx/restore/)._
+_For more information about restore options and flags, see the
+[`influx restore` documentation](/influxdb/v2.0/reference/cli/influx/restore/)._
## Recover from a failed restore
diff --git a/content/influxdb/v2.0/query-data/get-started/_index.md b/content/influxdb/v2.0/query-data/get-started/_index.md
index c1333a9d8..8cc5086ec 100644
--- a/content/influxdb/v2.0/query-data/get-started/_index.md
+++ b/content/influxdb/v2.0/query-data/get-started/_index.md
@@ -87,6 +87,6 @@ The [Execute queries](/influxdb/v2.0/query-data/execute-queries) guide walks thr
the different tools available for querying InfluxDB with Flux.
diff --git a/content/influxdb/v2.0/reference/cli/influx/restore/index.md b/content/influxdb/v2.0/reference/cli/influx/restore/index.md
index e124dc930..90ca2fb8b 100644
--- a/content/influxdb/v2.0/reference/cli/influx/restore/index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/restore/index.md
@@ -14,11 +14,7 @@ related:
- /influxdb/v2.0/reference/cli/influx/#flag-patterns-and-conventions, influx CLI—Flag patterns and conventions
---
-The `influx restore` command restores backup data and metadata from an InfluxDB backup directory.
-
-{{% warn %}}
-Shut down the `influxd` server before restoring data.
-{{% /warn %}}
+The `influx restore` command restores backup data and metadata from an InfluxDB OSS backup directory.
### The restore process
When restoring data from a backup file set, InfluxDB temporarily moves existing
@@ -82,5 +78,3 @@ influx restore \
--new-bucket new-example-bucket \
--input /path/to/backup/dir/
```
-
-
diff --git a/content/influxdb/v2.0/reference/flux/flux-vs-influxql.md b/content/influxdb/v2.0/reference/flux/flux-vs-influxql.md
index 2c9eed1dc..5932e1434 100644
--- a/content/influxdb/v2.0/reference/flux/flux-vs-influxql.md
+++ b/content/influxdb/v2.0/reference/flux/flux-vs-influxql.md
@@ -374,8 +374,8 @@ _For a complete list of Flux functions, [view all Flux functions](/influxdb/v2.0
| [CEIL](/{{< latest "influxdb" "v1" >}}/query_language/functions#ceil) | [math.ceil()](/influxdb/v2.0/reference/flux/stdlib/math/ceil/) |
| [COS](/{{< latest "influxdb" "v1" >}}/query_language/functions#cos) | [math.cos()](/influxdb/v2.0/reference/flux/stdlib/math/cos/) |
| [CUMULATIVE_SUM](/{{< latest "influxdb" "v1" >}}/query_language/functions#cumulative-sum) | [cumulativeSum()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/cumulativesum/) |
-| [DERIVATIVE](/{{< latest "influxdb" "v1" >}}/query_language/functions#derivative) | [derivative()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/derivative/) |
-| [DIFFERENCE](/{{< latest "influxdb" "v1" >}}/query_language/functions#difference) | [difference()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/difference/) |
+| [DERIVATIVE](/{{< latest "influxdb" "v1" >}}/query_language/functions#derivative) | [derivative()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/derivative/) |
+| [DIFFERENCE](/{{< latest "influxdb" "v1" >}}/query_language/functions#difference) | [difference()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/difference/) |
| [ELAPSED](/{{< latest "influxdb" "v1" >}}/query_language/functions#elapsed) | [elapsed()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/elapsed/) |
| [EXP](/{{< latest "influxdb" "v1" >}}/query_language/functions#exp) | [math.exp()](/influxdb/v2.0/reference/flux/stdlib/math/exp/) |
| [FLOOR](/{{< latest "influxdb" "v1" >}}/query_language/functions#floor) | [math.floor()](/influxdb/v2.0/reference/flux/stdlib/math/floor/) |
@@ -384,9 +384,9 @@ _For a complete list of Flux functions, [view all Flux functions](/influxdb/v2.0
| [LOG](/{{< latest "influxdb" "v1" >}}/query_language/functions#log) | [math.logb()](/influxdb/v2.0/reference/flux/stdlib/math/logb/) |
| [LOG2](/{{< latest "influxdb" "v1" >}}/query_language/functions#log2) | [math.log2()](/influxdb/v2.0/reference/flux/stdlib/math/log2/) |
| [LOG10](/{{< latest "influxdb" "v1" >}}/query_language/functions#logt10) | [math.log10()](/influxdb/v2.0/reference/flux/stdlib/math/log10/) |
-| [MOVING_AVERAGE](/{{< latest "influxdb" "v1" >}}/query_language/functions#moving-average) | [movingAverage()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/movingaverage/) |
-| [NON_NEGATIVE_DERIVATIVE](/{{< latest "influxdb" "v1" >}}/query_language/functions#non-negative-derivative) | [derivative(nonNegative:true)](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/derivative/) |
-| [NON_NEGATIVE_DIFFERENCE](/{{< latest "influxdb" "v1" >}}/query_language/functions#non-negative-difference) | [difference(nonNegative:true)](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/derivative/) |
+| [MOVING_AVERAGE](/{{< latest "influxdb" "v1" >}}/query_language/functions#moving-average) | [movingAverage()](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/movingaverage/) |
+| [NON_NEGATIVE_DERIVATIVE](/{{< latest "influxdb" "v1" >}}/query_language/functions#non-negative-derivative) | [derivative(nonNegative:true)](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/derivative/) |
+| [NON_NEGATIVE_DIFFERENCE](/{{< latest "influxdb" "v1" >}}/query_language/functions#non-negative-difference) | [difference(nonNegative:true)](/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/derivative/) |
| [POW](/{{< latest "influxdb" "v1" >}}/query_language/functions#pow) | [math.pow()](/influxdb/v2.0/reference/flux/stdlib/math/pow/) |
| [ROUND](/{{< latest "influxdb" "v1" >}}/query_language/functions#round) | [math.round()](/influxdb/v2.0/reference/flux/stdlib/math/round/) |
| [SIN](/{{< latest "influxdb" "v1" >}}/query_language/functions#sin) | [math.sin()](/influxdb/v2.0/reference/flux/stdlib/math/sin/) |
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/sensu/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/sensu/endpoint.md
index c9f57221d..402bced66 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/sensu/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/sensu/endpoint.md
@@ -85,7 +85,7 @@ following fields:
- `text`
- `status`
-_For more information, see [`sensu.event()` parameters](/v2.0/reference/flux/stdlib/contrib/sensu/event/#parameters)._
+_For more information, see [`sensu.event()` parameters](/influxdb/v2.0/reference/flux/stdlib/contrib/sensu/event/#parameters)._
## Examples
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/endpoint.md
index 3c27f967b..75f429fb3 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/endpoint.md
@@ -47,7 +47,7 @@ following fields:
- `text`
- `summary`
-_For more information, see [`teams.message()` parameters](/v2.0/reference/flux/stdlib/contrib/teams/message/#parameters)._
+_For more information, see [`teams.message()` parameters](/influxdb/v2.0/reference/flux/stdlib/contrib/teams/message/#parameters)._
## Examples
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/endpoint.md
index 8c804cd44..4f9cf0f6a 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/endpoint.md
@@ -28,7 +28,7 @@ telegram.endpoint(
{{% note %}}
For information about retrieving your Telegram **bot token** and **channel ID**,
-see [Set up a Telegram bot](/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
+see [Set up a Telegram bot](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
{{% /note %}}
## Parameters
@@ -74,7 +74,7 @@ following fields:
- `text`
- `silent`
-_For more information, see [`telegram.message()` parameters](/v2.0/reference/flux/stdlib/contrib/telegram/message/#parameters)._
+_For more information, see [`telegram.message()` parameters](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message/#parameters)._
## Examples
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message.md
index f13791141..47fbd9336 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/message.md
@@ -31,7 +31,7 @@ telegram.message(
{{% note %}}
For information about retrieving your Telegram **bot token** and **channel ID**,
-see [Set up a Telegram bot](/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
+see [Set up a Telegram bot](/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/#set-up-a-telegram-bot).
{{% /note %}}
## Parameters
diff --git a/content/influxdb/v2.0/telegraf-configs/update.md b/content/influxdb/v2.0/telegraf-configs/update.md
index 302a98890..ec4cf65d7 100644
--- a/content/influxdb/v2.0/telegraf-configs/update.md
+++ b/content/influxdb/v2.0/telegraf-configs/update.md
@@ -45,7 +45,7 @@ Telegraf doesn't detect changes to remote configurations. If you edit a remote c
2. To edit the configuration file:
a. Click the name of the configuration.
- b. Add or update [Telegraf plugin settings](/telegraf/latest/plugins/) in the window that appears.
+ b. Add or update [Telegraf plugin settings](/{{< latest "telegraf" >}}/plugins/) in the window that appears.
{{% note %}}
The text editor window doesn't detect if any plugins or settings are misconfigured. Any errors in your configuration that may cause Telegraf to fail when you restart it.
{{% /note %}}
diff --git a/content/influxdb/v2.0/tools/chronograf.md b/content/influxdb/v2.0/tools/chronograf.md
index c45fd9dcd..32816deec 100644
--- a/content/influxdb/v2.0/tools/chronograf.md
+++ b/content/influxdb/v2.0/tools/chronograf.md
@@ -1,9 +1,8 @@
---
title: Use Chronograf with InfluxDB OSS
description: >
- [Chronograf](/{{< latest "chronograf" >}}/) is a data visualization and dashboarding
- tool designed to visualize data in InfluxDB 1.x. It is part of the [TICKstack](/platform/)
- that provides an InfluxQL data explorer, Kapacitor integrations, and more.
+ Chronograf is a data visualization and dashboarding tool designed to visualize data in InfluxDB 1.x.
+ It is part of the [TICKstack](/platform/) that provides an InfluxQL data explorer, Kapacitor integrations, and more.
Continue to use Chronograf with **InfluxDB Cloud** and **InfluxDB OSS 2.0** and the
[1.x compatibility API](/influxdb/v2.0/reference/api/influxdb-1x/).
menu:
diff --git a/content/influxdb/v2.0/upgrade/v1-to-v2/_index.md b/content/influxdb/v2.0/upgrade/v1-to-v2/_index.md
index d7e4edfb3..0cacaac33 100644
--- a/content/influxdb/v2.0/upgrade/v1-to-v2/_index.md
+++ b/content/influxdb/v2.0/upgrade/v1-to-v2/_index.md
@@ -211,7 +211,7 @@ It is also saved (for troubleshooting and debugging) in the current directory to
### Post-upgrade
-To verify 1.x users were successfully migrated to 2.0, run [`influx v1 auth list`](influxdb/v2.0/reference/cli/influx/v1/auth/list/).
+To verify 1.x users were successfully migrated to 2.0, run [`influx v1 auth list`](/influxdb/v2.0/reference/cli/influx/v1/auth/list/).
## Further reading
diff --git a/content/influxdb/v2.0/visualize-data/variables/common-variables.md b/content/influxdb/v2.0/visualize-data/variables/common-variables.md
index 1c660bd21..3ff5737af 100644
--- a/content/influxdb/v2.0/visualize-data/variables/common-variables.md
+++ b/content/influxdb/v2.0/visualize-data/variables/common-variables.md
@@ -67,7 +67,7 @@ schema.tagValues(bucket: "bucket-name", tag: "host")
## List Docker containers
List all Docker containers when using the Docker Telegraf plugin.
-_**Telegraf plugin:** [Docker](/{{< latest "telegraf" >}}/plugins/inputs/#docker)_
+_**Telegraf plugin:** [Docker](/{{< latest "telegraf" >}}/plugins/#docker)_
_**Flux package:** [InfluxDB schema](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/)_
_**Flux functions:** [schema.tagValues()](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/tagvalues/)_
@@ -80,7 +80,7 @@ schema.tagValues(bucket: "bucket-name", tag: "container_name")
## List Kubernetes pods
List all Kubernetes pods when using the Kubernetes Telegraf plugin.
-_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/inputs/#kubernetes)_
+_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/#kubernetes)_
_**Flux package:** [InfluxDB schema](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/)_
_**Flux functions:** [schema.measurementTagValues()](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/measurementtagvalues/)_
@@ -97,7 +97,7 @@ schema.measurementTagValues(
## List Kubernetes nodes
List all Kubernetes nodes when using the Kubernetes Telegraf plugin.
-_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/inputs/#kubernetes)_
+_**Telegraf plugin:** [Kubernetes](/{{< latest "telegraf" >}}/plugins/#kubernetes)_
_**Flux package:** [InfluxDB schema](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/)_
_**Flux functions:** [schema.measurementTagValues()](/influxdb/v2.0/reference/flux/stdlib/influxdb-schema/measurementtagvalues/)_
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/band.md b/content/influxdb/v2.0/visualize-data/visualization-types/band.md
index bf5ed5f81..46256c4c6 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/band.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/band.md
@@ -31,7 +31,7 @@ To see bands (boundaries) in the **Band Plot** visualization, you must set up tw
- In the **Upper Column Name** field, select a function for the upper boundary.
- In the **Main Column Name** field, select a function for the main boundary.
- In the **Lower Column Name** field, select a function for the lower boundary.
-6. (Optional) Continue to customize your visualization, including options such as interpolation, color, hover dimension, and y-axis settings. For more information, see [Options](options) and [Y Axis](y-axis) below.
+6. (Optional) Continue to customize your visualization, including options such as interpolation, color, hover dimension, and y-axis settings. For more information, see [Options](#options) and [Y Axis](#y-axis) below.
**Tip:** If you do not see shaded boundaries in the **Band Plot** visualization, verify the query window period includes a sufficient number of data points for the selected aggregate function. By default, the window period is automatically set to ten seconds (`10s`). To adjust your window period, select **Custom**, and then enter a supported time unit (for example nanoseconds (`ns`), microseconds (`us`), milliseconds (`ms`), seconds (`s`), or hours (`h`).
@@ -73,7 +73,7 @@ from(bucket: "bucket_1")
|> yield(name: "min")
```
-5. (Optional) Customize the name of the yielded results for each function by editing the `name` parameter in the [`yield()`](/v2.0/reference/flux/stdlib/built-in/outputs/yield/) function.
+5. (Optional) Customize the name of the yielded results for each function by editing the `name` parameter in the [`yield()`](/influxdb/v2.0/reference/flux/stdlib/built-in/outputs/yield/) function.
For example, to change the name of the first function from `mean` to `Average`, modify the last line to the following:
```js
|> yield(name: "Average")
@@ -83,7 +83,7 @@ For example, to change the name of the first function from `mean` to `Average`,
- In the **Upper Column Name** field, enter the result set to use for the upper boundary.
- In the **Main Column Name** field, enter the result set to use for the main boundary.
- In the **Lower Column Name** field, enter the function for the lower boundary.
-7. (Optional) Continue to customize your visualization, including options such as interpolation, color, hover dimension, and y-axis settings. For more information, see [Options](options) and [Y Axis](y-axis) below.
+7. (Optional) Continue to customize your visualization, including options such as interpolation, color, hover dimension, and y-axis settings. For more information, see [Options](#options) and [Y Axis](#y-axis) below.
### Customize column names
diff --git a/content/kapacitor/v1.4/_index.md b/content/kapacitor/v1.4/_index.md
index 3cdaf7fb5..e79e1f3be 100644
--- a/content/kapacitor/v1.4/_index.md
+++ b/content/kapacitor/v1.4/_index.md
@@ -18,7 +18,7 @@ great choice for data processing.
* Process both streaming data and batch data.
* Query data from InfluxDB on a schedule, and receive data via the
-[line protocol](/influxdb/v1.4/write_protocols/line/) and any other method InfluxDB supports.
+[line protocol](/{{< latest "influxdb" "v2" >}}/reference/syntax/line-protocol/) and any other method InfluxDB supports.
* Perform any transformation currently possible in [InfluxQL](/influxdb/v1.4/query_language/spec/).
* Store transformed data back in InfluxDB.
* Add custom user defined functions to detect anomalies.
diff --git a/content/kapacitor/v1.4/about_the_project/releasenotes-changelog.md b/content/kapacitor/v1.4/about_the_project/releasenotes-changelog.md
index d0e166c35..439ed694c 100644
--- a/content/kapacitor/v1.4/about_the_project/releasenotes-changelog.md
+++ b/content/kapacitor/v1.4/about_the_project/releasenotes-changelog.md
@@ -153,7 +153,7 @@ Create the below snippet as the file `/tmp/prom/localhost.json`:
Start the Prometheues `node_exporter` locally.
Now, startup Kapacitor and it will discover the `localhost:9100` `node_exporter` target and begin scrapping it for metrics.
-For more details on the scraping and discovery systems, see the full documentation [here](/kapacitor/v1.3/pull_metrics/scraping-and-discovery/).
+For more details on the scraping and discovery systems, see the full documentation [here](/{{< latest "kapacitor" >}}/working/scraping-and-discovery/).
The second major feature with this release are changes to the alert topic system.
The previous release introduced this new system as a technical preview and with this release the alerting service has been simplified.
diff --git a/content/kapacitor/v1.4/administration/security.md b/content/kapacitor/v1.4/administration/security.md
index 87fb69a5b..3ed5938c4 100644
--- a/content/kapacitor/v1.4/administration/security.md
+++ b/content/kapacitor/v1.4/administration/security.md
@@ -19,7 +19,7 @@ menu:
This document covers the basics of securing the open-source distribution of
Kapacitor. For information about security with Enterprise Kapacitor see the
-[Enterprise Kapacitor](/enterprise_kapacitor/v1.4/) documentation.
+[Enterprise Kapacitor](https://archive.docs.influxdata.com/enterprise_kapacitor/v1.4/) documentation.
When seeking to secure Kapacitor it is assumed that the Kapacitor server will be
communicating with an already secured InfluxDB server. It will also make its
diff --git a/content/kapacitor/v1.4/administration/upgrading.md b/content/kapacitor/v1.4/administration/upgrading.md
index f01cc0eaa..fec81051f 100644
--- a/content/kapacitor/v1.4/administration/upgrading.md
+++ b/content/kapacitor/v1.4/administration/upgrading.md
@@ -30,7 +30,7 @@ Before proceeding with the Kapacitor upgrade, ensure that InfluxDB and Telegraf
* Telegraf 1.6
* Kapacitor 1.4.1
-For instructions on upgrading InfluxDB, please see the [InfluxDB upgrade](/{{< latest "influxdb" "v1" >}}/administration/upgrading/#main-nav) documentation. For instructions on upgrading Telegraf, please see the [Telegraf upgrade](/{{< latest "telegraf" >}}/administration/upgrading/#main-nav) documentation.
+For instructions on upgrading InfluxDB, please see the [InfluxDB upgrade](/{{< latest "influxdb" "v1" >}}/administration/upgrading/#main-nav) documentation.
For information about what is new in the latest Kapacitor release, please see the [Changelog](https://github.com/influxdata/kapacitor/blob/master/CHANGELOG.md) available on GitHub.
diff --git a/content/kapacitor/v1.4/guides/event-handler-setup.md b/content/kapacitor/v1.4/guides/event-handler-setup.md
index 3b91d4c78..6e2a7213d 100644
--- a/content/kapacitor/v1.4/guides/event-handler-setup.md
+++ b/content/kapacitor/v1.4/guides/event-handler-setup.md
@@ -8,113 +8,117 @@ menu:
parent: Guides
---
-Integrate Kapacitor into your monitoring system by sending [alert messages](/kapacitor/v1.4/nodes/alert_node/#message) to supported event handlers.
-Currently, Kapacitor can send alert messages to specific log files and specific URLs, as well as to applications like [Slack](https://slack.com/) and [HipChat](https://www.hipchat.com/).
+Integrate Kapacitor into your monitoring system by sending [alert messages](/kapacitor/v1.4/nodes/alert_node/#message)
+to supported event handlers.
+Currently, Kapacitor can send alert messages to specific log files and specific URLs,
+as well as to applications such as [Slack](https://slack.com/) and [HipChat](https://www.hipchat.com/).
-This document offers step-by-step instructions for setting up event handlers with Kapacitor, including the relevant configuration options and [TICKscript](/kapacitor/v1.4/tick/) syntax.
-Currently, this document doesn't cover every supported event handler, but we will continue to add content to this page over time.
-For a complete list of the supported event handlers and for additional information, please see the [event handler reference documentation](/kapacitor/v1.4/nodes/alert_node/).
+This document offers step-by-step instructions for setting up event handlers with Kapacitor,
+including relevant configuration options and [TICKscript](/kapacitor/v1.4/tick/) syntax.
+Currently, this document doesn't cover every supported event handler, but we will
+continue to add content to this page over time.
+For a complete list of the supported event handlers and for additional information,
+please see the [event handler reference documentation](/kapacitor/v1.4/nodes/alert_node/).
-
+[HipChat Setup](#hipchat-setup)
+[Telegram Setup](#telegram-setup")
## HipChat setup
-[HipChat](https://www.hipchat.com/) is Atlassian's web service for group chat, video chat, and screen
-sharing.
+[HipChat](https://www.hipchat.com/) is Atlassian's web service for group chat,
+video chat, and screen sharing.
Configure Kapacitor to send alert messages to a HipChat room.
### Requirements
To configure Kapacitor with HipChat, you need:
-* your HipChat subdomain name
-* your HipChat room name
-* a HipChat API access token for sending notifications
-
-> ##### HipChat API access token
+- Your HipChat subdomain name
+- Your HipChat room name
+- A HipChat API access token for sending notifications
+#### HipChat API access token
The following steps describe how to create the API access token.
->
-**1.** From the HipChat home page, access `Account settings` by clicking on the
+
+1. From the HipChat home page, access **Account settings** by clicking on the
person icon in the top right corner.
->
-**2.** Select `API access` from the items in the left menu sidebar.
->
-**3.** Under `Create new token`, enter a label for your token (it can be anything).
->
-**4.** Under `Create new token`, select `Send Notification` as the Scope.
->
-**5.** Click `Create`.
->
-Your token appears in the table just above the `Create new token` section:
->
-
+
+2. Select **API access** from the items in the left menu sidebar.
+
+3. Under **Create new token**, enter a label for your token (it can be anything).
+
+4. Under **Create new token**, select **Send Notification** as the Scope.
+
+5. Click **Create**.
+
+ Your token appears in the table just above the **Create new token** section:
+
+ 
### Configuration
In the `[hipchat]` section of Kapacitor's configuration file, set:
-* `enabled` to `true`
-* `subdomain` in the `url` setting to your HipChat subdomain
+- `enabled` to `true`
+- `subdomain` in the `url` setting to your HipChat subdomain
The optional configuration settings are:
-`room`
- Set to your HipChat room.
-This serves as the default chat id if the TICKscript doesn't specify a chat id.
-`token`
- Set to your HipChat [API access token](#hipchat-api-access-token).
+`room`
+Set to your HipChat room.
+This serves as the default chat ID if the TICKscript doesn't specify a chat ID.
+
+`token`
+Set to your HipChat [API access token](#hipchat-api-access-token).
This serves as the default token if the TICKscript doesn't specify an API access token.
-`global`
- Set to `true` to send all alerts to HipChat without needing to specify HipChat in TICKscripts.
-`state-changes-only`
- Set to `true` to only send an alert to HipChat if the alert state changes.
+
+`global`
+Set to `true` to send all alerts to HipChat without needing to specify HipChat in TICKscripts.
+
+`state-changes-only`
+Set to `true` to only send an alert to HipChat if the alert state changes.
This setting only applies if the `global` setting is also set to `true`.
#### Sample configuration
-
-```javascript
- [hipchat]
- enabled = true
- url = "https://my-subdomain.hipchat.com/v2/room"
- room = "my-room"
- token = "mytokentokentokentoken"
- global = false
- state-changes-only = false
+```toml
+[hipchat]
+ enabled = true
+ url = "https://my-subdomain.hipchat.com/v2/room"
+ room = "my-room"
+ token = "mytokentokentokentoken"
+ global = false
+ state-changes-only = false
```
-### TICKscript syntax
-
-```
+#### TICKscript syntax
+```js
|alert()
- .hipChat()
- .room('')
- .token('')
+ .hipChat()
+ .room('')
+ .token('')
```
The `.room()` and `.token()` specifications are optional.
If they aren't set in the TICKscript, they default to the `room` and
-`token` settings in the `[hipchat]` section of the configuration file.
-Note that if `global` is set to `true` in the configuration file, there's no
-need to specify `.hipChat()` in the TICKscript; Kapacitor sends all alerts to HipChat
-by default.
+`token` settings in the `[hipchat]` section of the `kapacitor.conf`.
+
+> If `global` is set to `true` in the configuration file, there's no
+> need to specify `.hipChat()` in the TICKscript.
+> Kapacitor sends all alerts to HipChat by default.
+
+`.room('')`
+Sets the HipChat room.
+
+`.token('')`
+Sets the HipChat [API access token](#hipchat-api-access-token).
-`.room('')`
- Sets the HipChat room.
-`.token('')`
- Sets the HipChat [API access token](#hipchat-api-access-token).
### Examples
-#### Example 1: Send alerts to the HipChat room set in the configuration file
+#### Send alerts to the HipChat room set in the configuration file
-Configuration file:
-```
+_**Configuration file**_
+```toml
[hipchat]
enabled = true
url = "https://testtest.hipchat.com/v2/room"
@@ -124,24 +128,24 @@ Configuration file:
state-changes-only = true
```
-TICKscript:
-```
+_**TICKscript**_
+```js
stream
- |from()
- .measurement('cpu')
- |alert()
- .crit(lambda: "usage_idle" < 97)
- .message('Hey, check your CPU')
- .hipChat()
+ |from()
+ .measurement('cpu')
+ |alert()
+ .crit(lambda: "usage_idle" < 97)
+ .message('Hey, check your CPU')
+ .hipChat()
```
-The setup sends `Hey, check your CPU` to the `my-alerts` room associated with
+The setup sends `Hey, check your CPU` to the **my-alerts** room associated with
the `testest` subdomain.
-#### Example 2: Send alerts to the HipChat room set in the TICKscript
+#### Send alerts to the HipChat room set in the TICKscript
-Configuration file:
-```
+_**Configuration file**_
+```toml
[hipchat]
enabled = true
url = "https://testtest.hipchat.com/v2/room"
@@ -151,19 +155,19 @@ Configuration file:
state-changes-only = true
```
-TICKscript:
-```
+_**TICKscript**_
+```js
stream
- |from()
- .measurement('cpu')
- |alert()
- .crit(lambda: "usage_idle" < 97)
- .message('Hey, check your CPU')
- .hipChat()
- .room('random')
+ |from()
+ .measurement('cpu')
+ |alert()
+ .crit(lambda: "usage_idle" < 97)
+ .message('Hey, check your CPU')
+ .hipChat()
+ .room('random')
```
-The setup sends `Hey, check your CPU` to the `random` room associated with
+The setup sends `Hey, check your CPU` to the **random** room associated with
the `testest` subdomain.
Notice that `.room()` in the TICKscript overrides the `room` setting in the
configuration file.
@@ -175,137 +179,163 @@ Configure Kapacitor to send alert messages to a Telegram bot.
### Requirements
-To configure Kapacitor with Telegraf, you need:
+To configure Kapacitor with Telegram, you need:
-* a Telegram bot
-* a Telegram API access token
-* your Telegram chat id
+- A Telegram bot
+- A Telegram API access token
+- Your Telegram chat ID
-##### Telegram bot
+#### Telegram bot
The following steps describe how to create a new Telegram bot.
->
-**1.** Search for the `@BotFather` username in your Telegram application
->
-**2.** Click `Start` to begin a conversation with `@BotFather`
->
-**3.** Send `/newbot` to `@BotFather`
->
-`@BotFather` responds:
->
- Alright, a new bot. How are we going to call it? Please choose a name for your bot.
->
-`@BotFather` will prompt you through the rest of the bot-creation process; feel
-free to follow his directions or continue with our version of the steps below.
-Both setups result in success!
->
-**4.** Send your bot's name to `@BotFather`
->
-Your bot's name can be anything.
-Note that this is not your bot's Telegram `@username`; you'll create the username
-in step 5.
->
-`@BotFather` responds:
->
- Good. Now let's choose a username for your bot. It must end in `bot`. Like this, for example: TetrisBot or tetris_bot.
->
-**5.** Send your bot's username to `@BotFather`
->
-Your bot's username must end in `bot`.
-For example: `mushroomKap_bot`.
->
-`BotFather` responds:
->
- Done! Congratulations on your new bot. You will find it at t.me/. You can now add a description, about section and profile picture for your bot, see /help for a list of commands. By the way, when you've finished creating your cool bot, ping our Bot Support if you want a better username for it. Just make sure the bot is fully operational before you do this.
->
+
+1. Search for the **@BotFather** username in your Telegram application.
+
+2. Click **Start** to begin a conversation with **@BotFather**.
+
+3. Send `/newbot` to **@BotFather**.
+
+ **@BotFather** responds:
+
+ _Alright, a new bot. How are we going to call it? Please choose a name for your bot._
+
+ **@BotFather** will prompt you through the rest of the bot-creation process; feel
+ free to follow his directions or continue with our version of the steps below.
+ Both setups result in success!
+
+4. Send your bot's name to **@BotFather**.
+
+ Your bot's name can be anything.
+ Note that this is not your bot's Telegram `@username`; you'll create the username
+ in step 5.
+
+ **@BotFather** responds:
+
+ _Good. Now let's choose a username for your bot. It must end in `bot`. Like this, for example: TetrisBot or tetris\_bot._
+
+5. Send your bot's username to **@BotFather**.
+
+ Your bot's username must end in `bot`.
+ For example: `mushroomKap_bot`.
+
+ `BotFather` responds:
+
+ _Done! Congratulations on your new bot. You will find it at t.me/. You can now add a description, about section and profile picture for your bot, see /help for a list of commands. By the way, when you've finished creating your cool bot, ping our Bot Support if you want a better username for it. Just make sure the bot is fully operational before you do this._
+
Use this token to access the HTTP API:
->
- For a description of the Bot API, see this page: https://core.telegram.org/bots/api
->
-**6.** Begin a conversation with your bot
->
-Click on the `t.me/` link in `@BotFather`'s response
-and click `Start` at the bottom of your Telegram application.
->
-Your newly-created bot will appear in the chat list on the left side of the application.
->
-##### Telegram API access token
+ For a description of the Bot API, see this page: https://core.telegram.org/bots/api
+
+6. Begin a conversation with your bot.
+
+ Click on the `t.me/` link in **@BotFather**'s response
+ and click **Start** at the bottom of your Telegram application.
+
+ Your newly created bot will appear in the chat list on the left side of the application.
+
+#### Telegram API access token
The following section describes how to identify or create the API access token.
->
-Telegram's `@BotFather` bot sent you an API access token when you created your bot.
-See the `@BotFather` response in step 5 of the previous section for where to find your token.
->
-If you can't find the API access token, create a new token with the steps
-below.
->
-**1.** Send `/token` to `@BotFather`
->
-**2.** Select the relevant bot at the bottom of your Telegram application
->
-`@BotFather` responds with a new API access token:
->
+
+Telegram's **@BotFather** bot sent you an API access token when you created your bot.
+See the **@BotFather** response in step 5 of the previous section for where to find your token.
+If you can't find the API access token, create a new token with the steps below.
+
+1. Send `/token` to **@BotFather**
+
+2. Select the relevant bot at the bottom of your Telegram application.
+
+ **@BotFather** responds with a new API access token:
+
You can use this token to access HTTP API:
->
+
For a description of the Bot API, see this page: https://core.telegram.org/bots/api
->
-##### Telegram chat ID
-The following steps describe how to identify your chat id.
->
-**1.** Paste the following link in your browser
->
-Replace `` with the API access token that you identified or created in the previous section:
->
- https://api.telegram.org/bot/getUpdates?offset=0
->
-**2.** Send a message to your bot
->
-Send a message to your bot in the Telegram application.
-The message text can be anything; your chat history must include at least one message to get your chat id.
->
-**3.** Refresh your browser
->
-**4.** Identify the chat id
->
-Identify the numerical chat id in the browser.
-In the example below, the chat id is `123456789`.
->
- {"ok":true,"result":[{"update_id":XXXXXXXXX,
- "message":{"message_id":2,"from":{"id":123456789,"first_name":"Mushroom","last_name":"Kap"},"chat":{"id":123456789,"first_name":"Mushroom","last_name":"Kap","type":"private"},"date":1487183963,"text":"hi"}}]}
+#### Telegram chat ID
+
+The following steps describe how to identify your chat ID.
+
+1. Paste the following link in your browser.
+ Replace `` with the API access token that you identified
+ or created in the previous section:
+
+ `https://api.telegram.org/bot/getUpdates?offset=0`
+
+2. Send a message to your bot in the Telegram application.
+ The message text can be anything; your chat history must include at least
+ one message to get your chat ID.
+
+3. Refresh your browser.
+
+4. Identify the numerical chat ID in the JSON provided in the browser.
+ In the formatted example below, the chat ID is `123456789`.
+
+ ```json
+ {
+ "ok": true,
+ "result": [
+ {
+ "update_id": 101010101,
+ "message": {
+ "message_id": 2,
+ "from": {
+ "id": 123456789,
+ "first_name": "Mushroom",
+ "last_name": "Kap"
+ },
+ "chat": {
+ "id": 123456789,
+ "first_name": "Mushroom",
+ "last_name": "Kap",
+ "type": "private"
+ },
+ "date": 1487183963,
+ "text": "hi"
+ }
+ }
+ ]
+ }
+ ```
### Configuration
In the `[telegram]` section of Kapacitor's configuration file set:
-* `enabled` to `true`
-* `token` to your [API access token](#telegram-api-access-token)
+- `enabled` to `true`
+- `token` to your [API access token](#telegram-api-access-token)
The default `url` setting (`https://api.telegram.org/bot`) requires no additional configuration.
The optional configuration settings are:
-`chat_id`
- Set to your Telegram [chat id](#telegram-chat-id). This serves as the default chat id if the TICKscript doesn't specify a chat id.
-`parse-mode`
- Set to `Markdown` or `HTML` for markdown-formatted or HTML-formatted alert messages. The default `parse-mode` is `Markdown`.
-`disable-web-page-preview`
- Set to `true` to disable [link previews](https://telegram.org/blog/link-preview) in alert messages.
-`disable-notification`.
- Set to `true` to disable notifications on iOS devices and disable sounds on Android devices. When set to `true`, Android users continue to receive notifications.
-`global`
- Set to `true` to send all alerts to Telegram without needing to specify Telegram in TICKscripts.
-`state-changes-only`
- Set to `true` to only send an alert to Telegram if the alert state changes. This setting only applies if the `global` setting is also set to `true`.
+##### chat_id
+Set to your Telegram [chat ID](#telegram-chat-id). This serves as the default chat ID if the TICKscript doesn't specify a chat ID.
+
+##### parse-mode
+Set to `Markdown` or `HTML` for Markdown-formatted or HTML-formatted alert messages.
+The default `parse-mode` is `Markdown`.
+
+##### disable-web-page-preview
+Set to `true` to disable [link previews](https://telegram.org/blog/link-preview) in alert messages.
+
+##### disable-notification
+Set to `true` to disable notifications on iOS devices and disable sounds on Android devices.
+When set to `true`, Android users continue to receive notifications.
+
+##### global
+Set to `true` to send all alerts to Telegram without needing to specify Telegram in TICKscripts.
+
+##### state-changes-only
+Set to `true` to only send an alert to Telegram if the alert state changes.
+This setting only applies if the `global` setting is also set to `true`.
+
#### Sample configuration
-
-```
+```toml
[telegram]
enabled = true
url = "https://api.telegram.org/bot"
@@ -318,36 +348,42 @@ The optional configuration settings are:
state-changes-only = true
```
-### TICKscript syntax
-
-```
+#### TICKscript syntax
+```js
|alert()
- .telegram()
- .chatId('')
- .disableNotification()
- .disableWebPagePreview()
- .parseMode(['Markdown' | 'HTML'])
+ .telegram()
+ .chatId('')
+ .disableNotification()
+ .disableWebPagePreview()
+ .parseMode(['Markdown' | 'HTML'])
```
The `.chatId()`, `.disableNotification()`, `.disableWebPagePreview()`, and `.parseMode()` specifications are optional.
-If they aren't set in the TICKscript, they default to the `chat-id`, `disable-notification`, `disable-web-page-preview`, and `parse-mode` settings in the `[telegram]` section of the configuration file.
-Note that if `global` is set to `true` in the configuration file, there's no need to specify `.telegram()` in the TICKscript; Kapacitor sends all alerts to Telegram by default.
+If they aren't set in the TICKscript, they default to the `chat-id`, `disable-notification`,
+`disable-web-page-preview`, and `parse-mode` settings in the `[telegram]` section of the configuration file.
+Note that if `global` is set to `true` in the configuration file, there's no need to specify
+`.telegram()` in the TICKscript; Kapacitor sends all alerts to Telegram by default.
+
+`.chatId('')`
+Sets the Telegram [chat ID](#telegram-chat-id).
+
+`.disableNotification()`
+Disables notifications on iOS devices and disables sounds on Android devices.
+Android users continue to receive notifications.
+
+`.disableWebPagePreview()`
+Disables [link previews](https://telegram.org/blog/link-preview) in alert messages.
+
+`.parseMode(['Markdown' | 'HTML'])`
+Sets `Markdown` or `HTML` as the format for alert messages.
-`.chatId('')`
- Sets the Telegram [chat id](#telegram-chat-id).
-`.disableNotification()`
- Disables notifications on iOS devices and disables sounds on Android devices. Android users continue to receive notifications.
-`.disableWebPagePreview()`
- Disables [link previews](https://telegram.org/blog/link-preview) in alert messages.
-`.parseMode(['Markdown' | 'HTML'])`
- Sets `Markdown` or `HTML` as the format for alert messages.
### Examples
-#### Example 1: Send alerts to the Telegram chat id set in the configuration file
+#### Send alerts to the Telegram chat ID set in the configuration file
-Configuration file:
-```
+_**Configuration file**_
+```toml
[telegram]
enabled = true
url = "https://api.telegram.org/bot"
@@ -360,8 +396,8 @@ Configuration file:
state-changes-only = false
```
-TICKscript:
-```
+_**TICKscript**_
+```js
stream
|from()
.measurement('cpu')
@@ -371,12 +407,13 @@ stream
.telegram()
```
-The setup sends `Might want to check your CPU` to the Telegram bot associated with the chat id `123456789` and API access token `abcdefghi:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`.
+The setup sends `Might want to check your CPU` to the Telegram bot associated
+with the chat ID `123456789` and API access token `abcdefghi:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`.
-#### Example 2: Send alerts to the Telegram chat ID set in the TICKscript
+#### Send alerts to the Telegram chat ID set in the TICKscript
-Configuration file:
-```
+_**Configuration file**_
+```toml
[telegram]
enabled = true
url = "https://api.telegram.org/bot"
@@ -389,8 +426,8 @@ Configuration file:
state-changes-only = false
```
-TICKscript:
-```
+_**TICKscript**_
+```js
stream
|from()
.measurement('cpu')
@@ -401,4 +438,4 @@ stream
.chatId('123456789')
```
-The setup sends `Might want to check your CPU` to the Telegram bot associated with the chat id `123456789` and API access token `abcdefghi:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`.
+The setup sends `Might want to check your CPU` to the Telegram bot associated with the chat ID `123456789` and API access token `abcdefghi:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`.
diff --git a/content/kapacitor/v1.4/guides/join_backfill.md b/content/kapacitor/v1.4/guides/join_backfill.md
index 903d59deb..5de7929c5 100644
--- a/content/kapacitor/v1.4/guides/join_backfill.md
+++ b/content/kapacitor/v1.4/guides/join_backfill.md
@@ -25,7 +25,7 @@ are taken:
### The Data generator
Data for such a website can be primed and generated to InfluxDB using the Python
-3 script rolled into [page.zip](/downloads/pages.zip)([md5](/downloads/pages.zip.md5), [sha256](/downloads/pages.zip.sha256)) and created for this purpose.
+3 script rolled into [pages.zip](/downloads/pages.zip) ([md5](/downloads/pages.zip.md5), [sha256](/downloads/pages.zip.sha256)) and created for this purpose.
It leverages the [InfluxDB-Python](https://github.com/influxdata/influxdb-python) library.
See that Github project for instructions on how to install the library in Python.
diff --git a/content/kapacitor/v1.4/introduction/getting-started.md b/content/kapacitor/v1.4/introduction/getting-started.md
index b3d8d22dd..7b7480e42 100644
--- a/content/kapacitor/v1.4/introduction/getting-started.md
+++ b/content/kapacitor/v1.4/introduction/getting-started.md
@@ -48,7 +48,7 @@ The TICKStack services can be installed to run on the host machine as a part of
If you would like to explore using Docker deployments of these components, [check out these instructions.](/kapacitor/v1.4/introduction/install-docker/)
-
+
The applications InfluxDB, Telegraf and Kapacitor will need to be installed in that order and on the same host.
diff --git a/content/kapacitor/v1.4/working/event-handler-setup.md b/content/kapacitor/v1.4/working/event-handler-setup.md
index 064068cf3..0f6343926 100644
--- a/content/kapacitor/v1.4/working/event-handler-setup.md
+++ b/content/kapacitor/v1.4/working/event-handler-setup.md
@@ -64,7 +64,7 @@ person icon in the top right corner.
>
Your token appears in the table just above the `Create new token` section:
>
-
+
### Configuration
diff --git a/content/kapacitor/v1.4/working/template_tasks.md b/content/kapacitor/v1.4/working/template_tasks.md
index aba36cd85..af7692d22 100644
--- a/content/kapacitor/v1.4/working/template_tasks.md
+++ b/content/kapacitor/v1.4/working/template_tasks.md
@@ -12,7 +12,7 @@ menu:
Kapacitor has a template system that lets you define a template and reuse it for multiple tasks.
Each task can define its own value for various vars within the template.
-Templates can be consumed via the CLI and [API](/kapacitor/v1.3/api/api).
+Templates can be consumed via the CLI and [API](/kapacitor/v1.4/working/api/).
The following is a simple example that defines a template that computes the mean of a field and triggers an alert.
diff --git a/content/kapacitor/v1.5/_index.md b/content/kapacitor/v1.5/_index.md
index 4a0693aea..974898754 100644
--- a/content/kapacitor/v1.5/_index.md
+++ b/content/kapacitor/v1.5/_index.md
@@ -18,7 +18,7 @@ great choice for data processing.
* Process both streaming data and batch data.
* Query data from InfluxDB on a schedule, and receive data via the
-[line protocol](/influxdb/v1.4/write_protocols/line/) and any other method InfluxDB supports.
+[line protocol](/{{< latest "influxdb" "v2" >}}/reference/syntax/line-protocol/) and any other method InfluxDB supports.
* Perform any transformation currently possible in [InfluxQL](/influxdb/v1.7/query_language/spec/).
* Store transformed data back in InfluxDB.
* Add custom user defined functions to detect anomalies.
diff --git a/content/kapacitor/v1.5/about_the_project/releasenotes-changelog.md b/content/kapacitor/v1.5/about_the_project/releasenotes-changelog.md
index 4089f0b58..48aa676be 100644
--- a/content/kapacitor/v1.5/about_the_project/releasenotes-changelog.md
+++ b/content/kapacitor/v1.5/about_the_project/releasenotes-changelog.md
@@ -65,7 +65,7 @@ If you’ve installed this release, please roll back to v1.5.7 as soon as possib
## Features
- Add [Microsoft Teams event handler](/kapacitor/v1.5/event_handlers/microsoftteams/), thanks @mmindenhall!
-- Add [Discord event handler](/kapacitor/v1.5/event_handler/discord/), thanks @mattnotmitt!
+- Add [Discord event handler](/kapacitor/v1.5/event_handlers/discord/), thanks @mattnotmitt!
- Add [support for TLS 1.3](/kapacitor/v1.5/administration/configuration/#transport-layer-security-tls-settings).
### Bug fixes
@@ -338,7 +338,7 @@ Create the below snippet as the file `/tmp/prom/localhost.json`:
Start the Prometheues `node_exporter` locally.
Now, startup Kapacitor and it will discover the `localhost:9100` `node_exporter` target and begin scrapping it for metrics.
-For more details on the scraping and discovery systems, see the full documentation [here](/kapacitor/v1.3/pull_metrics/scraping-and-discovery/).
+For more details on the scraping and discovery systems, see the full documentation [here](/{{< latest "kapacitor" >}}/working/scraping-and-discovery/).
The second major feature with this release are changes to the alert topic system.
The previous release introduced this new system as a technical preview and with this release the alerting service has been simplified.
@@ -493,7 +493,7 @@ stream
```
The API exposes endpoints to query the state of each alert and endpoints for configuring alert handlers.
-See the [API docs](/kapacitor/v1.5/api/api/) for more details.
+See the [API docs](/kapacitor/v1.5/working/api/) for more details.
The kapacitor CLI has been updated with commands for defining alert handlers.
This release introduces a new feature where you can window based off the number of points instead of their time.
diff --git a/content/kapacitor/v1.5/administration/security.md b/content/kapacitor/v1.5/administration/security.md
index 245ebcdeb..223093a32 100644
--- a/content/kapacitor/v1.5/administration/security.md
+++ b/content/kapacitor/v1.5/administration/security.md
@@ -16,7 +16,7 @@ menu:
This document covers the basics of securing the open-source distribution of
Kapacitor. For information about security with Enterprise Kapacitor see the
-[Enterprise Kapacitor](/enterprise_kapacitor/v1.5/) documentation.
+[Enterprise Kapacitor](https://archive.docs.influxdata.com/enterprise_kapacitor/v1.5/) documentation.
When seeking to secure Kapacitor it is assumed that the Kapacitor server will be
communicating with an already secured InfluxDB server. It will also make its
diff --git a/content/kapacitor/v1.5/administration/subscription-management.md b/content/kapacitor/v1.5/administration/subscription-management.md
index d5f246bdc..9bc129a6b 100644
--- a/content/kapacitor/v1.5/administration/subscription-management.md
+++ b/content/kapacitor/v1.5/administration/subscription-management.md
@@ -89,7 +89,7 @@ Available options:
{{% warn %}}
The default setting for `subscription-mode` is `cluster`, however this should
-not be used with [Kapacitor Enterprise](/enterprise_kapacitor/).
+not be used with [Kapacitor Enterprise](https://archive.docs.influxdata.com/enterprise_kapacitor/latest/).
Multi-node Kapacitor Enterprise clusters should only use the `server` subscription-mode,
otherwise subscription data will not be received.
{{% /warn %}}
diff --git a/content/kapacitor/v1.5/administration/upgrading.md b/content/kapacitor/v1.5/administration/upgrading.md
index 2f9d5a78d..056abcd8a 100644
--- a/content/kapacitor/v1.5/administration/upgrading.md
+++ b/content/kapacitor/v1.5/administration/upgrading.md
@@ -30,7 +30,7 @@ Before proceeding with the Kapacitor upgrade please ensure that InfluxDB and Tel
* Telegraf 1.6
* Kapacitor 1.5
-For instructions on upgrading InfluxDB, please see the [InfluxDB upgrade](/{{< latest "influxdb" "v1" >}}/administration/upgrading/) documentation. For instructions on upgrading Telegraf, please see the [Telegraf upgrade](/{{< latest "telegraf" >}}/administration/upgrading/#main-nav) documentation.
+For instructions on upgrading InfluxDB, please see the [InfluxDB upgrade](/{{< latest "influxdb" "v1" >}}/administration/upgrading/) documentation.
For information about what is new in the latest Kapacitor release, view the [Changelog](/kapacitor/v1.5/about_the_project/releasenotes-changelog/).
diff --git a/content/kapacitor/v1.5/event_handlers/_index.md b/content/kapacitor/v1.5/event_handlers/_index.md
index e42be556f..daf145bff 100644
--- a/content/kapacitor/v1.5/event_handlers/_index.md
+++ b/content/kapacitor/v1.5/event_handlers/_index.md
@@ -29,8 +29,8 @@ syntax for officially supported Kapacitor event handlers.
[Log](/kapacitor/v1.5/event_handlers/log/)
[Microsoft Teams](/kapacitor/v1.5/event_handlers/microsoftteams/)
[MQTT](/kapacitor/v1.5/event_handlers/mqtt/)
-[Opsgenie](/kapacitor/v1.5/event_handlers/opsgenie/)
-[Pagerduty](/kapacitor/v1.5/event_handlers/pagerduty/)
+[Opsgenie](/kapacitor/v1.5/event_handlers/opsgenie/v2/)
+[Pagerduty](/kapacitor/v1.5/event_handlers/pagerduty/v2/)
[Post](/kapacitor/v1.5/event_handlers/post/)
[Publish](/kapacitor/v1.5/event_handlers/publish/)
[Pushover](/kapacitor/v1.5/event_handlers/pushover/)
diff --git a/content/kapacitor/v1.5/event_handlers/hipchat.md b/content/kapacitor/v1.5/event_handlers/hipchat.md
index 4af11ff4f..77cf8ddd6 100644
--- a/content/kapacitor/v1.5/event_handlers/hipchat.md
+++ b/content/kapacitor/v1.5/event_handlers/hipchat.md
@@ -106,7 +106,7 @@ To configure Kapacitor with HipChat, the following is needed:
Your token appears in the table just above the `Create new token` section:
-
+
## Using the HipChat Event Handler
diff --git a/content/kapacitor/v1.5/event_handlers/opsgenie/v1.md b/content/kapacitor/v1.5/event_handlers/opsgenie/v1.md
index 7f55939f7..aaf350cfc 100644
--- a/content/kapacitor/v1.5/event_handlers/opsgenie/v1.md
+++ b/content/kapacitor/v1.5/event_handlers/opsgenie/v1.md
@@ -8,13 +8,11 @@ description: >
Kapacitor can be configured to send alert messages to OpsGenie.
{{% warn %}}
-
- This page is specific to OpsGenie's v1 API which has been deprecated.
- OpsGenie recommends migrating to their v2 API. View the
- OpsGenie API migration guide
- for more information about upgrading.
- If using the v2 API, view the OpsGenie v2 event handler documentation.
-
+This page is specific to OpsGenie's v1 API which has been deprecated.
+OpsGenie recommends migrating to their v2 API. View the
+[OpsGenie API migration guide](https://docs.opsgenie.com/docs/migration-guide-for-alert-rest-api)
+for more information about upgrading.
+If using the v2 API, view the [OpsGenie v2 event handler](/kapacitor/v1.5/event_handlers/opsgenie/v2) documentation.
{{% /warn %}}
## Configuration
diff --git a/content/kapacitor/v1.5/event_handlers/pagerduty/v1.md b/content/kapacitor/v1.5/event_handlers/pagerduty/v1.md
index 13ee6932c..c36b0ab6b 100644
--- a/content/kapacitor/v1.5/event_handlers/pagerduty/v1.md
+++ b/content/kapacitor/v1.5/event_handlers/pagerduty/v1.md
@@ -9,13 +9,11 @@ helps teams detect and fix infrastructure problems quickly.
Kapacitor can be configured to send alert messages to PagerDuty.
{{% warn %}}
-
- This page is specific to PagerDuty's v1 API which has been deprecated.
- PagerDuty recommends migrating to their v2 API. View the
- PagerDuty API migration guide
- for more information about upgrading. If using the v2 API, view the
- PagerDuty v2 event handler documentation.
-
+This page is specific to PagerDuty's v1 API which has been deprecated.
+PagerDuty recommends migrating to their v2 API. View the
+[PagerDuty API migration guide](https://v2.developer.pagerduty.com/docs/migrating-to-api-v2)
+for more information about upgrading. If using the v2 API, view the
+[PagerDuty v2 event handler](/kapacitor/v1.5/event_handlers/pagerduty/v2) documentation.
{{% /warn %}}
## Configuration
diff --git a/content/kapacitor/v1.5/guides/event-handler-setup.md b/content/kapacitor/v1.5/guides/event-handler-setup.md
index 3de128a04..9ed309c01 100644
--- a/content/kapacitor/v1.5/guides/event-handler-setup.md
+++ b/content/kapacitor/v1.5/guides/event-handler-setup.md
@@ -53,7 +53,7 @@ person icon in the top right corner.
Your token appears in the table just above the **Create new token** section:
- 
+ 
### Configuration
@@ -312,24 +312,24 @@ The default `url` setting (`https://api.telegram.org/bot`) requires no additiona
The optional configuration settings are:
-`chat_id`
+##### chat_id
Set to your Telegram [chat ID](#telegram-chat-id). This serves as the default chat ID if the TICKscript doesn't specify a chat ID.
-`parse-mode`
+##### parse-mode
Set to `Markdown` or `HTML` for Markdown-formatted or HTML-formatted alert messages.
The default `parse-mode` is `Markdown`.
-`disable-web-page-preview`
+##### disable-web-page-preview
Set to `true` to disable [link previews](https://telegram.org/blog/link-preview) in alert messages.
-`disable-notification`
+##### disable-notification
Set to `true` to disable notifications on iOS devices and disable sounds on Android devices.
When set to `true`, Android users continue to receive notifications.
-`global`
+##### global
Set to `true` to send all alerts to Telegram without needing to specify Telegram in TICKscripts.
-`state-changes-only`
+##### state-changes-only
Set to `true` to only send an alert to Telegram if the alert state changes.
This setting only applies if the `global` setting is also set to `true`.
diff --git a/content/kapacitor/v1.5/guides/join_backfill.md b/content/kapacitor/v1.5/guides/join_backfill.md
index c39d4a536..a72266dab 100644
--- a/content/kapacitor/v1.5/guides/join_backfill.md
+++ b/content/kapacitor/v1.5/guides/join_backfill.md
@@ -27,7 +27,8 @@ are taken:
### The Data generator
Data for such a website can be primed and generated to InfluxDB using the Python
-3 script rolled into [page.zip](/downloads/pages.zip)([sha256](/downloads/pages.zip.sha256)) and created for this purpose.
+3 script rolled into [pages.zip](/downloads/pages.zip) ([md5](/downloads/pages.zip.md5), [sha256](/downloads/pages.zip.sha256))
+and created for this purpose.
It leverages the [InfluxDB-Python](https://github.com/influxdata/influxdb-python) library.
See that Github project for instructions on how to install the library in Python.
diff --git a/content/platform/install-and-deploy/install/_index.md b/content/platform/install-and-deploy/install/_index.md
index 9de097202..3f7562557 100644
--- a/content/platform/install-and-deploy/install/_index.md
+++ b/content/platform/install-and-deploy/install/_index.md
@@ -18,7 +18,7 @@ Install and configure the InfluxData platform (TICK stack) using one of the foll
- Install InfluxData 1.x Enterprise:
1. [Install Telegraf](/{{< latest "telegraf" >}}/introduction/installation/)
2. [Install InfluxDB Enterprise](/{{< latest "enterprise_influxdb" >}}/install-and-deploy/)
- 3. [Install Kapacitor Enterprise](/enterprise_kapacitor/latest/introduction/installation_guide/)
+ 3. [Install Kapacitor Enterprise](https://archive.docs.influxdata.com/enterprise_kapacitor/latest/introduction/installation_guide/)
{{% note %}}
Windows support is experimental.
diff --git a/content/platform/monitoring/influxdata-platform/external-monitor-setup.md b/content/platform/monitoring/influxdata-platform/external-monitor-setup.md
index e7ac4deb3..ff9849d61 100644
--- a/content/platform/monitoring/influxdata-platform/external-monitor-setup.md
+++ b/content/platform/monitoring/influxdata-platform/external-monitor-setup.md
@@ -64,7 +64,7 @@ the host machine:
- Swap
- System (load, number of CPUs, number of users, uptime, etc.)
-Use other [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/inputs/) to collect
+Use other [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins/#input-plugins) to collect
a variety of metrics.
#### Monitor InfluxDB performance metrics
diff --git a/content/platform/troubleshoot/disk-usage.md b/content/platform/troubleshoot/disk-usage.md
index 43dfc4db7..8c39f8e4f 100644
--- a/content/platform/troubleshoot/disk-usage.md
+++ b/content/platform/troubleshoot/disk-usage.md
@@ -69,7 +69,7 @@ crosses certain thresholds. The example TICKscript [below](#example-tickscript-a
sets warning and critical disk usage thresholds and sends a message to Slack
whenever those thresholds are crossed.
-_For information about Kapacitor tasks and alerts, see the [Kapacitor alerts](/kapacitor/latest/working/alerts/) documentation._
+_For information about Kapacitor tasks and alerts, see the [Kapacitor alerts](/{{< latest "kapacitor" >}}/working/alerts/) documentation._
#### Example TICKscript alert for disk usage
```
diff --git a/content/platform/troubleshoot/oom-loops.md b/content/platform/troubleshoot/oom-loops.md
index a16c6aea1..d1ee7e4b9 100644
--- a/content/platform/troubleshoot/oom-loops.md
+++ b/content/platform/troubleshoot/oom-loops.md
@@ -55,11 +55,11 @@ into what queries have room for optimization.
#### View your InfluxDB logs
If a query is killed, it is logged by InfluxDB.
-View your [InfluxDB logs](/influxdb/latest/administration/logs/) for hints as to what queries are being killed.
+View your [InfluxDB logs](/{{< latest "influxdb" "v1" >}}/administration/logs/) for hints as to what queries are being killed.
#### Estimate query cost
-InfluxQL's [`EXPLAIN` statement](/influxdb/latest/query_language/spec#explain)
+InfluxQL's [`EXPLAIN` statement](/{{< latest "influxdb" "v1" >}}/query_language/spec#explain)
parses and plans a query, then outputs a summary of estimated costs.
This allows you to estimate how resource-intensive a query may be before having to
run the actual query.
@@ -86,7 +86,7 @@ SIZE OF BLOCKS: 23252999
#### Analyze actual query cost
-InfluxQL's [`EXPLAIN ANALYZE` statement](/influxdb/latest/query_language/spec/#explain-analyze)
+InfluxQL's [`EXPLAIN ANALYZE` statement](/{{< latest "influxdb" "v1" >}}/query_language/spec/#explain-analyze)
actually executes a query and counts the costs during runtime.
###### Example EXPLAIN ANALYZE statement
diff --git a/content/telegraf/v1.10/plugins/aggregators.md b/content/telegraf/v1.10/plugins/aggregators.md
index 9383ebed4..50c29ec15 100644
--- a/content/telegraf/v1.10/plugins/aggregators.md
+++ b/content/telegraf/v1.10/plugins/aggregators.md
@@ -42,7 +42,7 @@ Plugin ID: `valuecounter`
The [ValueCounter aggregator plugin](https://github.com/influxdata/telegraf/blob/release-1.10/plugins/aggregators/valuecounter/README.md) counts the occurrence of values in fields and emits the counter once every 'period' seconds.
-A use case for the ValueCounter aggregator plugin is when you are processing an HTTP access log with the [Logparser input plugin](/telegraf/v1.8/plugins/inputs/#logparser) and want to count the HTTP status codes.
+A use case for the ValueCounter aggregator plugin is when you are processing an HTTP access log with the [Logparser input plugin](/telegraf/v1.10/plugins/inputs/#logparser) and want to count the HTTP status codes.
The fields which will be counted must be configured with the fields configuration directive. When no fields are provided, the plugin will not count any fields.
The results are emitted in fields, formatted as `originalfieldname_fieldvalue = count`.
diff --git a/content/telegraf/v1.10/plugins/outputs.md b/content/telegraf/v1.10/plugins/outputs.md
index 9205a6e43..b3770a1a9 100644
--- a/content/telegraf/v1.10/plugins/outputs.md
+++ b/content/telegraf/v1.10/plugins/outputs.md
@@ -82,7 +82,7 @@ The [File output plugin](https://github.com/influxdata/telegraf/blob/release-1.1
Plugin ID: `cloud_pubsub`
The [Google PubSub output plugin]() publishes metrics to a [Google Cloud PubSub](https://cloud.google.com/pubsub) topic
-as one of the supported [output data formats](/telegraf/data_formats/output).
+as one of the supported [output data formats](/telegraf/v1.10/data_formats/output).
### Graphite
@@ -150,7 +150,7 @@ The metrics from each input plugin will be written to a separate Azure Monitor n
Plugin ID: `mqtt`
-The [MQTT Producer output plugin](https://github.com/influxdata/telegraf/blob/release-1.10/plugins/outputs/mqtt/README.md) writes to the MQTT server using [supported output data formats](/telegraf/v1.8/data_formats/output/).
+The [MQTT Producer output plugin](https://github.com/influxdata/telegraf/blob/release-1.10/plugins/outputs/mqtt/README.md) writes to the MQTT server using [supported output data formats](/telegraf/v1.10/data_formats/output/).
### NATS Output
diff --git a/content/telegraf/v1.9/plugins/aggregators.md b/content/telegraf/v1.9/plugins/aggregators.md
index f6b9c4464..4ad6a6193 100644
--- a/content/telegraf/v1.9/plugins/aggregators.md
+++ b/content/telegraf/v1.9/plugins/aggregators.md
@@ -42,7 +42,7 @@ Plugin ID: `valuecounter`
The [ValueCounter aggregator plugin](https://github.com/influxdata/telegraf/blob/release-1.9/plugins/aggregators/valuecounter/README.md) counts the occurrence of values in fields and emits the counter once every 'period' seconds.
-A use case for the ValueCounter aggregator plugin is when you are processing an HTTP access log with the [Logparser input plugin](/telegraf/v1.8/plugins/inputs/#logparser) and want to count the HTTP status codes.
+A use case for the ValueCounter aggregator plugin is when you are processing an HTTP access log with the [Logparser input plugin](/telegraf/v1.9/plugins/inputs/#logparser) and want to count the HTTP status codes.
The fields which will be counted must be configured with the fields configuration directive. When no fields are provided, the plugin will not count any fields.
The results are emitted in fields, formatted as `originalfieldname_fieldvalue = count`.
diff --git a/content/telegraf/v1.9/plugins/outputs.md b/content/telegraf/v1.9/plugins/outputs.md
index 44ae46e0a..e5f902c2f 100644
--- a/content/telegraf/v1.9/plugins/outputs.md
+++ b/content/telegraf/v1.9/plugins/outputs.md
@@ -143,7 +143,7 @@ The metrics from each input plugin will be written to a separate Azure Monitor n
Plugin ID: `mqtt`
-The [MQTT Producer output plugin](https://github.com/influxdata/telegraf/blob/release-1.9/plugins/outputs/mqtt/README.md) writes to the MQTT server using [supported output data formats](/telegraf/v1.8/data_formats/output/).
+The [MQTT Producer output plugin](https://github.com/influxdata/telegraf/blob/release-1.9/plugins/outputs/mqtt/README.md) writes to the MQTT server using [supported output data formats](/telegraf/v1.9/data_formats/output/).
### NATS Output
diff --git a/data/telegraf_plugins.yml b/data/telegraf_plugins.yml
index 20324b385..d12357af3 100644
--- a/data/telegraf_plugins.yml
+++ b/data/telegraf_plugins.yml
@@ -59,7 +59,7 @@ input:
id: kinesis_consumer
description: |
The Amazon Kinesis Consumer input plugin reads from a Kinesis data stream and creates
- metrics using one of the supported [input data formats](/telegraf/latest/data_formats/input).
+ metrics using one of the supported [input data formats](/{{< latest "telegraf" >}}/data_formats/input).
introduced: 1.10.0
tags: [linux, macos, windows, cloud, messaging]
@@ -408,7 +408,7 @@ input:
- name: Exec
id: exec
description: |
- The Exec input plugin parses supported [Telegraf input data formats](/telegraf/latest/data_formats/input/)
+ The Exec input plugin parses supported [Telegraf input data formats](/{{< latest "telegraf" >}}/data_formats/input/)
(line protocol, JSON, Graphite, Value, Nagios, Collectd, and Dropwizard) into metrics.
Each Telegraf metric includes the measurement name, tags, fields, and timestamp.
introduced: 0.1.5
@@ -418,7 +418,7 @@ input:
id: execd
description: |
The Execd input plugin runs an external program as a daemon. Programs must output metrics in an accepted
- [Telegraf input data format](/telegraf/latest/data_formats/input/)
+ [Telegraf input data format](/{{< latest "telegraf" >}}/data_formats/input/)
on its standard output. Configure `signal` to send a signal to the daemon running on each collection interval.
The program output on standard error is mirrored to the Telegraf log.
introduced: 1.14.0
@@ -450,7 +450,7 @@ input:
then use the [Tail input plugin](#tail).
> To parse metrics from multiple files that are formatted in one of the supported
- > [input data formats](/telegraf/latest/data_formats/input),
+ > [input data formats](/{{< latest "telegraf" >}}/data_formats/input),
> use the [Multifile input plugin](#multifile).
introduced: 1.8.0
tags: [linux, macos, windows, systems]
@@ -557,7 +557,7 @@ input:
id: http
description: |
The HTTP input plugin collects metrics from one or more HTTP (or HTTPS) endpoints.
- The endpoint should have metrics formatted in one of the [supported input data formats](/telegraf/latest/data_formats/input/).
+ The endpoint should have metrics formatted in one of the [supported input data formats](/{{< latest "telegraf" >}}/data_formats/input/).
Each data format has its own unique set of configuration options which can be added to the input configuration.
introduced: 1.6.0
tags: [linux, macos, windows, servers, web]
@@ -588,9 +588,9 @@ input:
id: http_listener_v2
description: |
The HTTP Listener v2 input plugin listens for metrics sent via HTTP.
- Metrics may be sent in any supported [Telegraf input data format](/telegraf/latest/data_formats/input/influx).
+ Metrics may be sent in any supported [Telegraf input data format](/{{< latest "telegraf" >}}/data_formats/input/influx).
Note the plugin previously known as `http_listener` has been renamed `influxdb_listener`.
- To use Telegraf as a proxy/relay for InfluxDB, we recommend using [`influxdb_listener`](/telegraf/latest/plugins/#influxdb_listener).
+ To use Telegraf as a proxy/relay for InfluxDB, we recommend using [`influxdb_listener`](/{{< latest "telegraf" >}}/plugins/#influxdb_listener).
introduced: 1.9.0
tags: [linux, macos, windows, servers, web]
@@ -677,7 +677,7 @@ input:
id: influxdb_v2_listener
description: |
The InfluxDB v2 Listener input plugin listens for requests sent
- according to the [InfluxDB HTTP API](/influxdb/latest/reference/api/).
+ according to the [InfluxDB HTTP API](/{{< latest "influxdb" >}}/reference/api/).
The intent of the plugin is to allow Telegraf to serve as a proxy, or router,
for the HTTP `/api/v2/write` endpoint of the InfluxDB HTTP API.
@@ -988,7 +988,7 @@ input:
id: mqtt_consumer
description: |
The MQTT Consumer input plugin reads from specified MQTT topics and adds messages to InfluxDB.
- Messages are in the [Telegraf input data formats](/telegraf/latest/data_formats/input/).
+ Messages are in the [Telegraf input data formats](/{{< latest "telegraf" >}}/data_formats/input/).
introduced: 0.10.3
tags: [linux, macos, windows, messaging, IoT]
@@ -1000,7 +1000,7 @@ input:
This is often useful creating custom metrics from the `/sys` or `/proc` filesystems.
> To parse metrics from a single file formatted in one of the supported
- > [input data formats](/telegraf/latest/data_formats/input),
+ > [input data formats](/{{< latest "telegraf" >}}/data_formats/input),
> use the [file input plugin](#file).
introduced: 1.10.0
tags: [linux, macos, windows]
@@ -1016,7 +1016,7 @@ input:
id: nats_consumer
description: |
The NATS Consumer input plugin reads from specified NATS subjects and adds messages to InfluxDB.
- Messages are expected in the [Telegraf input data formats](/telegraf/latest/data_formats/input/).
+ Messages are expected in the [Telegraf input data formats](/{{< latest "telegraf" >}}/data_formats/input/).
A Queue Group is used when subscribing to subjects so multiple instances of Telegraf
can read from a NATS cluster in parallel.
introduced: 0.10.3
@@ -1489,7 +1489,7 @@ input:
description: |
The Socket Listener input plugin listens for messages from streaming (TCP, UNIX)
or datagram (UDP, unixgram) protocols. Messages are expected in the
- [Telegraf Input Data Formats](/telegraf/latest/data_formats/input/).
+ [Telegraf Input Data Formats](/{{< latest "telegraf" >}}/data_formats/input/).
introduced: 1.3.0
tags: [linux, macos, windows, networking]
@@ -1909,7 +1909,7 @@ output:
id: cloud_pubsub
description: |
The Google PubSub output plugin publishes metrics to a [Google Cloud PubSub](https://cloud.google.com/pubsub)
- topic as one of the supported [output data formats](/telegraf/latest/data_formats/output).
+ topic as one of the supported [output data formats](/{{< latest "telegraf" >}}/data_formats/output).
introduced: 1.10.0
tags: [linux, macos, windows, messaging, cloud]
@@ -2021,7 +2021,7 @@ output:
id: mqtt
description: |
The MQTT Producer output plugin writes to the MQTT server using
- [supported output data formats](/telegraf/latest/data_formats/output/).
+ [supported output data formats](/{{< latest "telegraf" >}}/data_formats/output/).
introduced: 0.2.0
tags: [linux, macos, windows, messaging, IoT]
diff --git a/deploy/edge.js b/deploy/edge.js
index 7214fcd65..d41d4301a 100644
--- a/deploy/edge.js
+++ b/deploy/edge.js
@@ -73,12 +73,13 @@ exports.handler = (event, context, callback) => {
'.otf': true,
'.gz': true,
'.tar': true,
+ '.zip': true,
'.md5': true,
'.sha256': true,
};
// Remove multiple slashes from path
- permanantRedirect(/\/{2,}/.test(request.uri), request.uri.replace(/\/{2,}/, `/`));
+ // permanantRedirect(/\/{2,}/.test(request.uri), request.uri.replace(/\/{2,}/, `/`));
// Remove index.html from path
permanantRedirect(request.uri.endsWith('index.html'), request.uri.substr(0, request.uri.length - indexPath.length));
diff --git a/layouts/partials/article/stable-version.html b/layouts/partials/article/stable-version.html
index d8dfa5e11..9dcc1d4cc 100644
--- a/layouts/partials/article/stable-version.html
+++ b/layouts/partials/article/stable-version.html
@@ -17,7 +17,10 @@
This page documents an earlier version of {{ $productName }}.
{{ $productName }} {{ $stableVersion }} is the latest stable version.
{{ if eq (findRE `v[1-2]` $currentVersion) (findRE `v[1-2]` $stableVersion) }}
- View this page in the {{ $stableVersion }} documentation.
+
+ {{ if gt (len (.GetPage ((replaceRE `v[1-2]\.[0-9]{1,2}` (index .Site.Data.products $product).latest .RelPermalink) | replaceRE `\/$` "")).Title) 0 }}
+ View this page in the {{ $stableVersion }} documentation.
+ {{ end }}
{{ else if and (ne (findRE `v[1-2]` $currentVersion) (findRE `v[1-2]` $stableVersion)) (.Page.Params.v2) }}
{{ if $v2PageExists }}
diff --git a/layouts/partials/header/canonical.html b/layouts/partials/header/canonical.html
index 27b29bb4f..2f3b013bd 100644
--- a/layouts/partials/header/canonical.html
+++ b/layouts/partials/header/canonical.html
@@ -46,13 +46,19 @@
{{ else if and (eq $product "influxdb") (eq $currentVersion $latestVersion) }}
{{ $correspondingPage := replaceRE `v2\.[0-9]{1,2}` "cloud" (print .Page.File) }}
- {{ if fileExists $correspondingPage}}
+ {{ if fileExists $correspondingPage }}
{{ if (.Site.GetPage $correspondingPage).HasShortcode "duplicate-oss" }}
{{ $scratch.Set "canonicalURL" (print $baseURL (.Site.GetPage $correspondingPage).RelPermalink) }}
{{ end }}
{{ end }}
-{{ else if ge (len (findRE "[^/]+.*?" .RelPermalink)) 2 }}
- {{ $scratch.Set "canonicalURL" (print $baseURL (replaceRE `v[0-9]\.[0-9]{1,2}` $latestMinorVersion .RelPermalink)) }}
+
+{{ else if and (ge (len (findRE "[^/]+.*?" .RelPermalink)) 2) (not (isset .Page.Params "canonical")) (ne $currentVersion "cloud") }}
+ {{ range ( index $.Site.Data.products $product ).versions }}
+ {{ $currentURL := $.Page.RelPermalink }}
+ {{ if gt (len ($.GetPage ((replaceRE $currentVersion . $currentURL) | replaceRE `\/$` "")).Title) 0 }}
+ {{ $scratch.Set "canonicalURL" (print $baseURL (replaceRE `v[0-9]\.[0-9]{1,2}` . $currentURL)) }}
+ {{ end }}
+ {{ end }}
{{ end }}
{{ $canonicalURL := $scratch.Get "canonicalURL" }}
diff --git a/layouts/shortcodes/telegraf/plugins.html b/layouts/shortcodes/telegraf/plugins.html
index 5e19ab265..a3f6fe34f 100644
--- a/layouts/shortcodes/telegraf/plugins.html
+++ b/layouts/shortcodes/telegraf/plugins.html
@@ -1,3 +1,4 @@
+{{ $scratch := newScratch }}
{{ $type := .Get "type" }}
{{ $pathData := findRE "[^/]+.*?" .Page.RelPermalink }}
{{ $currentTelegrafVersion := replaceRE `v` "" (index $pathData 1) }}
@@ -18,7 +19,24 @@
Plugin ID: {{ $type }}s.{{ .id }}
Telegraf {{ if not .deprecated }}{{ .introduced }}+{{ else }}{{ .introduced }} - {{ .deprecated }} Deprecated{{ end }}
- {{ .description | markdownify | safeHTML }}
+
+ {{ $scratch.Set "description" .description }}
+
+ {{ if in .description "{{< latest" }}
+ {{ $latestInstances := findRE `{{< latest .* >}}` .description }}
+ {{ range $latestInstances }}
+ {{ $tmpDescription := $scratch.Get "description" }}
+ {{ $product := replaceRE `"` "" (index (findRE `"[a-z_]*"` .) 0 ) }}
+ {{ $latestVersion := (index $.Site.Data.products $product).latest }}
+ {{ $replace := print "{{< latest \"" $product "\" >}}"}}
+ {{ $replacement := print $product "/" $latestVersion }}
+ {{ $scratch.Set "description" (replaceRE $replace $replacement $tmpDescription) }}
+ {{ end }}
+ {{ end }}
+
+ {{ $description := $scratch.Get "description" }}
+
+ {{ $description | markdownify | safeHTML }}
View