diff --git a/content/kapacitor/v1.5/introduction/getting-started.md b/content/kapacitor/v1.5/introduction/getting-started.md index 3d0a45bff..7cb65c3e2 100644 --- a/content/kapacitor/v1.5/introduction/getting-started.md +++ b/content/kapacitor/v1.5/introduction/getting-started.md @@ -33,7 +33,7 @@ Kapacitor tasks define work to do on a set of data using [TICKscript](/kapacitor To get started, do the following: -1. If you haven't already, [download and install the InfluxData TICK stack (OSS)](/platform/install-and-deploy/install/oss-install). +1. If you haven't already, [download and install the InfluxData 1.x TICK stack (OSS)](/platform/install-and-deploy/install/oss-install). 2. [Start InfluxDB and start Telegraf](#start-influxdb-and-collect-telegraf-data). By default, Telegraf starts sending system metrics to InfluxDB and creates a 'telegraf' database. 3. Start Kapacitor. diff --git a/content/platform/_index.md b/content/platform/_index.md index fa6890521..e6c37624f 100644 --- a/content/platform/_index.md +++ b/content/platform/_index.md @@ -9,7 +9,17 @@ menu: weight: 1 --- -**InfluxData platform** is the leading modern [time series](/platform/faq/#what-is-time-series-data) platform, built for metrics and events. Explore both versions of our platform below--[**InfluxData 1.x**](#influxdata-1-x) and [**InfluxDB 2.0**](#influxdb-2-0). +**InfluxData platform** is the leading modern [time series](/platform/faq/#what-is-time-series-data) platform, built for metrics and events. Explore both versions of our platform below--[**InfluxDB 2.0**](#influxdb-2-0) and [**InfluxData 1.x**](#influxdata-1-x). + +## InfluxDB 2.0 + +The **InfluxDB 2.0 platform** consolidates InfluxDB, Chronograf, and Kapacitor from the **InfluxData 1.x platform** into a single packaged solution, with added features and flexibility: + + - [InfluxDB OSS 2.0](/influxdb/v2.0/get-started/): open source platform solution in a single binary + - [InfluxDB Cloud](/influxdb/cloud/get-started/) (**commercial offering**): hosted cloud solution + - [Telegraf](#telegraf): collect data + +InfluxDB Enterprise 2.0 is in development. ## InfluxData 1.x @@ -26,15 +36,6 @@ The **InfluxData 1.x platform** includes the following open source components ([ - [Kapacitor Enterprise](#kapacitor-enterprise) - [InfluxCloud 1.x](https://help.influxcloud.net) (hosted cloud solution) -## InfluxDB 2.0 - -The **InfluxDB 2.0 platform** consolidates components from the **InfluxData 1.x platform** into a single packaged solution, with added features and flexibility: - - - [InfluxDB OSS 2.0](/influxdb/v2.0/get-started/): open source platform solution in a single binary - - [InfluxDB Cloud](/influxdb/cloud/get-started/) (**commercial offering**): hosted cloud solution - -InfluxDB Enterprise 2.0 is in development. - ## InfluxData 1.x TICK stack ### Telegraf diff --git a/content/platform/getting-started.md b/content/platform/getting-started.md index 0e7cd5a84..bf62bf3ca 100644 --- a/content/platform/getting-started.md +++ b/content/platform/getting-started.md @@ -9,9 +9,11 @@ menu: weight: 2 --- -![Getting started setup](/img/chronograf/1-6-intro-gs-diagram.png) +To get started with the **InfluxDB 2.0** platform, see [**InfluxDB Cloud**](/influxdb/cloud/get-started/) or [**InfluxDB OSS 2.0**](/influxdb/v2.0/get-started/). -Before following the steps below, [download and install](/platform/install-and-deploy/install/) each component of the TICK stack, or [Install the InfluxData Sandbox](/platform/install-and-deploy/deploying/sandbox-install/). +To get started with the **InfluxData 1.x** platform, [download and install](/platform/install-and-deploy/install/) each component of the TICK stack, or [Install the InfluxData Sandbox](/platform/install-and-deploy/deploying/sandbox-install/), and then follow the steps below. + +![Getting started setup](/img/chronograf/1-6-intro-gs-diagram.png) ## Understand how Telegraf writes data to InfluxDB diff --git a/content/platform/install-and-deploy/_index.md b/content/platform/install-and-deploy/_index.md index e369fed45..344011f07 100644 --- a/content/platform/install-and-deploy/_index.md +++ b/content/platform/install-and-deploy/_index.md @@ -8,8 +8,8 @@ menu: weight: 20 --- -The InfluxData Platform can be manually installed and configured or -can be deployed leveraging containers and other technologies that can speed up -and provide consistent resources. +To install and configure the **InfluxDB 2.0** platform, see [**InfluxDB Cloud**](/influxdb/cloud/get-started/) or [**InfluxDB OSS 2.0**](/influxdb/v2.0/get-started/). + +To install and configure InfluxDB 1.x platform manually or deploy leveraging containers and other technologies, follow the links below. {{< children >}} diff --git a/content/platform/install-and-deploy/deploying/_index.md b/content/platform/install-and-deploy/deploying/_index.md index 9508074ee..8ea2e45db 100644 --- a/content/platform/install-and-deploy/deploying/_index.md +++ b/content/platform/install-and-deploy/deploying/_index.md @@ -1,5 +1,5 @@ --- -title: Deploy the TICK stack +title: Deploy the 1.x TICK stack description: Easy ways to deploy the TICK stack on the platform you use. menu: platform: @@ -9,7 +9,9 @@ menu: parent: install-and-deploy-platform --- -There are multiple ways to deploy the InfluxData Platform (also known +To deploy InfluxDB 2.0 on your Cloud provider, see how to [Subscribe through a cloud provider](/influxdb/cloud/get-started/#subscribe-through-a-cloud-provider). + +There are multiple ways to deploy the InfluxDB 1.x platform (also known as the TICK stack). See if one of the following container-based installation options meets your requirements. diff --git a/content/platform/install-and-deploy/deploying/kubernetes.md b/content/platform/install-and-deploy/deploying/kubernetes.md index 371c8888d..7792c81f8 100644 --- a/content/platform/install-and-deploy/deploying/kubernetes.md +++ b/content/platform/install-and-deploy/deploying/kubernetes.md @@ -14,15 +14,22 @@ Install and configure the TICK stack—Telegraf, InfluxDB, Chronograf, and Kapac ### Use Helm Charts to deploy InfluxData Platform components -InfluxData recommends using the [Helm Stable](https://github.com/helm/charts/tree/master/stable) repository to install the TICK stack: +InfluxData provides [InfluxData Helm charts](https://github.com/influxdata/helm-charts) to install the platform on Kubernetes. + +To install the InfluxDB 2.0 platform, use the following Helm charts: + +- [InfluxDB 2.0](https://github.com/influxdata/helm-charts/tree/master/charts/influxdb2) +- [Telegraf](https://github.com/influxdata/helm-charts/tree/master/charts/telegraf) + +To install the InfluxDB 1.x platform, use the following Helm charts: - [Telegraf](https://github.com/influxdata/helm-charts/tree/master/charts/telegraf) -- [InfluxDB](https://github.com/influxdata/helm-charts/tree/master/charts/influxdb) +- [InfluxDB 1.x](https://github.com/influxdata/helm-charts/tree/master/charts/influxdb) - [Chronograf](https://github.com/influxdata/helm-charts/tree/master/charts/chronograf) - [Kapacitor](https://github.com/influxdata/helm-charts/tree/master/charts/kapacitor) ### Use the InfluxDB Operator -[InfluxDB operator](https://github.com/influxdata/influxdata-operator) is a [Kubernetes operator](https://coreos.com/operators/) that can be used to deploy InfluxDB OSS in Kubernetes. The InfluxDB operator can handle operational tasks, like creating a backup, automatically. The operator currently has been tested on [AWS's Elastic Kubernetes Service](https://aws.amazon.com/eks/) and [GCP's Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/). +[InfluxDB operator](https://github.com/influxdata/influxdata-operator) is a [Kubernetes operator](https://coreos.com/operators/) that can be used to deploy InfluxDB 1.x OSS in Kubernetes. The InfluxDB operator can handle operational tasks, like creating a backup, automatically. The operator currently has been tested on [AWS's Elastic Kubernetes Service](https://aws.amazon.com/eks/) and [GCP's Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/). [Deploy InfluxDB using the InfluxData operator](https://github.com/influxdata/influxdata-operator) diff --git a/content/platform/install-and-deploy/deploying/sandbox-install.md b/content/platform/install-and-deploy/deploying/sandbox-install.md index 15f17d31d..589edbaab 100644 --- a/content/platform/install-and-deploy/deploying/sandbox-install.md +++ b/content/platform/install-and-deploy/deploying/sandbox-install.md @@ -11,7 +11,7 @@ menu: weight: 1 --- -The quickest way to start using the InfluxData Platform (TICK stack) OSS is to download and deploy the [InfluxData Sandbox](https://github.com/influxdata/sandbox). The InfluxData Sandbox uses Docker containers to deploy the InfluxData Platform components. The InfluxData Sandbox provides a containerized, ready-to-use TICK stack, built using [Docker](https://www.docker.com) and [Docker Compose](https://docs.docker.com/compose/overview/), to capture data from your local machine and the Docker containers. +The quickest way to start using the InfluxB 1.x platform (TICK stack) OSS is to download and deploy the [InfluxData Sandbox](https://github.com/influxdata/sandbox). The InfluxData Sandbox uses Docker containers to deploy the InfluxData Platform components. The InfluxData Sandbox provides a containerized, ready-to-use TICK stack, built using [Docker](https://www.docker.com) and [Docker Compose](https://docs.docker.com/compose/overview/), to capture data from your local machine and the Docker containers. After deploying using the InfluxData Sandbox, you will have the latest versions of: diff --git a/content/platform/install-and-deploy/install/_index.md b/content/platform/install-and-deploy/install/_index.md index 3f7562557..6479d48b1 100644 --- a/content/platform/install-and-deploy/install/_index.md +++ b/content/platform/install-and-deploy/install/_index.md @@ -1,5 +1,5 @@ --- -title: Install the InfluxData 1.x platform +title: Install the InfluxData platform description: Quickly install and configure the InfluxData platform to begin exploring time series data menu: platform: @@ -9,7 +9,9 @@ menu: parent: install-and-deploy-platform --- -Install and configure the InfluxData platform (TICK stack) using one of the following methods: +To install and configure the **InfluxDB 2.0** platform, see [**InfluxDB Cloud**](/influxdb/cloud/get-started/) or [**InfluxDB OSS 2.0**](/influxdb/v2.0/get-started/). + +To get install and configure the **InfluxData 1.x** platform, use one of the following methods: - For **non-production** environments. The quickest way to install the InfluxData platform is to [deploy the InfluxData 1.x platform in Docker containers](/platform/install-and-deploy/deploying/sandbox-install). - For **production** environments. Do one of the following: diff --git a/content/platform/install-and-deploy/install/oss-install.md b/content/platform/install-and-deploy/install/oss-install.md index 5ef48a329..4b58e1e00 100644 --- a/content/platform/install-and-deploy/install/oss-install.md +++ b/content/platform/install-and-deploy/install/oss-install.md @@ -1,7 +1,7 @@ --- -title: Install the InfluxData TICK stack (OSS) +title: Install the InfluxData 1.x TICK stack (OSS) list_title: TICK stack (OSS) -description: Install and configure the open source InfluxData TICK stack – Telegraf, InfluxDB, Chronograf, and Kapacitor. +description: Install and configure the open source InfluxData 1.x TICK stack – Telegraf, InfluxDB, Chronograf, and Kapacitor. alias: /platform/installation/oss-install menu: platform: diff --git a/content/platform/integrations/_index.md b/content/platform/integrations/_index.md index 5fa89d0b3..fbf0f47ee 100644 --- a/content/platform/integrations/_index.md +++ b/content/platform/integrations/_index.md @@ -1,5 +1,5 @@ --- -title: Integrate the InfluxData TICK stack +title: Integrate the InfluxData 1.x TICK stack description: Discover all ways the TICK stack integrates into your favorite projects. menu: platform: @@ -8,8 +8,7 @@ menu: weight: 40 --- -The InfluxData Platform and its TICK stack components integrate with a number of -platforms and technologies. These pages document the integrations and provide +The InfluxDB 1.x platform integrates with a number of platforms and technologies. These pages document the integrations and provide links to additional material. {{< children >}} \ No newline at end of file diff --git a/content/platform/monitoring/containers/_index.md b/content/platform/monitoring/containers/_index.md index 7deb6f0a3..56ca9cf2c 100644 --- a/content/platform/monitoring/containers/_index.md +++ b/content/platform/monitoring/containers/_index.md @@ -1,6 +1,6 @@ --- -title: Monitor containers using the InfluxData Platform -description: Use the InfluxData TICK stack to monitor containers, including Kubernetes and Docker +title: Monitor containers using the InfluxData 1.x Platform +description: Use the InfluxData 1.x TICK stack to monitor containers, including Kubernetes and Docker menu: platform: name: Monitor containers diff --git a/content/platform/monitoring/containers/kubernetes.md b/content/platform/monitoring/containers/kubernetes.md index 1fa1f57b5..4642c1995 100644 --- a/content/platform/monitoring/containers/kubernetes.md +++ b/content/platform/monitoring/containers/kubernetes.md @@ -1,6 +1,6 @@ --- -title: Monitor Kubernetes using the InfluxData Platform -description: Use the InfluxData TICK stack to monitor Kubernetes. +title: Monitor Kubernetes using the InfluxData 1.x Platform +description: Use the InfluxData 1.x TICK stack to monitor Kubernetes. menu: platform: name: Monitor Kubernetes diff --git a/content/platform/monitoring/influxdata-platform/_index.md b/content/platform/monitoring/influxdata-platform/_index.md index b931a04e6..f113791bb 100644 --- a/content/platform/monitoring/influxdata-platform/_index.md +++ b/content/platform/monitoring/influxdata-platform/_index.md @@ -1,6 +1,6 @@ --- title: Monitor the InfluxData Platform -description: How to use the InfluxData TICK stack to monitor itself and other TICK stacks in order to identify and alert on anomalies. +description: How to use the InfluxData to monitor itself and other instances to identify and alert on anomalies. menu: platform: name: Monitor the InfluxData Platform @@ -10,10 +10,12 @@ menu: --- One of the primary use cases for the InfluxData Platform is as server and infrastructure -monitoring solution. No matter what type of data you're using the TICK stack to collect and +monitoring solution. No matter what type of data you're using the platform to collect and store, it's important to monitor the health of your stack and identify any potential issues. -The following pages provide information about setting up a TICK stack that monitors +To **monitor the InfluxDB 2.0 platform**, see how to monitor [InfluxDB Cloud](/influxdb/cloud/monitor-alert/) and [InfluxDB 2.0](/influxdb/v2.0/monitor-alert/). + +To **monitor the InfluxData 1.x platform**, see the following pages for information about setting up a 1.x TICK stack that monitors another OSS or Enterprise TICK stack. They cover different potential monitoring strategies and visualizing the monitoring data in a way that makes it easy to recognize, alert on, and address anomalies as they happen. diff --git a/content/platform/monitoring/influxdata-platform/external-monitor-setup.md b/content/platform/monitoring/influxdata-platform/external-monitor-setup.md index f2d3de35d..aaa6eb47c 100644 --- a/content/platform/monitoring/influxdata-platform/external-monitor-setup.md +++ b/content/platform/monitoring/influxdata-platform/external-monitor-setup.md @@ -1,6 +1,6 @@ --- -title: Configure a watcher of watchers system to monitor InfluxDB servers -description: How to set up an external InfluxData TICK stack that monitors another Enterprise or OSS TICK stack. +title: Configure a watcher of watchers system to monitor InfluxDB 1.x servers +description: How to set up an external InfluxData 1.x TICK stack that monitors another Enterprise or OSS TICK stack. aliases: - /platform/monitoring/external-monitor-setup/ menu: diff --git a/content/platform/monitoring/influxdata-platform/internal-vs-external.md b/content/platform/monitoring/influxdata-platform/internal-vs-external.md index 496080bce..358a147b4 100644 --- a/content/platform/monitoring/influxdata-platform/internal-vs-external.md +++ b/content/platform/monitoring/influxdata-platform/internal-vs-external.md @@ -1,5 +1,5 @@ --- -title: Considerations for monitoring the InfluxData Platform +title: Considerations for monitoring the 1.x TICK stack description: An explanation of internal and external monitoring strategies for your Enterprise or OSS TICK stack with the pros and cons of each. aliases: - /platform/monitoring/internal-vs-external/ diff --git a/content/platform/monitoring/influxdata-platform/monitoring-dashboards.md b/content/platform/monitoring/influxdata-platform/monitoring-dashboards.md index ab1291c50..856ff01c4 100644 --- a/content/platform/monitoring/influxdata-platform/monitoring-dashboards.md +++ b/content/platform/monitoring/influxdata-platform/monitoring-dashboards.md @@ -1,8 +1,8 @@ --- -title: Set up monitoring dashboards +title: Set up 1.x monitoring dashboards description: > Set up dashboards to visualize and monitor the health and performance of your - InfluxData TICK stack. + InfluxData 1.x TICK stack. aliases: - /platform/monitoring/monitoring-dashboards/ - /platform/monitoring/monitoring-dashboards/dashboard-oss-monitoring/ diff --git a/content/platform/monitoring/influxdata-platform/tools/_index.md b/content/platform/monitoring/influxdata-platform/tools/_index.md index 6408feb3d..0ec092b06 100644 --- a/content/platform/monitoring/influxdata-platform/tools/_index.md +++ b/content/platform/monitoring/influxdata-platform/tools/_index.md @@ -1,5 +1,5 @@ --- -title: Tools for monitoring the InfluxData Platform (TICK stack) +title: Tools for monitoring the InfluxData 1.x Platform (TICK stack) description: Use the "internal" measurements, SHOW DIAGNOSTICS, and SHOW STATS to monitor your InfluxData Platform. aliases: - /platform/monitoring/tools/ diff --git a/content/platform/monitoring/influxdata-platform/tools/measurements-internal.md b/content/platform/monitoring/influxdata-platform/tools/measurements-internal.md index 5321874ed..940f29830 100644 --- a/content/platform/monitoring/influxdata-platform/tools/measurements-internal.md +++ b/content/platform/monitoring/influxdata-platform/tools/measurements-internal.md @@ -1,5 +1,5 @@ --- -title: InfluxDB _internal measurements and fields +title: InfluxDB _internal 1.x measurements and fields description: > Use and understand the InfluxDB _internal measurements statistics and field keys that monitor InfluxDB and InfluxDB Enterprise servers. diff --git a/content/platform/troubleshoot/_index.md b/content/platform/troubleshoot/_index.md index bb68fd057..311481e3e 100644 --- a/content/platform/troubleshoot/_index.md +++ b/content/platform/troubleshoot/_index.md @@ -1,5 +1,5 @@ --- -title: Troubleshoot issues using InfluxData Platform monitoring +title: Troubleshoot issues using InfluxData 1.x Platform monitoring description: placeholder menu: platform: diff --git a/content/platform/troubleshoot/disk-usage.md b/content/platform/troubleshoot/disk-usage.md index 8c39f8e4f..4ab4017ab 100644 --- a/content/platform/troubleshoot/disk-usage.md +++ b/content/platform/troubleshoot/disk-usage.md @@ -1,7 +1,7 @@ --- title: Troubleshoot high disk usage list_title: High disk usage -description: Identify and troubleshoot high disk usage when using the InfluxData TICK stack. +description: Identify and troubleshoot high disk usage when using the InfluxData 1.x TICK stack. menu: platform: name: Disk usage diff --git a/content/platform/troubleshoot/oom-loops.md b/content/platform/troubleshoot/oom-loops.md index d1ee7e4b9..0954fc5b2 100644 --- a/content/platform/troubleshoot/oom-loops.md +++ b/content/platform/troubleshoot/oom-loops.md @@ -1,7 +1,7 @@ --- title: Troubleshoot out-of-memory loops list_title: Out-of-memory loops -description: Identify and troubleshoot out-of-memory (OOM) loops when using the InfluxData TICK stack. +description: Identify and troubleshoot out-of-memory (OOM) loops when using the InfluxData 1.x TICK stack. menu: platform: name: Out-of-memory loops diff --git a/layouts/index.html b/layouts/index.html index a728b2bbe..8c76ca8a7 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -44,7 +44,7 @@
The leading modern time series platform, built for metrics and events.