Merge branch 'master' into feat/dar-303-hourselection-improvement

CONTRIBUTING.md

@@ -1114,6 +1114,19 @@ Use the `{{< caps >}}` shortcode to format text to match those buttons.
 Click {{< caps >}}Add Data{{< /caps >}}
 ```
 
+#### Code callouts
+Use the `{{< code-callout >}}` shortcode to highlight and emphasize a specific
+piece of code in a code block. Provide the string to highlight in the code block.
+Include a syntax for the codeblock to properly style the called out code.
+
+~~~md
+{{< code-callout "03a2bbf46249a000" >}}
+```sh
+http://localhost:8086/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
+~~~
+
 #### InfluxDB University banners
 Use the `{{< influxdbu >}}` shortcode to add an InfluxDB University banner that
 points to the InfluxDB University site or a specific course.

assets/styles/layouts/article/_code.scss

@@ -64,9 +64,9 @@ pre {
   border-radius: $radius;
   overflow-x: scroll;
   overflow-y: hidden;
+  font-size: 1rem;
   code {
     padding: 0;
-    font-size: 1rem;
     line-height: 1.7rem;
     white-space: pre;
   }

assets/styles/layouts/article/_html-diagrams.scss

@@ -15,7 +15,8 @@
 
       li {
         position: relative;
-        margin: 0;
+        margin: 0 0 0 -1.45rem;
+        padding-left: 1.45rem;
         line-height: 2.5rem;
         border-left: 1px solid $article-code;
         &:before {
@@ -24,6 +25,7 @@
           width: 1rem;
           height: .25rem;
           margin-right: .55rem;
+          margin-left: -1.45rem;
           border-top: 1px solid $article-code;
         }
         &:last-child {

assets/styles/layouts/article/_lists.scss

@@ -3,6 +3,8 @@
 ol, ul {
   padding-left: 1.6rem;
   margin: 1rem 0 1.5rem 0;
+
+  ol, ul {margin: 0;}
 }
 
 ul {

content/enterprise_influxdb/v1.7/install-and-deploy/production_installation/data_node_installation.md

@@ -18,15 +18,15 @@ If you have not set up your meta nodes, please visit
 [Installing meta nodes](/enterprise_influxdb//v1.7/install-and-deploy/production_installation/meta_node_installation/).
 Bad things can happen if you complete the following steps without meta nodes.
 
-<br>
 # Data node setup description and requirements
 
 The Production Installation process sets up two [data nodes](/enterprise_influxdb/v1.7/concepts/glossary#data-node)
 and each data node runs on its own server.
 You **must** have a minimum of two data nodes in a cluster.
 InfluxDB Enterprise clusters require at least two data nodes for high availability and redundancy.
-<br>
+`hh`, `wal`, `data`, and `meta` directories are required on all data nodes and are created as part of the installation process.
-Note: that there is no requirement for each data node to run on its own
+
+**Note:** There is no requirement for each data node to run on its own
 server.  However, best practices are to deploy each data node on a dedicated server.
 
 See the
@@ -72,16 +72,19 @@ Ultimately, use entries similar to the following (hostnames and domain IP addres
 | A           | ```enterprise-data-01.mydomain.com``` | ```<Data_1_IP>``` |
 | A           | ```enterprise-data-02.mydomain.com``` | ```<Data_2_IP>``` |
 
-> **Verification steps:**
+   {{% note %}}
->
+**Verification steps:**
+
 Before proceeding with the installation, verify on each meta and data server that the other
 servers are resolvable. Here is an example set of shell commands using `ping`:
->
+```bash
     ping -qc 1 enterprise-meta-01
     ping -qc 1 enterprise-meta-02
     ping -qc 1 enterprise-meta-03
     ping -qc 1 enterprise-data-01
     ping -qc 1 enterprise-data-02
+```
+   {{% /note %}}
 
 We highly recommend that each server be able to resolve the IP from the hostname alone as shown here.
 Resolve any connectivity issues before proceeding with the installation.
@@ -114,26 +117,26 @@ For added security, follow these steps to verify the signature of your InfluxDB
 
 1. Download and import InfluxData's public key:
 
-    ```
+    ```bash
     curl -s https://repos.influxdata.com/influxdb.key | gpg --import
     ```
 
 2. Download the signature file for the release by adding `.asc` to the download URL.
    For example:
 
-    ```
+    ```bash
     wget https://dl.influxdata.com/enterprise/releases/influxdb-data-{{< latest-patch >}}_c{{< latest-patch >}}.x86_64.rpm.asc
     ```
 
 3. Verify the signature with `gpg --verify`:
 
-    ```
+    ```bash
     gpg --verify influxdb-data-{{< latest-patch >}}_c{{< latest-patch >}}.x86_64.rpm.asc influxdb-data-{{< latest-patch >}}_c{{< latest-patch >}}.x86_64.rpm
     ```
 
     The output from this command should include the following:
 
-    ```
+    ```bash
     gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
     ```
 
@@ -207,16 +210,18 @@ On systemd systems, enter:
 sudo systemctl start influxdb
 ```
 
-> **Verification steps:**
+**Verification steps:**
->
-Check to see that the process is running by entering:
->
-    ps aux | grep -v grep | grep influxdb
->
-You should see output similar to:
->
-    influxdb  2706  0.2  7.0 571008 35376 ?        Sl   15:37   0:16 /usr/bin/influxd -config /etc/influxdb/influxdb.conf
 
+Check to see that the process is running by entering:
+
+```bash
+ps aux | grep -v grep | grep influxdb
+```
+
+You should see output similar to:
+```bash
+influxdb  2706  0.2  7.0 571008 35376 ?        Sl   15:37   0:16 /usr/bin/influxd -config /etc/influxdb/influxdb.conf
+```
 
 If you do not see the expected output, the process is either not launching or is exiting prematurely. Check the [logs](/enterprise_influxdb/v1.7/administration/logs/) for error messages and verify the previous setup steps are complete.
 
@@ -251,25 +256,27 @@ to the cluster.
 > **Verification steps:**
 >
 Issue the following command on any meta node:
->
+```bash
-    influxd-ctl show
+influxd-ctl show
->
+```
 The expected output is:
->
-    Data Nodes
-    ==========
-    ID   TCP Address               Version
-    4    enterprise-data-01:8088   {{< latest-patch >}}-c{{< latest-patch >}}
-    5    enterprise-data-02:8088   {{< latest-patch >}}-c{{< latest-patch >}}
 
->
+```bash
-    Meta Nodes
-    ==========
-    TCP Address               Version
-    enterprise-meta-01:8091   {{< latest-patch >}}-c{{< latest-patch >}}
-    enterprise-meta-02:8091   {{< latest-patch >}}-c{{< latest-patch >}}
-    enterprise-meta-03:8091   {{< latest-patch >}}-c{{< latest-patch >}}
 
+Data Nodes
+==========
+ID  TCP Address             Version         Labels
+4  cluster-node-01:8088    1.7.x-c1.7.x    {}
+5  cluster-node-02:8088    1.7.x-c1.7.x    {}
+
+Meta Nodes
+==========
+TCP Address             Version         Labels
+cluster-node-01:8091    1.7.x-c1.7.x    {}
+cluster-node-02:8091    1.7.x-c1.7.x    {}
+cluster-node-03:8091    1.7.x-c1.7.x    {}
+
+```
 
 The output should include every data node that was added to the cluster.
 The first data node added should have `ID=N`, where `N` is equal to one plus the number of meta nodes.

content/enterprise_influxdb/v1.8/install-and-deploy/production_installation/data_node_installation.md

@@ -24,8 +24,9 @@ The Production Installation process sets up two [data nodes](/enterprise_influxd
 and each data node runs on its own server.
 You **must** have a minimum of two data nodes in a cluster.
 InfluxDB Enterprise clusters require at least two data nodes for high availability and redundancy.
-<br>
+`hh`, `wal`, `data`, and `meta` directories are required on all data nodes and are created as part of the installation process.
-Note: that there is no requirement for each data node to run on its own
+
+**Note:** There is no requirement for each data node to run on its own
 server.  However, best practices are to deploy each data node on a dedicated server.
 
 See the
@@ -211,19 +212,17 @@ On systemd systems, enter:
 sudo systemctl start influxdb
 ```
 
-   {{% note %}}
 **Verification steps:**
 
 Check to see that the process is running by entering:
-
+```bash
-    ps aux | grep -v grep | grep influxdb
+ps aux | grep -v grep | grep influxdb
-
+```
 You should see output similar to:
-
+```bash
-    influxdb  2706  0.2  7.0 571008 35376 ?        Sl   15:37   0:16 /usr/bin/influxd -config /etc/influxdb/influxdb.conf
+influxdb  2706  0.2  7.0 571008 35376 ?        Sl   15:37   0:16 /usr/bin/influxd -config /etc/influxdb/influxdb.conf
-
+```
-   {{% /note %}}
+ 
-
 If you do not see the expected output, the process is either not launching or is exiting prematurely. Check the [logs](/enterprise_influxdb/v1.8/administration/logs/) for error messages and verify the previous setup steps are complete.
 
 If you see the expected output, repeat for the remaining data nodes.
@@ -252,29 +251,28 @@ The expected output is:
 Added data node y at enterprise-data-0x:8088
 ```
 
-   {{% note %}}
 **Verification steps:**
 
 Issue the following command on any meta node:
-
+```bash
-    influxd-ctl show
+influxd-ctl show
-
+```
 The expected output is:
+```bash
 
-    Data Nodes
+Data Nodes
-    ==========
+==========
-    ID   TCP Address               Version
+ID  TCP Address             Version         Labels
-    4    enterprise-data-01:8088   {{< latest-patch >}}-c{{< latest-patch >}}
+4  cluster-node-01:8088    1.8.x-c1.8.x    {}
-    5    enterprise-data-02:8088   {{< latest-patch >}}-c{{< latest-patch >}}
+5  cluster-node-02:8088    1.8.x-c1.8.x    {}
 
-
+Meta Nodes
-    Meta Nodes
+==========
-    ==========
+TCP Address             Version         Labels
-    TCP Address               Version
+cluster-node-01:8091    1.8.x-c1.8.x    {}
-    enterprise-meta-01:8091   {{< latest-patch >}}-c{{< latest-patch >}}
+cluster-node-02:8091    1.8.x-c1.8.x    {}
-    enterprise-meta-02:8091   {{< latest-patch >}}-c{{< latest-patch >}}
+cluster-node-03:8091    1.8.x-c1.8.x    {}
-    enterprise-meta-03:8091   {{< latest-patch >}}-c{{< latest-patch >}}
+  ```
-       {{% /note %}}
 
 The output should include every data node that was added to the cluster.
 The first data node added should have `ID=N`, where `N` is equal to one plus the number of meta nodes.

content/enterprise_influxdb/v1.9/about-the-project/release-notes-changelog.md

@@ -9,8 +9,13 @@ menu:
     parent: About the project
 ---
 
-## 1.9.7 [2022-05-26]
+## 1.9.7 [2022-06-06]
 
+{{% warn %}}
+An edge case regression was introduced into this version that may cause a constant build-up of hinted handoff if writes are rejected due to malformed requests. We're reverting back to InfluxDB Enterprise 1.9.6 as the official stable version. If you experience write errors and hinted hand-off growth, we recommend reverting back to 1.9.6 or upgrading to 1.9.8 when released.
+{{% /warn %}}
+
+<!--
 ### Features
 - Expose passive node feature to influxd-ctl and the API.
 - Throttle inter-node data replication, both incoming writes and hinted hand-off, when errors are encountered.
@@ -34,6 +39,7 @@ menu:
 ### Maintenance updates
 - Upgrade to Go 1.17.9
 - Update to [Flux v0.161.0](/flux/v0.x/release-notes/#v01610-2022-03-24).
+-->
 
 ## 1.9.6 [2022-02-16]
 

content/enterprise_influxdb/v1.9/administration/backup-and-restore.md

@@ -27,10 +27,12 @@ Depending on the volume of data to be protected and your application requirement
 - [Backup and restore utilities](#backup-and-restore-utilities) — For most applications
 - [Exporting and importing data](#exporting-and-importing-data) — For large datasets
 
-> **Note:** Use the [`backup` and `restore` utilities (InfluxDB OSS 1.5 and later)](/enterprise_influxdb/v1.9/administration/backup-and-restore/) to:
+{{% note %}}
->
+Use the [`backup` and `restore` utilities (InfluxDB OSS 1.5 and later)](/enterprise_influxdb/v1.9/administration/backup-and-restore/) to:
-> - Restore InfluxDB Enterprise backup files to InfluxDB OSS instances.
+
-> - Back up InfluxDB OSS data that can be restored in InfluxDB Enterprise clusters.
+- Restore InfluxDB Enterprise backup files to InfluxDB OSS instances.
+- Back up InfluxDB OSS data that can be restored in InfluxDB Enterprise clusters.
+{{% /note %}}
 
 ## Backup and restore utilities
 
@@ -40,7 +42,7 @@ Most InfluxDB Enterprise applications can use the backup and restore utilities.
 
 Use the `backup` and `restore` utilities to back up and restore between `influxd`
 instances with the same versions or with only minor version differences.
-For example, you can backup from {{< latest-patch version="1.8" >}} and restore on {{< latest-patch >}}.
+For example, you can backup from {{< latest-patch minorVersionOffset=-1 >}} and restore on {{< latest-patch >}}.
 
 ### Backup utility
 

content/enterprise_influxdb/v1.9/administration/configure/_index.md

@@ -9,3 +9,5 @@ menu:
 ---
 
 {{< children >}}
+
+{{< influxdbu title="Configuring InfluxDB Enterprise: Best Practices" summary="Learn about best practices and optimization techniques for InfluxDB Enterprise in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/configuring-influxdb-enterprise-best-practices-tutorial/" >}}

content/enterprise_influxdb/v1.9/administration/configure/config-data-nodes.md

@@ -742,11 +742,9 @@ Environment variable: `INFLUXDB_HINTED_HANDOFF_RETRY_INTERVAL`
 
 #### `retry-max-interval`
 
-Default is `"10s"`.
+Default is `"200s"`.
 
 The maximum interval after which the hinted handoff retries a write after the write fails.
-The `retry-max-interval` option is no longer in use and will be removed from the configuration file in a future release.
-Changing the `retry-max-interval` setting has no effect on your cluster.
 
 Environment variable: `INFLUXDB_HINTED_HANDOFF_RETRY_MAX_INTERVAL`
 

content/enterprise_influxdb/v1.9/concepts/_index.md

@@ -10,3 +10,5 @@ menu:
 ---
 
 {{< children hlevel="h2" type="list" >}}
+
+{{< influxdbu title="Configuring InfluxDB Enterprise: Best Practices" summary="Learn about best practices and optimization techniques for InfluxDB Enterprise in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/configuring-influxdb-enterprise-best-practices-tutorial/" >}}

content/enterprise_influxdb/v1.9/concepts/glossary.md

@@ -181,10 +181,10 @@ Related entries: [server](#server)
 
 The local server's nanosecond timestamp.
 
-## passive node (experimental)
+<!-- ## passive node (experimental)
 
 Passive nodes act as load balancers--they accept write calls, perform shard lookup and RPC calls (on active data nodes), and distribute writes to active data nodes. They do not own shards or accept writes. 
-**Note:**  This is an experimental feature.  
+**Note:**  This is an experimental feature.   -->
 
 <!--
 ## permission

content/enterprise_influxdb/v1.9/features/clustering-features.md

@@ -134,7 +134,7 @@ version 0.7.1.
 See [Backup and restore](/enterprise_influxdb/v1.9/administration/backup-and-restore/) for
 more information.
 
-## Passive node setup (experimental)
+<!-- ## Passive node setup (experimental)
 
 Passive nodes act as load balancers--they accept write calls, perform shard lookup and RPC calls (on active data nodes), and distribute writes to active data nodes. They do not own shards or accept writes.
 
@@ -149,4 +149,4 @@ For more inforrmation, see how to [add a passive node to a cluster](/enterprise_
 
 {{% note %}}
 **Note:**  This feature is experimental and available only in InfluxDB Enterprise.
-{{% /note %}}
+{{% /note %}} -->

content/enterprise_influxdb/v1.9/flux/_index.md

@@ -33,3 +33,5 @@ from(bucket: "telegraf/autogen")
 ```
 
 {{< children >}}
+
+{{< influxdbu title="Intro to Basic Flux Elements" summary="Learn the basics about Flux, InfluxDB’s functional scripting language in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/intro-to-basic-flux-elements-tutorial/" >}}

content/enterprise_influxdb/v1.9/flux/get-started/_index.md

@@ -110,6 +110,8 @@ The Schema pane allows you to explore your data.
 The Script pane is where you write your Flux script.
 The Functions pane provides a list of functions available in your Flux queries.
 
+{{< influxdbu "flux-103" >}}
+
 <div class="page-nav-btns">
   <a class="btn next" href="/enterprise_influxdb/v1.9/flux/get-started/query-influxdb/">Query InfluxDB with Flux</a>
 </div>

content/enterprise_influxdb/v1.9/flux/guides/_index.md

@@ -35,3 +35,5 @@ data = from(bucket: "db/rp")
 ---
 
 {{< children pages="all" readmore="true" hr="true" >}}
+
+{{< influxdbu title="Intro to Basic Flux Elements" summary="Learn the basics about Flux, InfluxDB’s functional scripting language in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/intro-to-basic-flux-elements-tutorial/" >}}

content/enterprise_influxdb/v1.9/introduction/_index.md

@@ -12,3 +12,5 @@ menu:
 ---
 
 {{< children >}}
+
+{{< influxdbu title="Intro to InfluxDB Enterprise" summary="Learn about the features and benefits of using InfluxDB Enterprise in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/intro-to-influxdb-enterprise-tutorial/" >}}

content/enterprise_influxdb/v1.9/introduction/getting-started.md

@@ -20,3 +20,5 @@ After you successfully [install and set up](/enterprise_influxdb/v1.9/introducti
 - Find [Enterprise guides](/enterprise_influxdb/v1.9/guides/) on a variety of topics, such as how to downsample and retain data, rebalance InfluxDB Enterprise clusters, use fine-grained authorization, and more!
 - Explore the [InfluxQL](/enterprise_influxdb/v1.9/query_language/) and [Flux](/enterprise_influxdb/v1.9/flux/) languages.
 - Learn about [InfluxDB line protocol](/enterprise_influxdb/v1.9/write_protocols/) and other [supported protocols](/enterprise_influxdb/v1.9/supported_protocols/).
+
+{{< influxdbu "influxdb-101" >}}

content/enterprise_influxdb/v1.9/introduction/installation/_index.md

@@ -18,3 +18,5 @@ Complete the following steps to install an InfluxDB Enterprise cluster in your o
 1. [Install InfluxDB Enterprise meta nodes](/enterprise_influxdb/v1.9/introduction/installation/installation/meta_node_installation/)
 2. [Install InfluxDB data nodes](/enterprise_influxdb/v1.9/introduction/installation/installation/data_node_installation/)
 3. [Install Chronograf](/enterprise_influxdb/v1.9/introduction/installation/installation/chrono_install/)
+
+{{< influxdbu title="Installing InfluxDB Enterprise" summary="Learn about InfluxDB architecture and how to install InfluxDB Enterprise with step-by-step instructions." action="Take the course" link="https://university.influxdata.com/courses/installing-influxdb-enterprise-tutorial/" >}}

content/enterprise_influxdb/v1.9/tools/influxd-ctl.md

@@ -169,8 +169,8 @@ Resources: [Installation](/enterprise_influxdb/v1.9/installation/data_node_insta
 
 Optional arguments are in brackets.
 
-##### `[ -p ]`  
+<!-- ##### `[ -p ]`  
-Add a passive node to an Enterprise cluster.
+Add a passive node to an Enterprise cluster. -->
 
 ### Examples
 
@@ -196,12 +196,12 @@ $ influxd-ctl -bind cluster-meta-node-01:8091 add-data cluster-data-node:8088
 Added data node 3 at cluster-data-node:8088
 ```
 
-###### Add a passive node to a cluster
+<!-- ###### Add a passive node to a cluster
 **Passive nodes** act as load balancers--they accept write calls, perform shard lookup and RPC calls (on active data nodes), and distribute writes to active data nodes. They do not own shards or accept writes. If you are using passive nodes, they should be the write endpoint for all data ingest. A cluster can have multiple passive nodes.
 
 ```bash
 influxd-ctl add-data -p <passive-data-node-TCP-bind-address>
-```
+``` -->
 
 ### `add-meta`
 
@@ -1097,7 +1097,7 @@ cluster-node-01:8091    1.9.x-c1.9.x    {}
 cluster-node-02:8091    1.9.x-c1.9.x    {}
 cluster-node-03:8091    1.9.x-c1.9.x    {}
 ```
-##### Show active and passive data nodes in a cluster
+<!-- ##### Show active and passive data nodes in a cluster
 
 In this example, the `show` command output displays that the cluster includes a passive data node.
 
@@ -1109,6 +1109,7 @@ ID	TCP Address               Version		    Labels	  Passive
 5	 cluster-node_1_1:8088		  1.9.6-c1.9.6  {}	      true
 6	 cluster-node_2_1:8088		  1.9.6-c1.9.6  {}	      false
 ```
+-->
 
 ### `show-shards`
 

content/flux/v0.x/release-notes.md

@@ -10,6 +10,39 @@ aliases:
   - /influxdb/cloud/reference/release-notes/flux/
 ---
 
+## v0.170.1 [2022-06-06]
+
+### Bug fixes
+- Require an earlier minimum version of `lsp-types`.
+
+---
+
+## v0.170.0 [2022-06-02]
+
+### Features
+- Add a `pretty.rs`-based MonoType formatter.
+
+### Bug fixes
+- Update vectorized `map()` to properly handle shadowed columns.
+
+---
+
+## v0.169.0 [2022-05-31]
+
+### Features
+- Add a `_status` tag to PagerDuty records.
+- Refactor the operator profile to be in the query statistics.
+
+### Bug fixes
+- Ensure that constraints are checked and propagated fully.
+- Fix math for integral with a single value.
+- Add `json` tags for the transport profiles in statistics.
+- Initialize `Metadata` in Flux statistics.
+- Return a more helpful error message when an HTTP response body exceeds 100MB.
+- Correct several issues found during the implementation of polymorphic labels.
+
+---
+
 ## v0.168.0 [2022-05-23]
 
 ### Features

content/flux/v0.x/stdlib/date/month.md

@@ -16,7 +16,8 @@ introduced: 0.37.0
 ---
 
 The `date.month()` function returns the month of a specified time.
-Results range from `[1-12]`.
+Results range from `[1-12]` and correspond to `date` package
+[month constants](/flux/v0.x/stdlib/date/#months-of-the-year).
 
 ```js
 import "date"

content/flux/v0.x/stdlib/date/weekday.md

@@ -16,7 +16,8 @@ introduced: 0.37.0
 ---
 
 The `date.weekDay()` function returns the day of the week for a specified time.
-Results range from `[0-6]`.
+Results range from `[0-6]` and correspond to `date` package
+[weekday constants](/flux/v0.x/stdlib/date/#days-of-the-week).
 
 ```js
 import "date"

content/flux/v0.x/stdlib/pagerduty/endpoint.md

@@ -26,6 +26,13 @@ pagerduty.endpoint(
 )
 ```
 
+## Output data
+For each input row, `pagerduty.endpoint()` sends an event to the PagerDuty API
+and outputs a corresponding output row with the following additional columns:
+
+- **sent**: Sent succesfully <span style="opacity: .5">_(bool)_</span>
+- **\_status**: HTTP response status code <span style="opacity: .5">_(string)_</span>
+
 ## Parameters
 
 ### url {data-type="string"}

content/flux/v0.x/stdlib/types/istype.md

@@ -14,7 +14,7 @@ flux/v0.x/tags: [tests, types]
 
 `types.isType()` tests if a value is a specified
 [Flux basic type](/flux/v0.x/data-types/basic/) or
-[regular expression type](/flux/v0.x/data-types/regexp/).
+[regular expression type](/flux/v0.x/data-types/regexp/). Use this function to filter your data by type. Often used to downsample or [aggregate data by type](#aggregate-or-select-data-based-on-type).
 
 ```js
 import "types"

content/flux/v0.x/stdlib/universe/bool.md

@@ -31,9 +31,64 @@ bool(v: "true")
 The value to convert.
 
 ## Examples
+
+#### Convert a numeric column to a boolean column
 ```js
-from(bucket: "sensor-data")
+import "sampledata"
-    |> range(start: -1m)
+
-    |> filter(fn: (r) => r._measurement == "system")
+data = sampledata.numericBool()
-    |> map(fn: (r) => ({r with responsive: bool(v: r.responsive)}))
+    |> rename(columns: {_value: "online"})
+
+data
+    |> map(fn: (r) => ({r with online: bool(v: r.online)}))
 ```
+
+{{< expand-wrapper >}}
+{{% expand "View input and output" %}}
+{{< flex >}}
+{{% flex-content %}}
+
+##### Input data
+| _time                | tag | online |
+| :------------------- | :-- | -----: |
+| 2021-01-01T00:00:00Z | t1  |      1 |
+| 2021-01-01T00:00:10Z | t1  |      1 |
+| 2021-01-01T00:00:20Z | t1  |      0 |
+| 2021-01-01T00:00:30Z | t1  |      1 |
+| 2021-01-01T00:00:40Z | t1  |      0 |
+| 2021-01-01T00:00:50Z | t1  |      0 |
+
+| _time                | tag | online |
+| :------------------- | :-- | -----: |
+| 2021-01-01T00:00:00Z | t2  |      0 |
+| 2021-01-01T00:00:10Z | t2  |      1 |
+| 2021-01-01T00:00:20Z | t2  |      0 |
+| 2021-01-01T00:00:30Z | t2  |      1 |
+| 2021-01-01T00:00:40Z | t2  |      1 |
+| 2021-01-01T00:00:50Z | t2  |      0 |
+
+{{% /flex-content %}}
+{{% flex-content %}}
+
+##### Output data
+| _time                | tag | online |
+| :------------------- | :-- | -----: |
+| 2021-01-01T00:00:00Z | t1  |   true |
+| 2021-01-01T00:00:10Z | t1  |   true |
+| 2021-01-01T00:00:20Z | t1  |  false |
+| 2021-01-01T00:00:30Z | t1  |   true |
+| 2021-01-01T00:00:40Z | t1  |  false |
+| 2021-01-01T00:00:50Z | t1  |  false |
+
+| _time                | tag | online |
+| :------------------- | :-- | -----: |
+| 2021-01-01T00:00:00Z | t2  |  false |
+| 2021-01-01T00:00:10Z | t2  |   true |
+| 2021-01-01T00:00:20Z | t2  |  false |
+| 2021-01-01T00:00:30Z | t2  |   true |
+| 2021-01-01T00:00:40Z | t2  |   true |
+| 2021-01-01T00:00:50Z | t2  |  false |
+{{% /flex-content %}}
+{{< /flex >}}
+{{% /expand %}}
+{{< /expand-wrapper >}}

content/flux/v0.x/stdlib/universe/tobool.md

@@ -25,9 +25,8 @@ toBool()
 ```
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `bool()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/bool/#convert-a-numeric-column-to-a-boolean-column).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ##### Supported data types

content/flux/v0.x/stdlib/universe/tofloat.md

@@ -25,9 +25,8 @@ toFloat()
 ```
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `float()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/float/#convert-all-values-in-a-column-to-float-values).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ##### Supported data types

content/flux/v0.x/stdlib/universe/toint.md

@@ -45,9 +45,8 @@ toInt()
 | uint         | Integer equivalent of the unsigned integer      |
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `int()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/int/#convert-all-values-in-a-column-to-integer-values).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ## Parameters

content/flux/v0.x/stdlib/universe/tostring.md

@@ -22,9 +22,8 @@ toString()
 ```
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `string()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/string/#convert-all-values-in-a-column-to-string-values).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ##### Supported data types

content/flux/v0.x/stdlib/universe/totime.md

@@ -25,9 +25,8 @@ toTime()
 ```
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `time()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/time/#convert-all-values-in-a-column-to-time-values).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ##### Supported data types

content/flux/v0.x/stdlib/universe/touint.md

@@ -25,9 +25,8 @@ toUInt()
 ```
 
 {{% note %}}
-To convert values in a column other than `_value`, define a custom function
+To convert values in a column other than `_value`, use `map()` and `uint()`
-patterned after the [function definition](#function-definition),
+as shown in [this example](/flux/v0.x/stdlib/universe/uint/#convert-all-values-in-a-column-to-uinteger-values).
-but replace `_value` with your desired column.
 {{% /note %}}
 
 ##### Supported data types

content/influxdb/cloud/api-guide/_index.md

@@ -25,3 +25,5 @@ that work with InfluxDB 1.x client libraries and third-party integrations like
 [Grafana](https://grafana.com) and others.
 
 <a class="btn" href="/influxdb/cloud/api/v1-compatibility/">View full v1 compatibility API documentation</a>
+
+{{< influxdbu title="Building IoT Appls with InfluxDB" summary="Learn the basics of how to build an IoT application with InfluxDB with this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/building-iot-apps-with-influxdb-tutorial/" >}}

content/influxdb/cloud/get-started.md

@@ -30,12 +30,12 @@ After you've [signed up for InfluxDB Cloud](/influxdb/cloud/sign-up/), you're re
 
 ## Write and query data using the programming language of your choice
 
-Follow the steps to write data, execute a simple query, and execute a sample query in the selected programming language:
+Follow the steps to write data and execute a simple query in the selected programming language:
 
 Click one of the following:
   - [Python](https://cloud2.influxdata.com/orgs/me/new-user-wizard/python)
   - [JavaScript/Node](https://cloud2.influxdata.com/orgs/me/new-user-wizard/nodejs)
-  - [Go](https://cloud2.influxdata.com/orgs/me/new-user-wizard/go) 
+  - [Go](https://cloud2.influxdata.com/orgs/me/new-user-wizard/go)
 
 
 ## Add sample data
@@ -145,3 +145,5 @@ After processing, send the downsampled data to a new bucket to store and view it
 3. Enter a name for your bucket and click **Create**.
 4. Click **Run** from the **Preview** dropdown list to run the notebook and write to the output bucket a single time.
 5. To write continuously, click **Export as Task** in the upper right corner of the **Output to Bucket** cell. For details about working with tasks, see [Manage tasks](/influxdb/cloud/process-data/manage-tasks/).
+
+{{< influxdbu "influxdb-101" >}}

content/influxdb/cloud/organizations/users.md

@@ -24,7 +24,10 @@ By default, each user has full permissions on resources in your organization.
   - [Resend an invitation](#resend-an-invitation)
   - [Withdraw an invitation](#withdraw-an-invitation)
 - [Remove a user from your organization](#remove-a-user-from-your-organization)
-  - [Remove yourself from an organization](#remove-yourself-from-an-organization)
+
+{{% note %}}
+**Tip:** If you have multiple users, we recommend creating a system account for administrative purposes. For example, if you have applications writing to InfluxDB, ensure the applications use the system account credentials.
+{{% /note %}}
 
 ## Members page
 Manage your organization's users from your organization's **Members page**.
@@ -68,6 +71,10 @@ Accounts can have up to 50 pending invitations at one time.
 
 ## Remove a user from your organization
 
+{{% warn %}}
+For security purposes, once an InfluxDB user account is deleted, the user (and their token) cannot be reactivated.
+{{% /warn %}} 
+
 1.  Navigate to your organization's [Members page](#members-page).
 2.  Click the **{{< icon "delete" >}}** icon next to the user you want to remove.
 3.  Click **{{< caps >}}Remove user access{{< /caps >}}**.

content/influxdb/cloud/organizations/view-orgs.md

@@ -33,9 +33,11 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID.
 
 After logging in to the InfluxDB UI, your organization ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "03a2bbf46249a000" >}}
-https://cloud2.influxdata.com/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
+```sh
-</pre>
+https://cloud2.influxdata.com/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
 
 ### Organization ID in the CLI
 

content/influxdb/cloud/reference/regions.md

@@ -26,9 +26,12 @@ To find your cluster URL, [log in to your InfluxDB Cloud organization](https://c
 and review your organization URL. The first subdomain identifies your 
 InfluxDB Cloud cluster. For example:
 
-<pre class="highlight">
+{{< code-callout "us-west-2-1" >}}
-https://<span class="bp" style="font-weight:bold;margin:0 .15rem">us-west-2-1</span>.aws.cloud2.influxdata.com/orgs/03a2bbf46249a000/...
+```sh
-</pre>
+https://us-west-2-1.aws.cloud2.influxdata.com/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
+
 {{% /note %}}
 
 {{< cloud_regions >}}

content/influxdb/cloud/reference/release-notes/cloud-updates.md

@@ -14,6 +14,26 @@ aliases:
 InfluxDB Cloud updates occur frequently. Find a compilation of recent updates below.
 To find information about the latest Flux updates in InfluxDB Cloud, see [Flux release notes](/influxdb/cloud/reference/release-notes/flux/).
 
+## May 2022
+
+### Bulk delete API tokens
+Efficiently delete multiple tokens at once. For details, see [Delete a token using the InfluxDB API](/influxdb/v2.2/security/tokens/delete-token/#delete-a-token-using-the-influxdb-api).
+
+### Help bar
+Find relevant content easily from the Cloud UI using the help tab in left side panel.
+
+## April 2022
+
+### Query improvements in Data Explorer and notebooks
+
+It's now easier to use the visual builder to create queries in the Data Explorer and notebooks:
+- The builder requires you to select a measurement before you can select associated tags.
+- All measurements, fields, tags, and tag values appear in the builder, not just the ones in the currently specified time range. This update ensures that measurements, fields, and tags, are visible even if you set a very short time range.
+
+### Onboarding wizards for common programming languages
+
+During onboarding, choose the Python, JavaScript, or Go wizard to quickly get started writing data and executing simple queries. For details, see [Write and query data using the programming language of your choice](/influxdb/cloud/get-started/#write-and-query-data-using-the-programming-language-of-your-choice).
+
 ## March 2022
 
 ### Deep linking

content/influxdb/cloud/tools/grafana.md

@@ -14,200 +14,4 @@ related:
   - /influxdb/cloud/query-data/influxql/
 ---
 
-Use [Grafana](https://grafana.com/) or [Grafana Cloud](https://grafana.com/products/cloud/)
+{{< duplicate-oss >}}
-to visualize data from InfluxDB Cloud.
-
-{{% note %}}
-The instructions in this guide require **Grafana Cloud** or **Grafana v7.1+**.
-{{% /note %}}
-
-1. [Sign up for {{< cloud-name >}}](/influxdb/cloud/sign-up/).
-2. [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
-   [download and install Grafana](https://grafana.com/grafana/download).
-3. Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
-   [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
-   `http://localhost:3000` in your browser.
-4. In the left navigation of the Grafana UI, hover over the gear
-   icon to expand the **Configuration** section. Click **Data Sources**.
-5. Click **Add data source**.
-6. Select **InfluxDB** from the list of available data sources.
-7. On the **Data Source configuration page**, enter a **name** for your InfluxDB data source.
-8. Under **Query Language**, select one of the following:
-
-{{< tabs-wrapper >}}
-{{% tabs %}}
-[Flux](#)
-[InfluxQL](#)
-{{% /tabs %}}
-<!---------------------------- BEGIN FLUX CONTENT ---------------------------->
-{{% tab-content %}}
-
-## Configure Grafana to use Flux
-
-With **Flux** selected as the query language in your InfluxDB data source,
-configure your InfluxDB connection:
-
-1. Under **Connection**, enter the following:
-
-    - **URL**: Your [InfluxDB URL](/influxdb/cloud/reference/urls/).
-
-        ```sh
-        https://cloud2.influxdata.com
-        ```
-
-    - **Organization**: Your InfluxDB [organization name **or** ID](/influxdb/cloud/organizations/view-orgs/).
-    - **Token**: Your InfluxDB [API token](/influxdb/cloud/security/tokens/).
-    - **Default Bucket**: The default [bucket](/influxdb/cloud/organizations/buckets/) to use in Flux queries.
-    - **Min time interval**: The [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
-
-2. Click **Save & Test**. Grafana attempts to connect to the InfluxDB datasource
-   and returns the results of the test.
-
-{{< img-hd src="/img/influxdb/cloud-tools-grafana.png" />}}
-
-{{% /tab-content %}}
-<!----------------------------- END FLUX CONTENT ----------------------------->
-<!-------------------------- BEGIN INFLUXQL CONTENT -------------------------->
-{{% tab-content %}}
-
-## Configure Grafana to use InfluxQL
-To query InfluxDB Cloud from Grafana using InfluxQL:
-
-1. [Download and set up the `influx` CLI](#download-and-set-up-the-influx-cli)
-2. [Create an InfluxDB DBRP mapping](#create-an-influxdb-dbrp-mapping)
-3. [Configure your InfluxDB connection](#configure-your-influxdb-connection)
-
-### Download and set up the influx CLI
-1. [Download the latest version of the `influx` CLI](/influxdb/cloud/sign-up/#optional-download-install-and-use-the-influx-cli)
-   appropriate for your local operating system.
-2. Create a CLI configuration that provides the required InfluxDB Cloud **host**,
-   **organization**, and **API token** to all CLI commands.
-   Use the [`influx config create` command](/influxdb/cloud/reference/cli/influx/config/create/)
-   and provide the following:
-
-   - [InfluxDB Cloud URL](/influxdb/cloud/reference/regions/)
-   - [organization name](/influxdb/cloud/organizations/) _(by default, your email address)_
-   - [API token](/influxdb/cloud/security/tokens/)
-
-    ```sh
-    influx config create \
-      --config-name example-config-name \
-      --host-url https://cloud2.influxdata.com \
-      --org example-org \
-      --token My5uP3rSeCr37t0k3n
-    ```
-
-    For more information about `influx` CLI configurations,
-    see [`influx config`](/influxdb/cloud/reference/cli/influx/config/).
-
-### Create an InfluxDB DBRP mapping
-When using InfluxQL to query InfluxDB Cloud, the query must specify a database and a retention policy.
-Use the [`influx v1 dbrp create` command](/influxdb/cloud/reference/cli/influx/v1/dbrp/create/)
-command to create a database/retention policy (DBRP) mapping that associates a database
-and retention policy combination with an InfluxDB Cloud [bucket](/influxdb/cloud/reference/glossary/#bucket).
-
-DBRP mappings do not affect the retention period of the target bucket.
-These mappings allow queries following InfluxDB 1.x conventions to successfully
-query InfluxDB Cloud buckets.
-
-{{% note %}}
-##### Automatically create DBRP mappings on write
-When using the InfluxDB 1.x compatibility API to write data to InfluxDB Cloud,
-InfluxDB Cloud automatically creates DBRP mappings for buckets whose names match the
-`db/rp` naming pattern of the database and retention policy specified in the write request.
-For more information, see [Database and retention policy mapping – Writing data](/influxdb/cloud/reference/api/influxdb-1x/dbrp/#when-writing-data).
-{{% /note %}}
-
-Provide the following:
-
-- database name
-- retention policy name _(not retention period)_
-- [bucket ID](/influxdb/cloud/organizations/buckets/view-buckets/)
-- _(optional)_ `--default` flag if you want the retention policy to be the default retention
-  policy for the specified database
-
-#### Examples
-
-{{< code-tabs-wrapper >}}
-{{% code-tabs %}}
-[DB with one RP](#)
-[DB with multiple RPs](#)
-{{% /code-tabs %}}
-{{< code-tab-content >}}
-```sh
-influx v1 dbrp create \
-  --db example-db \
-  --rp example-rp \
-  --bucket-id 00xX00o0X001 \
-  --default
-```
-{{< /code-tab-content >}}
-{{< code-tab-content >}}
-```sh
-# Create telegraf/autogen DBRP mapping with autogen
-# as the default RP for the telegraf DB
-
-influx v1 dbrp create \
-  --db telegraf \
-  --rp autogen \
-  --bucket-id 00xX00o0X001 \
-  --default
-
-# Create telegraf/downsampled-daily DBRP mapping that
-# writes to a different bucket
-
-influx v1 dbrp create \
-  --db telegraf \
-  --rp downsampled-daily \
-  --bucket-id 00xX00o0X002
-```
-{{< /code-tab-content >}}
-{{< /code-tabs-wrapper >}}
-
-_For more information about DBRP mapping, see [Database and retention policy mapping](/influxdb/cloud/reference/api/influxdb-1x/dbrp/)._
-
-### Configure your InfluxDB connection
-With **InfluxQL** selected as the query language in your InfluxDB data source settings:
-
-1. Under **HTTP**, enter the following:
-
-    - **URL**: Your [InfluxDB Cloud URL](/influxdb/cloud/reference/regions/).
-
-        ```sh
-        https://cloud2.influxdata.com
-        ```
-    - **Access**: Server (default)
-
-2. Under **Custom HTTP Headers**, select **Add Header**. Provide your InfluxDB Cloud API token:
-
-    - **Header**: Enter `Authorization`
-    - **Value**: Use the `Token` schema and provide your [InfluxDB API token](/influxdb/v2.0/security/tokens/).
-      For example:
-
-      ```
-      Token y0uR5uP3rSecr3tT0k3n
-      ```
-
-2. Under **InfluxDB Details**, do the following:
-
-    - **Database**: Enter the database name [mapped to your InfluxDB Cloud bucket](#create-an-influxdb-dbrp-mapping)
-    - **User**: Leave empty
-    - **Password**: Leave empty
-    - **HTTP Method**: Select **GET**
-
-3. Click **Save & Test**. Grafana attempts to connect to the InfluxDB Cloud data source
-   and returns the results of the test.
-
-{{< img-hd src="/img/influxdb/cloud-tools-grafana-influxql.png" />}}
-
-{{% /tab-content %}}
-<!--------------------------- END INFLUXQL CONTENT --------------------------->
-{{< /tabs-wrapper >}}
-
-## Query and visualize data
-
-With your InfluxDB connection configured, use Grafana and Flux to query and
-visualize time series data stored in **{{< cloud-name >}}**.
-
-For more information about using Grafana, see the [Grafana documentation](https://grafana.com/docs/).
-If you're just learning Flux, see [Get started with Flux](/{{< latest "flux" >}}/get-started/).

content/influxdb/cloud/visualize-data/dashboards/_index.md

@@ -22,9 +22,11 @@ Use the InfluxDB UI or `influx` CLI to view your dashboard ID.
 
 When viewing a dashboard in the InfluxDB UI, your dashboard ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "04b6b15034cc000" >}}
-https://cloud2.influxdata.com/orgs/03a2bbf46249a000/dashboards/<span class="bp" style="font-weight:bold;margin:0 .15rem">04b6b15034cc000</span>/...
+```sh
-</pre>
+https://cloud2.influxdata.com/orgs/03a2bbf46249a000/dashboards/04b6b15034cc000/...
+```
+{{< /code-callout >}}
 
 ### Dashboard ID in the CLI
 Use [`influx dashboards`](/influxdb/cloud/reference/cli/influx/dashboards/) to view a list of dashboards and IDs.

content/influxdb/cloud/write-data/no-code/use-telegraf/_index.md

@@ -36,3 +36,5 @@ Telegraf input and output plugins are enabled and configured in Telegraf's confi
 You have the following options for configuring Telegraf:
 
 {{< children >}}
+
+{{< influxdbu "telegraf-102" >}}

content/influxdb/v2.0/organizations/view-orgs.md

@@ -41,9 +41,11 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID.
 
 After logging in to the InfluxDB UI, your organization ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "03a2bbf46249a000" >}}
-http://localhost:8086/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
 
 ### Organization ID in the CLI
 

content/influxdb/v2.0/reference/cli/influx/task/create.md

@@ -45,7 +45,7 @@ export FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.0/reference/cli/influx/task/update.md

@@ -50,7 +50,7 @@ export UPDATED_FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.0/visualize-data/dashboards/_index.md

@@ -22,9 +22,11 @@ Use the InfluxDB UI or `influx` CLI to view your dashboard ID.
 
 When viewing a dashboard in the InfluxDB UI, your dashboard ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "04b6b15034cc000" >}}
-http://localhost:8086/orgs/03a2bbf46249a000/dashboards/<span class="bp" style="font-weight:bold;margin:0 .15rem">04b6b15034cc000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/dashboards/04b6b15034cc000/...
+```
+{{< /code-callout >}}
 
 ### Dashboard ID in the CLI
 Use [`influx dashboards`](/influxdb/v2.0/reference/cli/influx/dashboards/) to view a list of dashboards and IDs.

content/influxdb/v2.1/organizations/view-orgs.md

@@ -41,9 +41,11 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID.
 
 After logging in to the InfluxDB UI, your organization ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "03a2bbf46249a000" >}}
-http://localhost:8086/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
 
 ### Organization ID in the CLI
 

content/influxdb/v2.1/reference/cli/influx/task/create.md

@@ -45,7 +45,7 @@ export FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.1/reference/cli/influx/task/update.md

@@ -50,7 +50,7 @@ export UPDATED_FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.1/visualize-data/dashboards/_index.md

@@ -22,9 +22,11 @@ Use the InfluxDB UI or `influx` CLI to view your dashboard ID.
 
 When viewing a dashboard in the InfluxDB UI, your dashboard ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "04b6b15034cc000" >}}
-http://localhost:8086/orgs/03a2bbf46249a000/dashboards/<span class="bp" style="font-weight:bold;margin:0 .15rem">04b6b15034cc000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/dashboards/04b6b15034cc000/...
+```
+{{< /code-callout >}}
 
 ### Dashboard ID in the CLI
 Use [`influx dashboards`](/influxdb/v2.1/reference/cli/influx/dashboards/) to view a list of dashboards and IDs.

content/influxdb/v2.2/get-started.md

@@ -57,3 +57,5 @@ See [Visualize data](/influxdb/v2.2/visualize-data/).
 
 Monitor your data and sends alerts based on specified logic.
 See [Monitor and alert](/influxdb/v2.2/monitor-alert/).
+
+{{< influxdbu "influxdb-101" >}}

content/influxdb/v2.2/organizations/view-orgs.md

@@ -41,9 +41,12 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID.
 
 After logging in to the InfluxDB UI, your organization ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "03a2bbf46249a000" >}}
-http://localhost:8086/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/...
+```
+{{< /code-callout >}}
+
 
 ### Organization ID in the CLI
 

content/influxdb/v2.2/query-data/optimize-queries.md

@@ -28,8 +28,8 @@ Once a non-pushdown function runs, Flux pulls data into memory and runs all
 subsequent operations there.
 
 #### Pushdown functions and function combinations
-Most pushdowns are supported when querying an InfluxDB {{< current-version >}} or InfluxDB Cloud data source.
+Most pushdowns are supported when querying an InfluxDB {{< current-version keep=true >}} or InfluxDB Cloud data source.
-As shown in the following table, a handful of pushdowns are not supported in InfluxDB {{< current-version >}}.
+As shown in the following table, a handful of pushdowns are not supported in InfluxDB {{< current-version keep=true >}}.
 
 | Functions                      | InfluxDB {{< current-version keep=true >}} |    InfluxDB Cloud    |
 | :----------------------------- | :----------------------------------------: | :------------------: |

content/influxdb/v2.2/reference/cli/influx/task/create.md

@@ -45,7 +45,7 @@ export FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.2/reference/cli/influx/task/update.md

@@ -50,7 +50,7 @@ export UPDATED_FLUX_TASK='
 
   from(bucket: "example-bucket")
     |> range(start: -task.every)
-    |> filter(fn: (r) => (r._measurement == "m")
+    |> filter(fn: (r) => r._measurement == "m")
     |> aggregateWindow(every: 1h, fn: mean)
     |> to(bucket: "default-ds-1d", org: "my-org")
 '

content/influxdb/v2.2/tools/grafana.md

@@ -16,10 +16,10 @@ related:
 ---
 
 Use [Grafana](https://grafana.com/) or [Grafana Cloud](https://grafana.com/products/cloud/)
-to visualize data from your **InfluxDB** instance.
+to visualize data from your **InfluxDB {{< current-version >}}** instance.
 
 {{% note %}}
-The instructions in this guide require **Grafana Cloud** or **Grafana v7.1+**.
+The instructions in this guide require **Grafana Cloud** or **Grafana v8.0+**.
 {{% /note %}}
 
 1. [Start InfluxDB OSS {{< current-version >}}](/influxdb/v2.2/install/#start-influxdb).
@@ -46,23 +46,39 @@ The instructions in this guide require **Grafana Cloud** or **Grafana v7.1+**.
 With **Flux** selected as the query language in your InfluxDB data source,
 configure your InfluxDB connection:
 
-1. Under **Connection**, enter the following:
+1.  Under **HTTP**, enter the following:
 
-    - **URL**: Your [InfluxDB URL](/influxdb/v2.2/reference/urls/).
+    - **URL**: Your
+      {{% oss-only %}}[InfluxDB URL](/influxdb/v2.2/reference/urls/).{{% /oss-only %}}
+      {{% cloud-only %}}[InfluxDB Cloud region URL](/influxdb/v2.2/reference/regions/).{{% /cloud-only %}}
 
         ```sh
         http://localhost:8086/
         ```
+    
+    - **Access**: Server (default)
+
+2.  Under **InfluxDB Details**, enter the following:
 
     - **Organization**: Your InfluxDB [organization name **or** ID](/influxdb/v2.2/organizations/view-orgs/).
     - **Token**: Your InfluxDB [API token](/influxdb/v2.2/security/tokens/).
     - **Default Bucket**: The default [bucket](/influxdb/v2.2/organizations/buckets/) to use in Flux queries.
     - **Min time interval**: The [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
+      Default is `10s`
+    - **Max series**: The maximum number of series or tables Grafana will process.
+      Default is `1000`.
 
-    {{< img-hd src="/img/influxdb/2-0-tools-grafana.png" />}}
+3.  Click **Save & Test**. Grafana attempts to connect to the InfluxDB {{< current-version >}}
+    datasource and returns the results of the test.
+
+{{% cloud-only %}}
+  {{< img-hd src="/img/influxdb/cloud-tools-grafana.png" alt="Use Grafana with InfluxDB Cloud and Flux" />}}
+{{% /cloud-only %}}
+
+{{< oss-only >}}
+  {{< img-hd src="/img/influxdb/2-2-tools-grafana.png" alt="Use Grafana with InfluxDB and Flux" />}}
+{{< /oss-only >}}
 
-2. Click **Save & Test**. Grafana attempts to connect to the InfluxDB {{< current-version >}} datasource
-   and returns the results of the test.
 {{% /tab-content %}}
 <!----------------------------- END FLUX CONTENT ----------------------------->
 <!-------------------------- BEGIN INFLUXQL CONTENT -------------------------->
@@ -70,7 +86,13 @@ configure your InfluxDB connection:
 
 ## Configure Grafana to use InfluxQL
 
-To query InfluxDB OSS {{< current-version >}} with InfluxQL, find your use case below, and then complete the instructions to configure Grafana:
+<!---------------------------------------------------------------------------->
+<!------------------------- BEGIN OSS InfluxQL setup ------------------------->
+<!---------------------------------------------------------------------------->
+{{% oss-only %}}
+
+To query InfluxDB {{< current-version >}} with InfluxQL, find your use case below,
+and then complete the instructions to configure Grafana:
 
 - [Installed a new InfluxDB {{< current-version >}} instance](#installed-a-new-influxdb-instance)
 - [Upgraded from InfluxDB 1.x to {{< current-version >}} (following the official upgrade)](#upgraded-from-influxdb-1x-to-2x)
@@ -103,7 +125,7 @@ To configure Grafana to use InfluxQL when you've manually migrated from InfluxDB
 {{< expand-wrapper >}}
 {{% expand "View and create InfluxDB v1 authorizations" %}}
 
-InfluxDB OSS {{< current-version >}} provides a 1.x compatible authentication API that lets you
+InfluxDB {{< current-version >}} provides a 1.x compatible authentication API that lets you
 authenticate with a username and password like InfluxDB 1.x
 _(separate from the credentials used to log into the InfluxDB user interface)_.
 
@@ -161,14 +183,6 @@ Provide the following:
 - _(optional)_ `--default` flag if you want the retention policy to be the default retention
   policy for the specified database
 
-#### Examples
-
-{{< code-tabs-wrapper >}}
-{{% code-tabs %}}
-[DB with one RP](#)
-[DB with multiple RPs](#)
-{{% /code-tabs %}}
-{{< code-tab-content >}}
 ```sh
 influx v1 dbrp create \
   --db example-db \
@@ -176,33 +190,109 @@ influx v1 dbrp create \
   --bucket-id 00xX00o0X001 \
   --default
 ```
-{{< /code-tab-content >}}
-{{< code-tab-content >}}
-```sh
-# Create telegraf/autogen DBRP mapping with autogen
-# as the default RP for the telegraf DB
 
-influx v1 dbrp create \
+{{% note %}}
-  --db telegraf \
+#### Repeat for each DBRP combination
-  --rp autogen \
+Each unique database and retention policy combination used by Grafana must be
-  --bucket-id 00xX00o0X001 \
+mapped to an InfluxDB {{< current-version >}} bucket.
-  --default
+If you have multiple retention policies for a single bucket, set one of the the
-
+retention polices as the default using the `--default` flag.
-# Create telegraf/downsampled-daily DBRP mapping that
+{{% /note %}}
-# writes to a different bucket
-
-influx v1 dbrp create \
-  --db telegraf \
-  --rp downsampled-daily \
-  --bucket-id 00xX00o0X002
-```
-{{< /code-tab-content >}}
-{{< /code-tabs-wrapper >}}
 
 _For more information about DBRP mapping, see [Database and retention policy mapping](/influxdb/v2.2/reference/api/influxdb-1x/dbrp/)._
+
 {{< /expand >}}
 {{< /expand-wrapper >}}
 
+{{% /oss-only %}}
+<!---------------------------------------------------------------------------->
+<!-------------------------- END OSS InfluxQL setup -------------------------->
+<!---------------------------------------------------------------------------->
+
+<!---------------------------------------------------------------------------->
+<!------------------------ BEGIN Cloud InfluxQL setup ------------------------>
+<!---------------------------------------------------------------------------->
+{{% cloud-only el="div" %}}
+
+To query InfluxDB Cloud from Grafana using InfluxQL:
+
+1. [Download and set up the `influx` CLI](#download-and-set-up-the-influx-cli)
+2. [Create an InfluxDB DBRP mapping](#create-an-influxdb-dbrp-mapping)
+3. [Configure your InfluxDB connection](#configure-your-influxdb-connection)
+
+### Download and set up the influx CLI
+1. [Download the latest version of the `influx` CLI](/influxdb/cloud/sign-up/#optional-download-install-and-use-the-influx-cli)
+   appropriate for your local operating system.
+2. Create a CLI configuration that provides the required InfluxDB Cloud **host**,
+   **organization**, and **API token** to all CLI commands.
+   Use the [`influx config create` command](/influxdb/cloud/reference/cli/influx/config/create/)
+   and provide the following:
+
+   - [InfluxDB Cloud URL](/influxdb/cloud/reference/regions/)
+   - [organization name](/influxdb/cloud/organizations/) _(by default, your email address)_
+   - [API token](/influxdb/cloud/security/tokens/)
+
+    ```sh
+    influx config create \
+      --config-name example-config-name \
+      --host-url https://cloud2.influxdata.com \
+      --org example-org \
+      --token My5uP3rSeCr37t0k3n
+    ```
+
+    For more information about `influx` CLI configurations,
+    see [`influx config`](/influxdb/cloud/reference/cli/influx/config/).
+
+### Create an InfluxDB DBRP mapping
+When using InfluxQL to query InfluxDB Cloud, the query must specify a database and a retention policy.
+Use the [`influx v1 dbrp create` command](/influxdb/cloud/reference/cli/influx/v1/dbrp/create/)
+command to create a database/retention policy (DBRP) mapping that associates a database
+and retention policy combination with an InfluxDB Cloud [bucket](/influxdb/cloud/reference/glossary/#bucket).
+
+DBRP mappings do not affect the retention period of the target bucket.
+These mappings allow queries following InfluxDB 1.x conventions to successfully
+query InfluxDB Cloud buckets.
+
+{{% note %}}
+##### Automatically create DBRP mappings on write
+When using the InfluxDB 1.x compatibility API to write data to InfluxDB Cloud,
+InfluxDB Cloud automatically creates DBRP mappings for buckets whose names match the
+`db/rp` naming pattern of the database and retention policy specified in the write request.
+For more information, see [Database and retention policy mapping – Writing data](/influxdb/cloud/reference/api/influxdb-1x/dbrp/#when-writing-data).
+{{% /note %}}
+
+Provide the following:
+
+- database name
+- [retention policy](/influxdb/v1.8/concepts/glossary/#retention-policy-rp) name _(not retention period)_
+- [bucket ID](/influxdb/cloud/organizations/buckets/view-buckets/)
+- _(optional)_ `--default` flag if you want the retention policy to be the default retention
+  policy for the specified database
+
+```sh
+influx v1 dbrp create \
+  --db example-db \
+  --rp example-rp \
+  --bucket-id 00xX00o0X001 \
+  --default
+```
+
+{{% note %}}
+#### Repeat for each DBRP combination
+Each unique database and retention policy combination used by Grafana must be
+mapped to an InfluxDB {{< current-version >}} bucket.
+If you have multiple retention policies for a single bucket, set one of the the
+retention polices as the default using the `--default` flag.
+{{% /note %}}
+
+_For more information about DBRP mapping, see [Database and retention policy mapping](/influxdb/cloud/reference/api/influxdb-1x/dbrp/)._
+
+{{% /cloud-only %}}
+<!---------------------------------------------------------------------------->
+<!------------------------- END Cloud InfluxQL setup ------------------------->
+<!---------------------------------------------------------------------------->
+
+
 ### Configure your InfluxDB connection
 With **InfluxQL** selected as the query language in your InfluxDB data source settings:
 
@@ -219,15 +309,20 @@ With **InfluxQL** selected as the query language in your InfluxDB data source se
 
     - ##### Token authentication
 
-        Under **Custom HTTP Headers**, select **Add Header**. Provide your InfluxDB API token:
+        - Under **Custom HTTP Headers**, select **{{< icon "plus" >}}Add Header**. Provide your InfluxDB API token:
 
-        - **Header**: Enter `Authorization`
+          - **Header**: Enter `Authorization`
-        - **Value**: Use the `Token` schema and provide your [InfluxDB API token](/influxdb/v2.2/security/tokens/).
+          - **Value**: Use the `Token` schema and provide your [InfluxDB API token](/influxdb/v2.2/security/tokens/).
-          For example:
+            For example:
 
-          ```
+            ```
-          Token y0uR5uP3rSecr3tT0k3n
+            Token y0uR5uP3rSecr3tT0k3n
-          ```
+            ```
+        
+        - Under **InfluxDB Details**, do the following:
+
+          - **Database**: Enter the database name [mapped to your InfluxDB {{< current-version >}} bucket](#view-and-create-influxdb-dbrp-mappings)
+          - **HTTP Method**: Select **GET**
 
     - ##### Authenticate with username and password
 
@@ -238,11 +333,17 @@ With **InfluxQL** selected as the query language in your InfluxDB data source se
         - **Password**: Enter the password associated with your [InfluxDB 1.x compatibility authorization](#view-and-create-influxdb-dbrp-mappings)
         - **HTTP Method**: Select **GET**
 
-        <!--  -->
-        {{< img-hd src="/img/influxdb/2-0-tools-grafana-influxql.png" />}}
-
 3. Click **Save & Test**. Grafana attempts to connect to the InfluxDB {{< current-version >}} data source
    and returns the results of the test.
+
+{{% cloud-only %}}
+  {{< img-hd src="/img/influxdb/cloud-tools-grafana-influxql.png" alt="Use Grafana with InfluxDB Cloud and Flux" />}}
+{{% /cloud-only %}}
+
+{{< oss-only >}}
+  {{< img-hd src="/img/influxdb/2-2-tools-grafana-influxql.png" alt="Use Grafana with InfluxDB and Flux" />}}
+{{< /oss-only >}}
+
 {{% /tab-content %}}
 <!--------------------------- END INFLUXQL CONTENT --------------------------->
 {{< /tabs-wrapper >}}

content/influxdb/v2.2/visualize-data/dashboards/_index.md

@@ -22,9 +22,11 @@ Use the InfluxDB UI or `influx` CLI to view your dashboard ID.
 
 When viewing a dashboard in the InfluxDB UI, your dashboard ID appears in the URL.
 
-<pre class="highlight">
+{{< code-callout "04b6b15034cc000" >}}
-http://localhost:8086/orgs/03a2bbf46249a000/dashboards/<span class="bp" style="font-weight:bold;margin:0 .15rem">04b6b15034cc000</span>/...
+```sh
-</pre>
+http://localhost:8086/orgs/03a2bbf46249a000/dashboards/04b6b15034cc000/...
+```
+{{< /code-callout >}}
 
 ### Dashboard ID in the CLI
 Use [`influx dashboards`](/influxdb/v2.2/reference/cli/influx/dashboards/) to view a list of dashboards and IDs.

content/influxdb/v2.2/write-data/no-code/use-telegraf/_index.md

@@ -34,3 +34,5 @@ Telegraf input and output plugins are enabled and configured in Telegraf's confi
 You have the following options for configuring Telegraf:
 
 {{< children >}}
+
+{{< influxdbu "telegraf-102" >}}

content/kapacitor/v1.6/administration/configuration.md

@@ -1063,3 +1063,5 @@ curl --request POST 'http://localhost:9092/kapacitor/v1/config/smtp' \
 
 For detailed information about how to override configurations with the Kapacitor API, see
 [Overriding configurations](/kapacitor/v1.6/working/api/#overriding-configurations).
+
+{{< influxdbu title="Configuring Kapacitor" summary="Learn how to dynamically configure Kapacitor via API with this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/configuring-kapacitor-tutorial/" >}}

content/kapacitor/v1.6/guides/event-handler-setup.md

@@ -439,3 +439,5 @@ stream
 ```
 
 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`.
+
+{{< influxdbu title="Event Handlers & Node Alerts in Kapacitor" summary="Get started with Kapacitor Topics and Event Handlers with this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/event-handlers-node-alerts-kapacitor-tutorial/" >}}

content/kapacitor/v1.6/guides/socket_udf.md

@@ -655,3 +655,5 @@ If you want to learn more, here are a few places to start:
 * Change the mirror UDF to work on batches instead of streams.
 	This requires changing the edge type in the `Info` method as well as implementing the `BeginBatch` and `EndBatch` methods.
 * Take a look at the other [examples](https://github.com/influxdata/kapacitor/tree/master/udf/agent/examples) and modify one to do something similar to one of your existing requirements.
+
+{{< influxdbu title="User Defined Functions in Kapacitor" summary="Learn how to create User Defined Functions and Tasks with Kapacitor in this **free** InfluxDB University course" action="Take the course." link="https://university.influxdata.com/courses/user-defined-functions-in-kapacitor-tutorial/" >}}

content/kapacitor/v1.6/working/template_tasks.md

@@ -430,3 +430,5 @@ kapacitor define mem_alert -file implicit_mem_template_task.yaml
 the `dbrps` field must **not** appear in the task definition file, e.g. in `implicit_mem_template_task.yaml`.
 Doing so will will cause an error.
 {{% /note %}}
+
+{{< influxdbu title="User Defined Functions in Kapacitor" summary="Learn how to create User Defined Functions and Tasks with Kapacitor in this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/user-defined-functions-in-kapacitor-tutorial/" >}}

content/kapacitor/v1.6/working/using_alert_topics.md

@@ -234,3 +234,4 @@ Now update the handler and only alerts that changed state will be sent to Slack.
 ```
 kapacitor define-topic-handler ./slack.yaml
 ```
+{{< influxdbu title="Event Handlers & Node Alerts in Kapacitor" summary="Get started with Kapacitor Topics and Event Handlers with this **free** InfluxDB University course." action="Take the course" link="https://university.influxdata.com/courses/event-handlers-node-alerts-kapacitor-tutorial/" >}}

content/telegraf/v1.22/_index.md

@@ -17,3 +17,7 @@ Written in Go, Telegraf compiles into a single binary with no external dependenc
 For an introduction to Telegraf and an overview of how it works, watch the following video:
 
 {{< youtube vGJeo3FaMds >}}
+
+{{< influxdbu title="Telegraf Basics" summary="Learn how to get started with Telegraf with this **free** course that covers common use cases, proper configuration, and best practices for deployment. Also, discover how to write your own custom Telegraf plugins." action="Take the course" link="https://university.influxdata.com/courses/telegraf-basics-tutorial/" >}}
+
+{{< influxdbu "telegraf-102" >}}

layouts/shortcodes/code-callout.html

@@ -0,0 +1,4 @@
+{{- $regex := .Get 0 -}}
+{{- $code := .Inner | markdownify -}}
+{{- $codeCallout := replaceRE $regex "<span class='bp' style='font-weight:bold;margin:0 .15rem'>$0</span>" $code -}}
+{{ $codeCallout | safeHTML }}

layouts/shortcodes/latest-patch.html

@@ -5,9 +5,11 @@
 {{- $parsedVersion := replaceRE "v" "" (index $productPathData 1) -}}
 {{- $productArg := .Get "product" | default "" -}}
 {{- $versionArg := .Get "version" | default "" -}}
+{{- $minorVersionOffset := .Get "minorVersionOffset" | default 0 -}}
 {{- $product := cond (gt (len $productArg) 0) $productArg $parsedProduct -}}
 {{- $latestVersion := replaceRE "v" "" (index (index .Site.Data.products $product) "latest") -}}
-{{- $version := cond (gt (len $versionArg) 0) $versionArg (cond (ne $product $parsedProduct) $latestVersion $parsedVersion) -}}
+{{- $versionNoOffset := cond (gt (len $versionArg) 0) $versionArg (cond (ne $product $parsedProduct) $latestVersion $parsedVersion) -}}
+{{- $version := replaceRE `\d+$` (add (int (index (findRE `\d+$` $versionNoOffset) 0)) $minorVersionOffset) $versionNoOffset  -}}
 {{- $patchVersions := index (index .Site.Data.products $product) "latest_patches" -}}
 {{- $cliVersions := index .Site.Data.products.influxdb "latest_cli" -}}
 {{- if $cli }}

layouts/shortcodes/telegraf/plugins.html

@@ -24,9 +24,7 @@
       <div class="info">
         <h3 id="{{ $type }}-{{ .id }}">{{ .name }}</h3>
         {{ if in .tags "external"}}
-          <a class="external" href="{{ $externalPluginLink }}">External
+          <a class="external" href="{{ $externalPluginLink }}">External</a>
-            
-          </a>
         {{ end }}
         <p class="meta">
           Plugin ID: <code>{{ $type }}s.{{ .id }}</code><br/>