diff --git a/assets/js/influxdb-url.js b/assets/js/influxdb-url.js index 176093314..1449f1537 100644 --- a/assets/js/influxdb-url.js +++ b/assets/js/influxdb-url.js @@ -1,7 +1,8 @@ -var defaultUrl = "http://localhost:9999" +var defaultUrl = "http://localhost:8086" var placeholderCloudUrl = "https://cloud2.influxdata.com" var defaultCloudUrl = "https://us-west-2-1.aws.cloud2.influxdata.com" var elementSelector = ".article--content pre:not(.preserve)" +var isInfluxDBv1 = /influxdb\/v1/.test(window.location.href) // Retrieve the selected URL from the influxdb_url session cookie function getUrl() { @@ -25,23 +26,29 @@ function getPrevUrl() { } // Iterate through code blocks and update InfluxDB urls +// Ignore URLs in InfluxDB 1.x docs function updateUrls(currentUrl, newUrl) { - if (typeof currentUrl != newUrl) { - $(elementSelector).each(function() { - $(this).html($(this).html().replace(currentUrl, newUrl)); - }); + if (!isInfluxDBv1) { + if (typeof currentUrl != newUrl) { + $(elementSelector).each(function() { + $(this).html($(this).html().replace(currentUrl, newUrl)); + }); + } } } // Append the URL selector button to each codeblock with an InfluxDB URL +// Ignore codeblocks on InfluxDB v1.x pages function appendUrlSelector(currentUrl, selectorText) { - $(elementSelector).each(function() { - var code = $(this).html() - if (code.includes(currentUrl)) { - $(this).after("
" + selectorText + "
") - $('.select-url').fadeIn(400) - } - }); + if (!isInfluxDBv1) { + $(elementSelector).each(function() { + var code = $(this).html() + if (code.includes(currentUrl)) { + $(this).after("
" + selectorText + "
") + $('.select-url').fadeIn(400) + } + }); + } } // Toggle the URL selector modal window diff --git a/content/chronograf/v1.6/administration/creating-connections.md b/content/chronograf/v1.6/administration/creating-connections.md index bf5c5a4f3..b4accb242 100644 --- a/content/chronograf/v1.6/administration/creating-connections.md +++ b/content/chronograf/v1.6/administration/creating-connections.md @@ -51,6 +51,7 @@ An `.src` files contains the details for a single InfluxDB connection. Create a new file named `example.src` (the filename is arbitrary) and place it at Chronograf's `resource-path`. All `.src` files should contain the following: +{{< keep-url >}} ```json { "id": "10000", diff --git a/content/chronograf/v1.6/administration/managing-influxdb-users.md b/content/chronograf/v1.6/administration/managing-influxdb-users.md index b0bc1f55a..12443012f 100644 --- a/content/chronograf/v1.6/administration/managing-influxdb-users.md +++ b/content/chronograf/v1.6/administration/managing-influxdb-users.md @@ -65,6 +65,7 @@ Run the `curl` command below to create an admin user, replacing: * `chronothan` with your own username * `supersecret` with your own password (note that the password requires single quotes) +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` diff --git a/content/chronograf/v1.6/guides/live_leaderboard.md b/content/chronograf/v1.6/guides/live_leaderboard.md index d5b31e098..30e49e2fe 100644 --- a/content/chronograf/v1.6/guides/live_leaderboard.md +++ b/content/chronograf/v1.6/guides/live_leaderboard.md @@ -187,6 +187,7 @@ max Since we are writing data back to InfluxDB create a database `game` for our results. +{{< keep-url >}} ``` curl -G 'http://localhost:8086/query?' --data-urlencode 'q=CREATE DATABASE game' ``` @@ -274,6 +275,7 @@ Hit the endpoint several times to see that the scores are updating once a second Now, let's check InfluxDB to see our historical data. +{{< keep-url >}} ```bash curl \ -G 'http://localhost:8086/query?db=game' \ diff --git a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md index 4a928523e..5ecca204d 100644 --- a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md +++ b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md @@ -85,6 +85,7 @@ Because you enabled authentication, you must perform this step before moving on 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. +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` @@ -173,6 +174,8 @@ Repeat steps one through four for each data node in your cluster. Run the following command on your InfluxDB OSS instance to see if your Telegraf instances are successfully collecting and writing data. Replace the `chronothan` and `supersecret` values with your actual username and password. + +{{< keep-url >}} ``` ~# curl -G "http://localhost:8086/query?db=telegraf&u=chronothan&p=supersecret&pretty=true" --data-urlencode "q=SHOW TAG VALUES FROM cpu WITH KEY=host" ``` diff --git a/content/chronograf/v1.7/administration/creating-connections.md b/content/chronograf/v1.7/administration/creating-connections.md index 2c3780423..b50cdaf1e 100644 --- a/content/chronograf/v1.7/administration/creating-connections.md +++ b/content/chronograf/v1.7/administration/creating-connections.md @@ -85,6 +85,7 @@ An `.src` files contains the details for a single InfluxDB connection. Create a new file named `example.src` (the filename is arbitrary) and place it at Chronograf's `resource-path`. All `.src` files should contain the following: +{{< keep-url >}} ```json { "id": "10000", diff --git a/content/chronograf/v1.7/administration/managing-influxdb-users.md b/content/chronograf/v1.7/administration/managing-influxdb-users.md index 660230a73..d78b23b6f 100644 --- a/content/chronograf/v1.7/administration/managing-influxdb-users.md +++ b/content/chronograf/v1.7/administration/managing-influxdb-users.md @@ -64,6 +64,7 @@ Run the `curl` command below to create an admin user, replacing: * `chronothan` with your own username * `supersecret` with your own password (note that the password requires single quotes) +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` diff --git a/content/chronograf/v1.7/guides/live_leaderboard.md b/content/chronograf/v1.7/guides/live_leaderboard.md index fea4ba8f6..9c32dfa75 100644 --- a/content/chronograf/v1.7/guides/live_leaderboard.md +++ b/content/chronograf/v1.7/guides/live_leaderboard.md @@ -187,6 +187,7 @@ max Since we are writing data back to InfluxDB create a database `game` for our results. +{{< keep-url >}} ``` curl -G 'http://localhost:8086/query?' --data-urlencode 'q=CREATE DATABASE game' ``` @@ -274,6 +275,7 @@ Hit the endpoint several times to see that the scores are updating once a second Now, let's check InfluxDB to see our historical data. +{{< keep-url >}} ```bash curl \ -G 'http://localhost:8086/query?db=game' \ diff --git a/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md index e2c243583..852276864 100644 --- a/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md +++ b/content/chronograf/v1.7/guides/monitoring-influxenterprise-clusters.md @@ -85,6 +85,7 @@ Because you enabled authentication, you must perform this step before moving on 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. +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` @@ -173,6 +174,8 @@ Repeat steps one through four for each data node in your cluster. Run the following command on your InfluxDB OSS instance to see if your Telegraf instances are successfully collecting and writing data. Replace the `chronothan` and `supersecret` values with your actual username and password. + +{{< keep-url >}} ``` ~# curl -G "http://localhost:8086/query?db=telegraf&u=chronothan&p=supersecret&pretty=true" --data-urlencode "q=SHOW TAG VALUES FROM cpu WITH KEY=host" ``` diff --git a/content/chronograf/v1.8/administration/creating-connections.md b/content/chronograf/v1.8/administration/creating-connections.md index fbd67a098..818a4effb 100644 --- a/content/chronograf/v1.8/administration/creating-connections.md +++ b/content/chronograf/v1.8/administration/creating-connections.md @@ -85,6 +85,7 @@ An `.src` files contains the details for a single InfluxDB connection. Create a new file named `example.src` (the filename is arbitrary) and place it at Chronograf's `resource-path`. All `.src` files should contain the following: +{{< keep-url >}} ```json { "id": "10000", diff --git a/content/chronograf/v1.8/administration/managing-influxdb-users.md b/content/chronograf/v1.8/administration/managing-influxdb-users.md index f78c017a2..873b611d7 100644 --- a/content/chronograf/v1.8/administration/managing-influxdb-users.md +++ b/content/chronograf/v1.8/administration/managing-influxdb-users.md @@ -66,6 +66,7 @@ Run the `curl` command below to create an admin user, replacing: * `chronothan` with your own username * `supersecret` with your own password (note that the password requires single quotes) +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` diff --git a/content/chronograf/v1.8/guides/live_leaderboard.md b/content/chronograf/v1.8/guides/live_leaderboard.md index 78e1dacbc..fea349c3b 100644 --- a/content/chronograf/v1.8/guides/live_leaderboard.md +++ b/content/chronograf/v1.8/guides/live_leaderboard.md @@ -187,6 +187,7 @@ max Since we are writing data back to InfluxDB create a database `game` for our results. +{{< keep-url >}} ``` curl -G 'http://localhost:8086/query?' --data-urlencode 'q=CREATE DATABASE game' ``` @@ -274,6 +275,7 @@ Hit the endpoint several times to see that the scores are updating once a second Now, let's check InfluxDB to see our historical data. +{{< keep-url >}} ```bash curl \ -G 'http://localhost:8086/query?db=game' \ diff --git a/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md index 185e8bf9e..dbc86ef5d 100644 --- a/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md +++ b/content/chronograf/v1.8/guides/monitoring-influxenterprise-clusters.md @@ -85,6 +85,7 @@ Because you enabled authentication, you must perform this step before moving on 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. +{{< keep-url >}} ``` ~# curl -XPOST "http://localhost:8086/query" --data-urlencode "q=CREATE USER chronothan WITH PASSWORD 'supersecret' WITH ALL PRIVILEGES" ``` @@ -199,6 +200,7 @@ $ influx Replace the `chronothan` and `supersecret` values with your actual username and password. +{{< keep-url >}} ``` ~# curl -G "http://localhost:8086/query?db=telegraf&u=chronothan&p=supersecret&pretty=true" --data-urlencode "q=SHOW TAG VALUES FROM cpu WITH KEY=host" ``` diff --git a/content/enterprise_influxdb/v1.8/administration/anti-entropy-api.md b/content/enterprise_influxdb/v1.8/administration/anti-entropy-api.md index 7a885299d..9945805dd 100644 --- a/content/enterprise_influxdb/v1.8/administration/anti-entropy-api.md +++ b/content/enterprise_influxdb/v1.8/administration/anti-entropy-api.md @@ -17,7 +17,7 @@ Use the [Anti-Entropy service](/enterprise_influxdb/v1.8/administration/anti-ent The base URL is: ```text -http://localhost:8086/shard-repair` +http://localhost:8086/shard-repair ``` ## GET `/status` diff --git a/content/influxdb/v2.0/query-data/execute-queries.md b/content/influxdb/v2.0/query-data/execute-queries.md index 2988edc51..39295ff78 100644 --- a/content/influxdb/v2.0/query-data/execute-queries.md +++ b/content/influxdb/v2.0/query-data/execute-queries.md @@ -14,7 +14,7 @@ There are multiple ways to execute queries with InfluxDB. This guide covers the different options: - [Data Explorer](#data-explorer) -- [Influx REPL](#influx-repl) +- [Flux REPL](#flux-repl) - [Influx query command](#influx-query-command) - [InfluxDB API](#influxdb-api) @@ -23,18 +23,13 @@ Queries can be built, executed, and visualized in InfluxDB UI's Data Explorer. ![Data Explorer with Flux](/img/influxdb/2-0-data-explorer.png) -## Influx REPL +## Flux REPL The [Flux REPL](/influxdb/v2.0/tools/repl/) starts an interactive Read-Eval-Print Loop (REPL) where you can write and execute Flux queries. - - - - - -{{% note %}} -`ctrl-d` will close the REPL. -{{% /note %}} +```sh +./flux repl +``` ## Influx query command You can pass queries to the [`influx query` command](/influxdb/v2.0/reference/cli/influx/query) diff --git a/content/kapacitor/v1.4/administration/configuration.md b/content/kapacitor/v1.4/administration/configuration.md index a47bdba71..fa3aa4267 100644 --- a/content/kapacitor/v1.4/administration/configuration.md +++ b/content/kapacitor/v1.4/administration/configuration.md @@ -298,6 +298,7 @@ but one InfluxDB table array configuration must be flagged as the `default`. **Example 8 – An InfluxDB Connection grouping** +{{< keep-url >}} ```toml ... [[influxdb]] diff --git a/content/kapacitor/v1.4/administration/security.md b/content/kapacitor/v1.4/administration/security.md index ea1a71e5d..500e62b00 100644 --- a/content/kapacitor/v1.4/administration/security.md +++ b/content/kapacitor/v1.4/administration/security.md @@ -60,6 +60,7 @@ When testing with a **self-signed certificate** it is also important to switch o certificate verification with the property `insecure-skip-verify`. Failure to do so will result in x509 certificate errors as follows: +{{< keep-url >}} ``` ts=2018-02-19T13:26:11.437+01:00 lvl=error msg="failed to connect to InfluxDB, retrying..." service=influxdb cluster=localhost err="Get https://localhost:8086/ping: x509: certificate is valid for lenovo-TP02, not localhost" ``` @@ -71,6 +72,8 @@ ts=2018-02-19T13:26:11.437+01:00 lvl=error msg="failed to connect to InfluxDB, r In the configuration file these values are set according to the following example. **Example 1 – TLS Configuration Properties for InfluxDB – kapacitor.conf** + +{{< keep-url >}} ```toml [[influxdb]] # Connect to an InfluxDB cluster @@ -106,6 +109,8 @@ Note that when a CA file contains the certificate and key together the property As environment variables these properties can be set as follows: **Example 2 – TLS Configuration Properties for InfluxDB – ENVARS** + +{{< keep-url >}} ``` KAPACITOR_INFLUXDB_0_URLS_0="https://localhost:8086" KAPACITOR_INFLUXDB_0_SSL_CERT="/etc/ssl/influxdb-selfsigned.crt" @@ -129,6 +134,7 @@ This results in the following file: **Example 3 – The InfluxDB part of the Kapacitor configuration** +{{< keep-url >}} ```json { "elements": [ @@ -223,6 +229,7 @@ file, as environment variables or over the HTTP API. **Example 4 – InfluxDB Authentication Parameters – kapacitor.conf** +{{< keep-url >}} ```toml [[influxdb]] # Connect to an InfluxDB cluster diff --git a/content/kapacitor/v1.4/guides/live_leaderboard.md b/content/kapacitor/v1.4/guides/live_leaderboard.md index ef045c6d3..11a8b3564 100644 --- a/content/kapacitor/v1.4/guides/live_leaderboard.md +++ b/content/kapacitor/v1.4/guides/live_leaderboard.md @@ -188,6 +188,7 @@ max Since we are writing data back to InfluxDB create a database `game` for our results. +{{< keep-url >}} ``` curl -G 'http://localhost:8086/query?' --data-urlencode 'q=CREATE DATABASE game' ``` @@ -275,6 +276,7 @@ Hit the endpoint several times to see that the scores are updating once a second Now, let's check InfluxDB to see our historical data. +{{< keep-url >}} ```bash curl \ -G 'http://localhost:8086/query?db=game' \ diff --git a/content/kapacitor/v1.4/introduction/getting-started.md b/content/kapacitor/v1.4/introduction/getting-started.md index 3d8eebc59..b3d8d22dd 100644 --- a/content/kapacitor/v1.4/introduction/getting-started.md +++ b/content/kapacitor/v1.4/introduction/getting-started.md @@ -114,6 +114,8 @@ The Telegraf configuration file can be found at its default location: `/etc/tele * `[[inputs.cpu]]` - declares how to collect the system cpu metrics to be sent to InfluxDB. *Example - relevant sections of `/etc/telegraf/telegraf.conf`* + +{{< keep-url >}} ``` [agent] ## Default data collection interval for all inputs @@ -191,6 +193,7 @@ InfluxDB and Telegraf are now running and listening on localhost. Wait about a This can be achieved with the following query: +{{< keep-url >}} ```bash $ curl -G 'http://localhost:8086/query?db=telegraf' --data-urlencode 'q=SELECT mean(usage_idle) FROM cpu' ``` @@ -376,6 +379,7 @@ Telegraf will log errors if it cannot communicate to InfluxDB. InfluxDB will log an error about `connection refused` if it cannot send data to Kapacitor. Run the query `SHOW SUBSCRIPTIONS` to find the endpoint that InfluxDB is using to send data to Kapacitor. +{{< keep-url >}} ``` $ curl -G 'http://localhost:8086/query?db=telegraf' --data-urlencode 'q=SHOW SUBSCRIPTIONS' diff --git a/content/kapacitor/v1.4/introduction/install-docker.md b/content/kapacitor/v1.4/introduction/install-docker.md index c546b1612..7ab74466a 100644 --- a/content/kapacitor/v1.4/introduction/install-docker.md +++ b/content/kapacitor/v1.4/introduction/install-docker.md @@ -127,6 +127,7 @@ At this point there should be running on the host machine: InfluxDB, Telegraf an The running configuration can be further inspected by using the `influx` command line client directly from the InfluxDB Container. +{{< keep-url >}} ``` $ docker exec -it tik_influxdb_1 influx --precision rfc3339 Connected to http://localhost:8086 version 1.3.3 diff --git a/content/kapacitor/v1.4/working/api.md b/content/kapacitor/v1.4/working/api.md index 847eac676..c6d2b234f 100644 --- a/content/kapacitor/v1.4/working/api.md +++ b/content/kapacitor/v1.4/working/api.md @@ -1860,6 +1860,7 @@ Retrieve all the configuration sections which can be overridden. GET /kapacitor/v1/config ``` +{{< keep-url >}} ```json { "link" : {"rel": "self", "href": "/kapacitor/v1/config"}, @@ -1986,6 +1987,7 @@ Retrieve only the InfluxDB section. GET /kapacitor/v1/config/influxdb ``` +{{< keep-url >}} ```json { "link" : {"rel": "self", "href": "/kapacitor/v1/config/influxdb"}, diff --git a/content/kapacitor/v1.5/administration/configuration.md b/content/kapacitor/v1.5/administration/configuration.md index af48de4d2..a38310775 100644 --- a/content/kapacitor/v1.5/administration/configuration.md +++ b/content/kapacitor/v1.5/administration/configuration.md @@ -340,6 +340,7 @@ To use Kapacitor with an InfluxDB instance that requires authentication, it must authenticate using an InfluxDB user with **read and write** permissions. {{% /note %}} +{{< keep-url >}} ```toml ... [[influxdb]] diff --git a/content/kapacitor/v1.5/administration/security.md b/content/kapacitor/v1.5/administration/security.md index fc6884d65..d2971c932 100644 --- a/content/kapacitor/v1.5/administration/security.md +++ b/content/kapacitor/v1.5/administration/security.md @@ -59,6 +59,7 @@ When testing with a **self-signed certificate** it is also important to switch o certificate verification with the property `insecure-skip-verify`. Failure to do so will result in x509 certificate errors as follows: +{{< keep-url >}} ``` ts=2018-02-19T13:26:11.437+01:00 lvl=error msg="failed to connect to InfluxDB, retrying..." service=influxdb cluster=localhost err="Get https://localhost:8086/ping: x509: certificate is valid for lenovo-TP02, not localhost" ``` @@ -70,6 +71,8 @@ ts=2018-02-19T13:26:11.437+01:00 lvl=error msg="failed to connect to InfluxDB, r In the configuration file these values are set according to the following example. **Example 1 – TLS Configuration Properties for InfluxDB – kapacitor.conf** + +{{< keep-url >}} ```toml [[influxdb]] # Connect to an InfluxDB cluster @@ -105,6 +108,8 @@ Note that when a CA file contains the certificate and key together the property As environment variables these properties can be set as follows: **Example 2 – TLS Configuration Properties for InfluxDB – ENVARS** + +{{< keep-url >}} ``` KAPACITOR_INFLUXDB_0_URLS_0="https://localhost:8086" KAPACITOR_INFLUXDB_0_SSL_CERT="/etc/ssl/influxdb-selfsigned.crt" @@ -128,6 +133,7 @@ This results in the following file: **Example 3 – The InfluxDB part of the Kapacitor configuration** +{{< keep-url >}} ```json { "elements": [ @@ -222,6 +228,7 @@ file, as environment variables or over the HTTP API. **Example 4 – InfluxDB Authentication Parameters – kapacitor.conf** +{{< keep-url >}} ```toml [[influxdb]] # Connect to an InfluxDB cluster diff --git a/content/kapacitor/v1.5/guides/live_leaderboard.md b/content/kapacitor/v1.5/guides/live_leaderboard.md index 82b17c8c5..c2dc04956 100644 --- a/content/kapacitor/v1.5/guides/live_leaderboard.md +++ b/content/kapacitor/v1.5/guides/live_leaderboard.md @@ -190,6 +190,7 @@ max Since we are writing data back to InfluxDB create a database `game` for our results. +{{< keep-url >}} ``` curl -G 'http://localhost:8086/query?' --data-urlencode 'q=CREATE DATABASE game' ``` @@ -277,6 +278,7 @@ Hit the endpoint several times to see that the scores are updating once a second Now, let's check InfluxDB to see our historical data. +{{< keep-url >}} ```bash curl \ -G 'http://localhost:8086/query?db=game' \ diff --git a/content/kapacitor/v1.5/introduction/getting-started.md b/content/kapacitor/v1.5/introduction/getting-started.md index f1868fab9..bc7b055e3 100644 --- a/content/kapacitor/v1.5/introduction/getting-started.md +++ b/content/kapacitor/v1.5/introduction/getting-started.md @@ -46,6 +46,7 @@ To get started, do the following: 2. In the Telegraf configuration file (`/etc/telegraf/telegraf.conf`), configure `[[outputs.influxd]]` to specify how to connect to InfluxDB and the destination database. + {{< keep-url >}} ```sh [[outputs.influxdb]] ## InfluxDB url is required and must be in the following form: http/udp "://" host [ ":" port] @@ -67,6 +68,7 @@ To get started, do the following: 4. After a minute, run the following command to use the InfluxDB API to query for the Telegraf data: + {{< keep-url >}} ```bash $ curl -G 'http://localhost:8086/query?db=telegraf' --data-urlencode 'q=SELECT mean(usage_idle) FROM cpu' ``` @@ -276,8 +278,9 @@ Complete the following steps to ensure log files and communication channels aren InfluxDB logs an error about `connection refused` if it cannot send data to Kapacitor. Run the query `SHOW SUBSCRIPTIONS` against InfluxDB to find the endpoint that InfluxDB is using to send data to Kapacitor. - In the following example, InfluxDB must be running on localhost:8086: + In the following example, InfluxDB must be running on `localhost:8086`: + {{< keep-url >}} ``` $ curl -G 'http://localhost:8086/query?db=telegraf' --data-urlencode 'q=SHOW SUBSCRIPTIONS' diff --git a/content/kapacitor/v1.5/introduction/install-docker.md b/content/kapacitor/v1.5/introduction/install-docker.md index 938b5ad0e..e5a7fa00a 100644 --- a/content/kapacitor/v1.5/introduction/install-docker.md +++ b/content/kapacitor/v1.5/introduction/install-docker.md @@ -126,6 +126,7 @@ At this point there should be running on the host machine: InfluxDB, Telegraf an The running configuration can be further inspected by using the `influx` command line client directly from the InfluxDB Container. +{{< keep-url >}} ``` $ docker exec -it tik_influxdb_1 influx --precision rfc3339 Connected to http://localhost:8086 version 1.3.3 diff --git a/content/kapacitor/v1.5/working/api.md b/content/kapacitor/v1.5/working/api.md index 78b7cf43e..3a344449f 100644 --- a/content/kapacitor/v1.5/working/api.md +++ b/content/kapacitor/v1.5/working/api.md @@ -1864,6 +1864,7 @@ Retrieve all the configuration sections which can be overridden. GET /kapacitor/v1/config ``` +{{< keep-url >}} ```json { "link" : {"rel": "self", "href": "/kapacitor/v1/config"}, @@ -1990,6 +1991,7 @@ Retrieve only the InfluxDB section. GET /kapacitor/v1/config/influxdb ``` +{{< keep-url >}} ```json { "link" : {"rel": "self", "href": "/kapacitor/v1/config/influxdb"}, diff --git a/content/telegraf/v1.10/administration/configuration.md b/content/telegraf/v1.10/administration/configuration.md index b21738497..c13bdacca 100644 --- a/content/telegraf/v1.10/administration/configuration.md +++ b/content/telegraf/v1.10/administration/configuration.md @@ -73,7 +73,7 @@ Each plugin will sleep for a random time within jitter before collecting. This can be used to avoid many plugins querying things like sysfs at the same time, which can have a measurable effect on the system. * **flush_interval**: Default data flushing interval for all outputs. -You should not set this below `interval`. +You should not set this below `interval`. Maximum `flush_interval` will be `flush_interval` + `flush_jitter` * **flush_jitter**: Jitter the flush interval by a random amount. This is primarily to avoid @@ -322,6 +322,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.11/administration/configuration.md b/content/telegraf/v1.11/administration/configuration.md index b0edb4df7..bd46d240f 100644 --- a/content/telegraf/v1.11/administration/configuration.md +++ b/content/telegraf/v1.11/administration/configuration.md @@ -73,7 +73,7 @@ Each plugin will sleep for a random time within jitter before collecting. This can be used to avoid many plugins querying things like sysfs at the same time, which can have a measurable effect on the system. * **flush_interval**: Default data flushing interval for all outputs. -You should not set this below `interval`. +You should not set this below `interval`. Maximum `flush_interval` will be `flush_interval` + `flush_jitter` * **flush_jitter**: Jitter the flush interval by a random amount. This is primarily to avoid @@ -322,6 +322,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.12/administration/configuration.md b/content/telegraf/v1.12/administration/configuration.md index de90faf06..dfb89e3e8 100644 --- a/content/telegraf/v1.12/administration/configuration.md +++ b/content/telegraf/v1.12/administration/configuration.md @@ -73,7 +73,7 @@ Each plugin will sleep for a random time within jitter before collecting. This can be used to avoid many plugins querying things like sysfs at the same time, which can have a measurable effect on the system. * **flush_interval**: Default data flushing interval for all outputs. -You should not set this below `interval`. +You should not set this below `interval`. Maximum `flush_interval` will be `flush_interval` + `flush_jitter` * **flush_jitter**: Jitter the flush interval by a random amount. This is primarily to avoid @@ -322,6 +322,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.13/administration/configuration.md b/content/telegraf/v1.13/administration/configuration.md index 636aaa1f2..ef907d69a 100644 --- a/content/telegraf/v1.13/administration/configuration.md +++ b/content/telegraf/v1.13/administration/configuration.md @@ -41,7 +41,7 @@ configuration files. ## Set environment variables Add environment variables anywhere in the configuration file by prepending them with `$`. -For strings, variables must be in quotes (for example, `"$STR_VAR"`). +For strings, variables must be in quotes (for example, `"$STR_VAR"`). For numbers and Booleans, variables must be unquoted (for example, `$INT_VAR`, `$BOOL_VAR`). You can also set environment variables using the Linux `export` command: `export password=mypassword` @@ -52,6 +52,7 @@ You can also set environment variables using the Linux `export` command: `export In the Telegraf environment variables file (`/etc/default/telegraf`): +{{< keep-url >}} ```sh USER="alice" INFLUX_URL="http://localhost:8086" @@ -75,6 +76,7 @@ In the Telegraf configuration file (`/etc/telegraf.conf`): The environment variables above add the following configuration settings to Telegraf: +{{< keep-url >}} ```sh [global_tags] user = "alice" @@ -361,6 +363,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.14/administration/configuration.md b/content/telegraf/v1.14/administration/configuration.md index 73843bbf2..139a3a147 100644 --- a/content/telegraf/v1.14/administration/configuration.md +++ b/content/telegraf/v1.14/administration/configuration.md @@ -42,7 +42,7 @@ configuration files. ## Set environment variables Add environment variables anywhere in the configuration file by prepending them with `$`. -For strings, variables must be in quotes (for example, `"$STR_VAR"`). +For strings, variables must be in quotes (for example, `"$STR_VAR"`). For numbers and Booleans, variables must be unquoted (for example, `$INT_VAR`, `$BOOL_VAR`). You can also set environment variables using the Linux `export` command: `export password=mypassword` @@ -53,6 +53,7 @@ You can also set environment variables using the Linux `export` command: `export In the Telegraf environment variables file (`/etc/default/telegraf`): +{{< keep-url >}} ```sh USER="alice" INFLUX_URL="http://localhost:8086" @@ -76,6 +77,7 @@ In the Telegraf configuration file (`/etc/telegraf.conf`): The environment variables above add the following configuration settings to Telegraf: +{{< keep-url >}} ```sh [global_tags] user = "alice" @@ -361,6 +363,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.15/administration/configuration.md b/content/telegraf/v1.15/administration/configuration.md index e814dcdb4..522ddf433 100644 --- a/content/telegraf/v1.15/administration/configuration.md +++ b/content/telegraf/v1.15/administration/configuration.md @@ -53,6 +53,7 @@ You can also set environment variables using the Linux `export` command: `export In the Telegraf environment variables file (`/etc/default/telegraf`): +{{< keep-url >}} ```sh USER="alice" INFLUX_URL="http://localhost:8086" @@ -76,6 +77,7 @@ In the Telegraf configuration file (`/etc/telegraf.conf`): The environment variables above add the following configuration settings to Telegraf: +{{< keep-url >}} ```sh [global_tags] user = "alice" @@ -362,6 +364,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/content/telegraf/v1.9/administration/configuration.md b/content/telegraf/v1.9/administration/configuration.md index ce3c6836c..8f72df62f 100644 --- a/content/telegraf/v1.9/administration/configuration.md +++ b/content/telegraf/v1.9/administration/configuration.md @@ -322,6 +322,7 @@ Additional inputs (or outputs) of the same type can be specified by defining the #### Output configuration examples: +{{< keep-url >}} ```toml [[outputs.influxdb]] urls = [ "http://localhost:8086" ] diff --git a/data/influxdb_urls.yml b/data/influxdb_urls.yml index c98acdd9c..eb8978ea2 100644 --- a/data/influxdb_urls.yml +++ b/data/influxdb_urls.yml @@ -1,5 +1,5 @@ oss: - product: InfluxDB OSS + product: InfluxDB v2 OSS providers: - name: Default regions: diff --git a/data/versions.yaml b/data/versions.yaml deleted file mode 100644 index 0c28bd5ba..000000000 --- a/data/versions.yaml +++ /dev/null @@ -1 +0,0 @@ -stable_version: v2.0 diff --git a/layouts/partials/footer/influxdb-url-modal.html b/layouts/partials/footer/influxdb-url-modal.html index e66466b5c..9526e128b 100644 --- a/layouts/partials/footer/influxdb-url-modal.html +++ b/layouts/partials/footer/influxdb-url-modal.html @@ -1,4 +1,4 @@ -{{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) .RelPermalink | default "v2.0" }} +{{ $latestInfluxDBVersion := index (last 1 $.Site.Data.products.influxdb.versions) 0 }}
@@ -6,7 +6,7 @@

Where are you running InfluxDB?

-

Select where you're using InfluxDB and we'll customize code examples with your InfluxDB URL.

+

Select where you're using InfluxDB Cloud or InfluxDB v2 OSS and we'll customize code examples with your InfluxDB URL.

{{ range sort .Site.Data.influxdb_urls "product" "desc" }}
@@ -47,7 +47,7 @@
{{ end }}
-

For more information, see InfluxDB URLs.

+

For more information, see InfluxDB URLs.