diff --git a/api-docs/v2.0/swagger.yml b/api-docs/v2.0/swagger.yml index 1040354f1..e9d41a13f 100644 --- a/api-docs/v2.0/swagger.yml +++ b/api-docs/v2.0/swagger.yml @@ -4361,7 +4361,7 @@ paths: $ref: "#/components/schemas/Error" /packages/stacks: post: - operationId: CreatePkg + operationId: CreateStack tags: - InfluxPackages summary: Create a new Influx package @@ -6351,6 +6351,10 @@ components: - flux dialect: $ref: "#/components/schemas/Dialect" + now: + description: Specifies the time that should be reported as "now" in the query. Default is the server's now time. + type: string + format: date-time InfluxQLQuery: description: Query influx using the InfluxQL language type: object @@ -7209,6 +7213,8 @@ components: type: boolean orgID: type: string + stackID: + type: string package: $ref: "#/components/schemas/Pkg" packages: @@ -7316,6 +7322,8 @@ components: type: string orgID: type: string + pkgName: + type: string name: type: string description: @@ -7333,6 +7341,8 @@ components: - $ref: "#/components/schemas/CheckDiscriminator" - type: object properties: + pkgName: + type: string labelAssociations: type: array items: @@ -7392,6 +7402,8 @@ components: - $ref: "#/components/schemas/NotificationEndpointDiscrimator" - type: object properties: + pkgName: + type: string labelAssociations: type: array items: @@ -7480,6 +7492,8 @@ components: items: type: object properties: + pkgName: + type: string id: type: string orgID: @@ -7502,13 +7516,17 @@ components: items: type: object properties: + remove: + type: boolean id: type: string - name: + pkgName: type: string new: type: object properties: + name: + type: string description: type: string retentionRules: @@ -7516,6 +7534,8 @@ components: old: type: object properties: + name: + type: string description: type: string retentionRules: @@ -7525,9 +7545,11 @@ components: items: type: object properties: + remove: + type: boolean id: type: string - name: + pkgName: type: string new: $ref: "#/components/schemas/CheckDiscriminator" @@ -7538,26 +7560,50 @@ components: items: type: object properties: - name: + remove: + type: boolean + id: type: string - description: + pkgName: type: string - charts: - type: array - items: - $ref: "#/components/schemas/PkgChart" + new: + type: object + properties: + name: + type: string + description: + type: string + charts: + type: array + items: + $ref: "#/components/schemas/PkgChart" + old: + type: object + properties: + name: + type: string + description: + type: string + charts: + type: array + items: + $ref: "#/components/schemas/PkgChart" labels: type: array items: type: object properties: + remove: + type: boolean id: type: string - name: + pkgName: type: string new: type: object properties: + name: + type: string color: type: string description: @@ -7565,6 +7611,8 @@ components: old: type: object properties: + name: + type: string color: type: string description: @@ -7591,9 +7639,11 @@ components: items: type: object properties: + remove: + type: boolean id: type: string - name: + pkgName: type: string new: $ref: "#/components/schemas/NotificationEndpointDiscrimator" @@ -7604,79 +7654,170 @@ components: items: type: object properties: - name: + remove: + type: boolean + id: type: string - description: + pkgName: type: string - endpointName: - type: string - endpointID: - type: string - endpointType: - type: string - every: - type: string - offset: - type: string - messageTemplate: - type: string - status: - type: string - statusRules: - type: array - items: - type: object - properties: - currentLevel: + new: + type: object + properties: + name: type: string - previousLevel: + description: type: string - tagRules: - type: array - items: - type: object - properties: - key: + endpointName: type: string - value: + endpointID: type: string - operator: + endpointType: type: string + every: + type: string + offset: + type: string + messageTemplate: + type: string + status: + type: string + statusRules: + type: array + items: + type: object + properties: + currentLevel: + type: string + previousLevel: + type: string + tagRules: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + operator: + type: string + old: + type: object + properties: + name: + type: string + description: + type: string + endpointName: + type: string + endpointID: + type: string + endpointType: + type: string + every: + type: string + offset: + type: string + messageTemplate: + type: string + status: + type: string + statusRules: + type: array + items: + type: object + properties: + currentLevel: + type: string + previousLevel: + type: string + tagRules: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + operator: + type: string tasks: type: array items: type: object properties: - name: + remove: + type: boolean + id: type: string - cron: - type: string - description: - type: string - every: - type: string - offset: - type: string - query: - type: string - status: + pkgName: type: string + new: + type: object + properties: + name: + type: string + cron: + type: string + description: + type: string + every: + type: string + offset: + type: string + query: + type: string + status: + type: string + old: + type: object + properties: + name: + type: string + cron: + type: string + description: + type: string + every: + type: string + offset: + type: string + query: + type: string + status: + type: string telegrafConfigs: type: array items: - $ref: "#/components/schemas/TelegrafRequest" + type: object + properties: + remove: + type: boolean + id: + type: string + pkgName: + type: string + new: + $ref: "#/components/schemas/TelegrafRequest" + old: + $ref: "#/components/schemas/TelegrafRequest" variables: type: array items: type: object properties: + remove: + type: boolean id: type: string - name: + pkgName: type: string new: type: object properties: + name: + type: string description: type: string args: @@ -7684,6 +7825,8 @@ components: old: type: object properties: + name: + type: string description: type: string args: @@ -7712,6 +7855,8 @@ components: type: string orgID: type: string + pkgName: + type: string name: type: string description: @@ -8838,7 +8983,7 @@ components: description: Colors define color encoding of data into a visualization type: array items: - type: string + $ref: "#/components/schemas/DashboardColor" Axes: description: The viewport for a View's visualizations type: object diff --git a/assets/styles/layouts/_inline-icons.scss b/assets/styles/layouts/_inline-icons.scss index c1ec8efb5..e4b45a293 100644 --- a/assets/styles/layouts/_inline-icons.scss +++ b/assets/styles/layouts/_inline-icons.scss @@ -48,24 +48,162 @@ } } - .nav-icon { - background: linear-gradient(to right, #00A3FF, #BE2EE4); - font-family: $rubik; + .nav-item { display: inline-block; - padding: 1rem 1.1rem; - border-radius: 0 5px 5px 0; - font-size: 1.05rem; - margin-bottom: 1rem; + position: relative; + vertical-align: top; + margin-bottom: 1.25rem; - .icon { - font-size: 1.65rem; - vertical-align: middle; + &:after { + content: ""; + position: absolute; + top: 0; + left: 0; + width: 2px; + height: 100%; + background: #be2ee4; + background: linear-gradient(180deg,#be2ee4 0,#00a3ff); + } + + &:first-child { margin-right: 1.25rem; } - strong { - color: $g20-white; - font-weight: $medium; + &.account { + padding: .25rem; + position: relative; + width: 210px; + height: 56px; + + &:after { display: none; } + + .acct-inner { + display: flex; + position: relative; + align-items: center; + width: 100%; + height: 100%; + background: $article-nav-acct-bg; + border-radius: 6px; + border: 3px solid $g8-storm; + + &:after { + content: ""; + position: absolute; + right: 1rem; + width: 0; + height: 0; + border-style: solid; + border-width: 5px 5px 0 5px; + border-color: $g16-pearl transparent transparent transparent; + } + } + + .acct-icon { + margin: 0 .9rem 0 .5rem; + border-radius: 50%; + height: 28px; + width: 28px; + background: linear-gradient(45deg,#00a3ff,#67d74e); + color: $g20-white; + text-align: center; + line-height: 0; + overflow: hidden; + .icon { + margin-left: -.1rem; + font-size: 2rem; + } + } + + .acct-label { + .username { color: $g16-pearl; font-weight: $medium; font-size: .85rem; line-height: 1.2rem; } + .orgname { color: $g11-sidewalk; font-size: .75rem; line-height: .75rem; } + } + + &.small { + width: 56px; + .acct-inner { + justify-content: center; + align-items: center; + &:after { display: none; } + } + .acct-icon { margin: 0 } + } + } + } + + .nav-icon { + display: flex; + justify-content: left; + align-items: center; + color: $g20-white; + width: 210px; + height: 56px; + font-family: $rubik; + font-weight: $medium; + padding: .9rem 1.1rem; + font-size: 1rem; + position: relative; + background: $article-nav-icon-bg; + + .icon { + display: inline-block; + font-size: 1.35rem; + margin-right: 1rem; + } + + .nav-icon-label { + display: inline-block; + padding: 0; + font-size: 1rem; + } + + &:before, &:after { + content: ""; + position: absolute; + left: 0; + height: 2px; + z-index: 2; + width: 12px; + } + + &:before { + top: 0; + background: #be2ee4; + background: linear-gradient(90deg,#be2ee4 0,rgba(190,46,228,0)); + } + + &:after { + bottom: 0; + background: #00a3ff; + background: linear-gradient(90deg,#00a3ff 0,rgba(190,46,228,0)); + } + + &.small { + display: flex; + justify-content: center; + align-items: center; + padding: 0; + width: 56px; + flex-direction: column; + + .icon { + position: relative; + margin: 0; + } + + .nav-icon-label { + padding: 0; + margin-top: .75rem; + font-size: .67rem; + line-height: 0; + } } } } + +///////////////////////////////// MEDIA QUERIES //////////////////////////////// + +@include media(small) { + .article--content .nav-item:nth-child(2) {display: none;} +} diff --git a/assets/styles/themes/_theme-dark.scss b/assets/styles/themes/_theme-dark.scss index e051efdce..9dfaaa39c 100644 --- a/assets/styles/themes/_theme-dark.scss +++ b/assets/styles/themes/_theme-dark.scss @@ -159,6 +159,10 @@ $article-btn-text: $g20-white; $article-btn-hover: $b-pool; $article-btn-text-hover: $g20-white; +// Article UI nav icons +$article-nav-icon-bg: $g5-pepper; +$article-nav-acct-bg: $g3-castle; + // Error Page Colors $error-page-btn: $b-dodger; $error-page-btn-text: $g20-white; diff --git a/assets/styles/themes/_theme-light.scss b/assets/styles/themes/_theme-light.scss index 84481ab46..94f35fad3 100644 --- a/assets/styles/themes/_theme-light.scss +++ b/assets/styles/themes/_theme-light.scss @@ -160,6 +160,10 @@ $article-btn-text: $g20-white !default; $article-btn-hover: $b-dodger !default; $article-btn-text-hover: $g20-white !default; +// Article UI nav icons +$article-nav-icon-bg: $g6-smoke !default; +$article-nav-acct-bg: $g5-pepper !default; + // Error Page Colors $error-page-btn: $b-dodger !default; $error-page-btn-text: $g20-white !default; diff --git a/assets/styles/tools/_icomoon.scss b/assets/styles/tools/_icomoon.scss index 32f4e000f..282139f46 100644 --- a/assets/styles/tools/_icomoon.scss +++ b/assets/styles/tools/_icomoon.scss @@ -1,12 +1,13 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?9r9zke'); - src: url('fonts/icomoon.eot?9r9zke#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?9r9zke') format('truetype'), - url('fonts/icomoon.woff?9r9zke') format('woff'), - url('fonts/icomoon.svg?9r9zke#icomoon') format('svg'); + src: url('fonts/icomoon.eot?rgf1km'); + src: url('fonts/icomoon.eot?rgf1km#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?rgf1km') format('truetype'), + url('fonts/icomoon.woff?rgf1km') format('woff'), + url('fonts/icomoon.svg?rgf1km#icomoon') format('svg'); font-weight: normal; font-style: normal; + font-display: block; } [class^="icon-"], [class*=" icon-"] { @@ -30,11 +31,8 @@ .icon-ui-wrench-nav:before { content: "\e93d"; } -.icon-ui-eye-closed:before { - content: "\e956"; -} -.icon-ui-eye-open:before { - content: "\e957"; +.icon-ui-user:before { + content: "\e93e"; } .icon-ui-chat:before { content: "\e93a"; @@ -42,12 +40,21 @@ .icon-ui-bell:before { content: "\e93b"; } +.icon-ui-users-trio:before { + content: "\e940"; +} .icon-ui-cloud:before { content: "\e93f"; } .icon-ui-nav-chat:before { content: "\e941"; } +.icon-ui-eye-closed:before { + content: "\e956"; +} +.icon-ui-eye-open:before { + content: "\e957"; +} .icon-ui-add-cell:before { content: "\e91f"; } diff --git a/content/v2.0/example.md b/content/v2.0/example.md index 9793b5679..724454dd8 100644 --- a/content/v2.0/example.md +++ b/content/v2.0/example.md @@ -19,7 +19,14 @@ related: This is a paragraph. Lorem ipsum dolor ({{< icon "trash" >}}) sit amet, consectetur adipiscing elit. Nunc rutrum, metus id scelerisque euismod, erat ante suscipit nibh, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. Morbi eu bibendum erat. Sed ullamcorper, dui id lobortis efficitur, mauris odio pharetra neque, vel tempor odio dolor blandit justo. -{{< nav-icon "dashboards" >}} +{{< nav-icon "account" >}} +{{< nav-icon "data" >}} +{{< nav-icon "explore" >}} +{{< nav-icon "org" >}} +{{< nav-icon "boards" >}} +{{< nav-icon "tasks" >}} +{{< nav-icon "alerts" >}} +{{< nav-icon "settings" >}} ## h2 This is a header2 This is a paragraph. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc rutrum, metus id scelerisque euismod, erat ante suscipit nibh, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. Morbi eu bibendum erat. Sed ullamcorper, dui id lobortis efficitur, mauris odio pharetra neque, vel tempor odio dolor blandit justo. diff --git a/content/v2.0/get-started.md b/content/v2.0/get-started.md index 1f4871ea3..fcfe3624e 100644 --- a/content/v2.0/get-started.md +++ b/content/v2.0/get-started.md @@ -28,7 +28,7 @@ This article describes how to get started with InfluxDB OSS. To get started with ### Download and install InfluxDB v2.0 beta Download InfluxDB v2.0 beta for macOS. -InfluxDB v2.0 beta (macOS) +InfluxDB v2.0 beta (macOS) ### Unpackage the InfluxDB binaries To unpackage the downloaded archive, **double click the archive file in Finder** @@ -37,7 +37,7 @@ or run the following command in a macOS command prompt application such ```sh # Unpackage contents to the current working directory -tar zxvf ~/Downloads/influxdb_2.0.0-beta.7_darwin_amd64.tar.gz +tar zxvf ~/Downloads/influxdb_2.0.0-beta.8_darwin_amd64.tar.gz ``` #### (Optional) Place the binaries in your $PATH @@ -46,7 +46,7 @@ prefix the executables with `./` to run then in place. ```sh # (Optional) Copy the influx and influxd binary to your $PATH -sudo cp influxdb_2.0.0-beta.7_darwin_amd64/{influx,influxd} /usr/local/bin/ +sudo cp influxdb_2.0.0-beta.8_darwin_amd64/{influx,influxd} /usr/local/bin/ ``` {{% note %}} @@ -106,8 +106,8 @@ influxd --reporting-disabled ### Download and install InfluxDB v2.0 beta Download the InfluxDB v2.0 beta package appropriate for your chipset. -InfluxDB v2.0 beta (amd64) -InfluxDB v2.0 beta (arm) +InfluxDB v2.0 beta (amd64) +InfluxDB v2.0 beta (arm) ### Place the executables in your $PATH Unpackage the downloaded archive and place the `influx` and `influxd` executables in your system `$PATH`. @@ -116,10 +116,10 @@ _**Note:** The following commands are examples. Adjust the file names, paths, an ```sh # Unpackage contents to the current working directory -tar xvzf path/to/influxdb_2.0.0-beta.7_linux_amd64.tar.gz +tar xvzf path/to/influxdb_2.0.0-beta.8_linux_amd64.tar.gz # Copy the influx and influxd binary to your $PATH -sudo cp influxdb_2.0.0-beta.7_linux_amd64/{influx,influxd} /usr/local/bin/ +sudo cp influxdb_2.0.0-beta.8_linux_amd64/{influx,influxd} /usr/local/bin/ ``` {{% note %}} diff --git a/content/v2.0/monitor-alert/checks/create.md b/content/v2.0/monitor-alert/checks/create.md index 23c546d87..c1cfe65c3 100644 --- a/content/v2.0/monitor-alert/checks/create.md +++ b/content/v2.0/monitor-alert/checks/create.md @@ -43,12 +43,11 @@ A deadman check assigns a status to data when a series or group doesn't report in a specified amount of time. ## Create a check in the InfluxDB UI -1. Click **Monitoring & Alerting** in the sidebar in the InfluxDB UI. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. In the top right corner of the **Checks** column, click **{{< icon "plus" >}} Create** - and select the [type of check](#check-types) to create. +2. Click **{{< icon "plus" >}} Create** and select the [type of check](#check-types) to create. 3. Click **Name this check** in the top left corner and provide a unique name for the check. #### Configure the check query diff --git a/content/v2.0/monitor-alert/checks/delete.md b/content/v2.0/monitor-alert/checks/delete.md index 8e884679f..4e35290ff 100644 --- a/content/v2.0/monitor-alert/checks/delete.md +++ b/content/v2.0/monitor-alert/checks/delete.md @@ -18,12 +18,12 @@ If you no longer need a check, use the InfluxDB user interface (UI) to delete it Deleting a check cannot be undone. {{% /warn %}} -1. Click **Monitoring & Alerting** in the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. In the **Checks** column, hover over the check you want to delete, click the - **{{< icon "delete" >}}** icon, then **Delete**. +2. Hover over the check you want to delete, click the **{{< icon "delete" >}}** + icon, and then **Delete**. After a check is deleted, all statuses generated by the check remain in the `_monitoring` bucket until the retention period for the bucket expires. diff --git a/content/v2.0/monitor-alert/checks/update.md b/content/v2.0/monitor-alert/checks/update.md index d2c9af61c..c2effc8ac 100644 --- a/content/v2.0/monitor-alert/checks/update.md +++ b/content/v2.0/monitor-alert/checks/update.md @@ -21,37 +21,35 @@ Common updates include: - [Add or update a check description](#add-or-update-a-check-description) - [Add a label to a check](#add-a-label-to-a-check) -To update checks, click **Monitoring & Alerting** in the InfluxDB UI sidebar. +To update checks, select **Alerts** in the navigation menu on the left. {{< nav-icon "alerts" >}} ## Update check queries and logic -1. In the **Checks** column, click the name of the check you want to update. - The check builder appears. -2. To edit the check query, click **1. Query** at the top of the check builder window. -3. To edit the check logic, click **2. Check** at the top of the check builder window. +1. Click the name of the check you want to update. The check builder appears. +2. To edit the check query, click **1. Define Query** at the top of the check builder window. +3. To edit the check logic, click **2. Configure Check** at the top of the check builder window. _For details about using the check builder, see [Create checks](/v2.0/monitor-alert/checks/create/)._ ## Enable or disable a check -In the **Checks** column, click the {{< icon "toggle" >}} toggle next to a check -to enable or disable it. +Click the {{< icon "toggle" >}} toggle next to a check to enable or disable it. ## Rename a check -1. In the **Checks** column, hover over the name of the check you want to update. +1. Hover over the name of the check you want to update. 2. Click the **{{< icon "edit" >}}** icon that appears next to the check name. 2. Enter a new name and click out of the name field or press enter to save. _You can also rename a check in the [check builder](#update-check-queries-and-logic)._ ## Add or update a check description -1. In the **Checks** column, hover over the check description you want to update. +1. Hover over the check description you want to update. 2. Click the **{{< icon "edit" >}}** icon that appears next to the description. 2. Enter a new description and click out of the name field or press enter to save. ## Add a label to a check -1. In the **Checks** column, click **Add a label** next to the check you want to add a label to. +1. Click **Add a label** next to the check you want to add a label to. The **Add Labels** box opens. 2. To add an existing label, select the label from the list. 3. To create and add a new label: diff --git a/content/v2.0/monitor-alert/checks/view.md b/content/v2.0/monitor-alert/checks/view.md index a41f90713..3c8412d4b 100644 --- a/content/v2.0/monitor-alert/checks/view.md +++ b/content/v2.0/monitor-alert/checks/view.md @@ -19,25 +19,25 @@ View check details and statuses and notifications generated by checks in the Inf - [View statuses generated by a check](#view-statuses-generated-by-a-check) - [View notifications triggered by a check](#view-notifications-triggered-by-a-check) -To view checks, click **Monitoring & Alerting** in the InfluxDB UI sidebar. +To view checks, click **Alerts** in navigation menu on the left. {{< nav-icon "alerts" >}} ## View a list of all checks -The **Checks** column on the Monitoring & Alerting landing page displays all existing checks. +The **Checks** section of the Alerts landing page displays all existing checks. ## View check details -In the **Checks** column, click the name of the check you want to view. +Click the name of the check you want to view. The check builder appears. Here you can view the check query and logic. ## View statuses generated by a check -1. In the **Checks** column, hover over the check, click the **{{< icon "view" >}}** - icon, then **View History**. - The Statuses History page displays statuses generated by the selected check. +1. Hover over the check and click the **{{< icon "view" >}}** icon. +2. Click **View History**. + The Statuses History page displays statuses generated by the selected check. ## View notifications triggered by a check -1. In the **Checks** column, hover over the check, click the **{{< icon "view" >}}** - icon, then **View History**. -2. In the top left corner, click **Notifications**. - The Notifications History page displays notifications initiated by the selected check. +1. Hover over the check, click the **{{< icon "view" >}}** + icon, then **View History**. +2. In the top left corner, click **Notifications**. + The Notifications History page displays notifications initiated by the selected check. diff --git a/content/v2.0/monitor-alert/notification-endpoints/create.md b/content/v2.0/monitor-alert/notification-endpoints/create.md index 736b543d1..989aee77e 100644 --- a/content/v2.0/monitor-alert/notification-endpoints/create.md +++ b/content/v2.0/monitor-alert/notification-endpoints/create.md @@ -16,12 +16,13 @@ To send notifications about changes in your data, start by creating a notificati ## Create a notification endpoint in the UI -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Next to **Notification Endpoints**, click **Create**. -3. From the **Destination** drop-down list, select a destination endpoint to send notifications. +2. Select **Notification Endpoints** near to top of the page. +3. Click **{{< icon "plus" >}} Create**. +4. From the **Destination** drop-down list, select a destination endpoint to send notifications. The following endpoints are available for InfluxDB 2.0 OSS, the InfluxDB Cloud 2.0 Free Plan, and the InfluxDB Cloud 2.0 Usage-based Plan: @@ -31,8 +32,8 @@ To send notifications about changes in your data, start by creating a notificati | **PagerDuty** | **{{< icon "check" >}}** | | **{{< icon "check" >}}** | | **HTTP** | **{{< icon "check" >}}** | | **{{< icon "check" >}}** | -4. In the **Name** and **Description** fields, enter a name and description for the endpoint. -5. Enter enter information to connect to the endpoint: +5. In the **Name** and **Description** fields, enter a name and description for the endpoint. +6. Enter enter information to connect to the endpoint: - For HTTP, enter the **URL** to send the notification. Select the **auth method** to use: **None** for no authentication. To authenticate with a username and password, select **Basic** and then enter credentials in the **Username** and **Password** fields. To authenticate with a token, select **Bearer**, and then enter the authentication token in the **Token** field. diff --git a/content/v2.0/monitor-alert/notification-endpoints/delete.md b/content/v2.0/monitor-alert/notification-endpoints/delete.md index 24a0dc71b..b3a65f7fb 100644 --- a/content/v2.0/monitor-alert/notification-endpoints/delete.md +++ b/content/v2.0/monitor-alert/notification-endpoints/delete.md @@ -16,9 +16,11 @@ If notifications are no longer sent to an endpoint, complete the steps below to ## Delete a notification endpoint in the UI -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Rules**, find the rule you want to delete. -3. Click the delete icon, then click **Delete** to confirm. +2. Select **Notification Endpoints** near to top of the page. + find the rule you want to delete. +3. Hover over the endpoint you want to delete and click the **{{< icon "trash" >}}** icon. +4. Click **Delete** to confirm. diff --git a/content/v2.0/monitor-alert/notification-endpoints/update.md b/content/v2.0/monitor-alert/notification-endpoints/update.md index d2624e5e4..74bcc05a8 100644 --- a/content/v2.0/monitor-alert/notification-endpoints/update.md +++ b/content/v2.0/monitor-alert/notification-endpoints/update.md @@ -16,50 +16,51 @@ To update the notification endpoint details, complete the procedures below as ne ## Add a label to notification endpoint -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Endpoints**, click **Add a label** next to the endpoint you want to add a label to. The **Add Labels** box opens. -3. To add an existing label, select the label from the list. -4. To create and add a new label: +2. Select **Notification Endpoints** near to top of the page. +3. Click **{{< icon "add-label" >}} Add a label** next to the endpoint you want to add a label to. + The **Add Labels** box opens. +4. To add an existing label, select the label from the list. +5. To create and add a new label: - In the search field, enter the name of the new label. The **Create Label** box opens. - In the **Description** field, enter an optional description for the label. - Select a color for the label. - Click **Create Label**. -5. To remove a label, hover over the label under an endpoint and click X. +6. To remove a label, hover over the label under an endpoint and click X. ## Disable notification endpoint -1. Select the **Monitoring and Alerting** icon from the sidebar. - +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} - -2. Under **Notification Endpoints**, find the endpoint you want to disable. -3. Click the blue toggle to disable the notification endpoint. +2. Select **Notification Endpoints** near to top of the page. +3. Click the {{< icon "toggle" >}} toggle to disable the notification endpoint. ## Update the name or description for notification endpoint -1. Select the **Monitoring and Alerting** icon from the sidebar. - +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} - -2. Under **Notification Endpoints**, hover over the name or description of the endpoint. -3. Click the pencil icon to edit the field. +2. Select **Notification Endpoints** near to top of the page. +3. Hover over the name or description of the endpoint and click the pencil icon + (**{{< icon "edit" >}}**) to edit the field. 4. Click outside of the field to save your changes. ## Change endpoint details -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Endpoints**, click the endpoint to update. -3. Update details as needed, and then click **Edit a Notification Endpoint**. For details about each field, see [Create notification endpoints](/v2.0/monitor-alert/notification-endpoints/create/). +2. Select **Notification Endpoints** near to top of the page. +3. Click the endpoint to update. +4. Update details as needed, and then click **Edit Notification Endpoint**. + For details about each field, see [Create notification endpoints](/v2.0/monitor-alert/notification-endpoints/create/). diff --git a/content/v2.0/monitor-alert/notification-endpoints/view.md b/content/v2.0/monitor-alert/notification-endpoints/view.md index 982fa4c42..399753c15 100644 --- a/content/v2.0/monitor-alert/notification-endpoints/view.md +++ b/content/v2.0/monitor-alert/notification-endpoints/view.md @@ -21,23 +21,31 @@ View notification endpoint details and history in the InfluxDB user interface (U ## View notification endpoints -- Click **Monitoring & Alerting** in the InfluxDB UI sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} - In the **Notification Endpoints** column, view existing notification endpoints. +2. Select **Notification Endpoints** near to top of the page. ## View notification endpoint details -1. Click **Monitoring & Alerting** in the InfluxDB UI sidebar. -2. In the **Notification Endpoints** column, click the name of the notification endpoint you want to view. -3. View the notification endpoint destination, name, and information to connect to the endpoint. +1. In the navigation menu on the left, select **Alerts**. + + {{< nav-icon "alerts" >}} + +2. Select **Notification Endpoints** near to top of the page. +3. Click the name of the notification endpoint you want to view. +4. View the notification endpoint destination, name, and information to connect to the endpoint. ## View notification endpoint history -1. Click **Monitoring & Alerting** in the InfluxDB UI sidebar. -2. In the **Notification Endpoints** column, hover over the notification endpoint, click the **{{< icon "view" >}}** icon, then **View History**. -The Check Statuses History page displays: +1. In the navigation menu on the left, select **Alerts**. - - Statuses generated for the selected notification endpoint - - Notifications sent to the selected notification endpoint + {{< nav-icon "alerts" >}} + +2. Select **Notification Endpoints** near to top of the page. +3. Hover over the notification endpoint, click the **{{< icon "view" >}}** icon, then **View History**. + The Check Statuses History page displays: + + - Statuses generated for the selected notification endpoint + - Notifications sent to the selected notification endpoint diff --git a/content/v2.0/monitor-alert/notification-rules/create.md b/content/v2.0/monitor-alert/notification-rules/create.md index 471f65aff..143968989 100644 --- a/content/v2.0/monitor-alert/notification-rules/create.md +++ b/content/v2.0/monitor-alert/notification-rules/create.md @@ -17,26 +17,28 @@ _For details, see [Manage checks](/v2.0/monitor-alert/checks/) and ## Create a new notification rule in the UI -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Rules**, click **+Create**. -3. Complete the **About** section: +2. Select **Notification Rules** near to top of the page. +3. Click **{{< icon "plus" >}} Create**. +4. Complete the **About** section: 1. In the **Name** field, enter a name for the notification rule. 2. In the **Schedule Every** field, enter how frequently the rule should run. 3. In the **Offset** field, enter an offset time. For example,if a task runs on the hour, a 10m offset delays the task to 10 minutes after the hour. Time ranges defined in the task are relative to the specified execution time. -4. In the **Conditions** section, build a condition using a combination of status and tag keys. +5. In the **Conditions** section, build a condition using a combination of status and tag keys. - Next to **When status is equal to**, select a status from the drop-down field. - Next to **AND When**, enter one or more tag key-value pairs to filter by. -5. In the **Message** section, select an endpoint to notify. -6. Click **Create Notification Rule**. +6. In the **Message** section, select an endpoint to notify. +7. Click **Create Notification Rule**. ## Clone an existing notification rule in the UI -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. 1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Rules**, hover over the rule you want to clone. -3. Click the clone icon and select **Clone**. The cloned rule appears. +2. Select **Notification Rules** near to top of the page. +3. Hover over the rule you want to clone and click the **{{< icon "clone" >}}** icon and select **Clone**. + The cloned rule appears. diff --git a/content/v2.0/monitor-alert/notification-rules/delete.md b/content/v2.0/monitor-alert/notification-rules/delete.md index dea28950d..3b9aeeedd 100644 --- a/content/v2.0/monitor-alert/notification-rules/delete.md +++ b/content/v2.0/monitor-alert/notification-rules/delete.md @@ -13,9 +13,10 @@ related: ## Delete a notification rule in the UI -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Rules**, find the rule you want to delete. -3. Click the delete icon, then click **Delete** to confirm. +2. Select **Notification Rules** near to top of the page. +3. Hover over the rule you want to delete and click the **{{< icon "trash" >}}** icon. +4. Click **Delete** to confirm. diff --git a/content/v2.0/monitor-alert/notification-rules/update.md b/content/v2.0/monitor-alert/notification-rules/update.md index f88a832d0..dc23766cf 100644 --- a/content/v2.0/monitor-alert/notification-rules/update.md +++ b/content/v2.0/monitor-alert/notification-rules/update.md @@ -13,39 +13,38 @@ related: ## Add a label to notification rules -1. Select the **Monitoring and Alerting** icon from the sidebar. +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} -2. Under **Notification Rules**, click **Add a label** next to the rule you want to add a label to. The **Add Labels** box opens. -3. To add an existing label, select the label from the list. -4. To create and add a new label: +2. Select **Notification Rules** near to top of the page. +3. Click **{{< icon "add-label" >}} Add a label** next to the rule you want to add a label to. + The **Add Labels** box opens. +4. To add an existing label, select the label from the list. +5. To create and add a new label: - In the search field, enter the name of the new label. The **Create Label** box opens. - In the **Description** field, enter an optional description for the label. - Select a color for the label. - Click **Create Label**. -5. To remove a label, hover over the label under to a rule and click X. +6. To remove a label, hover over the label under to a rule and click **{{< icon "x" >}}**. ## Disable notification rules -1. Select the **Monitoring and Alerting** icon from the sidebar. - +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} - -2. Under **Notification Rules**, find the rule you want to disable. -3. Click the blue toggle to disable the notification rule. +2. Select **Notification Rules** near to top of the page. +3. Click the {{< icon "toggle" >}} toggle to disable the notification rule. ## Update the name or description for notification rules -1. Select the **Monitoring and Alerting** icon from the sidebar. - +1. In the navigation menu on the left, select **Alerts**. {{< nav-icon "alerts" >}} - -2. Under **Notification Rules**, hover over the name or description of a rule. -3. Click the pencil icon to edit the field. +2. Select **Notification Rules** near to top of the page. +3. Hover over the name or description of a rule and click the pencil icon + (**{{< icon "edit" >}}**) to edit the field. 4. Click outside of the field to save your changes. diff --git a/content/v2.0/monitor-alert/notification-rules/view.md b/content/v2.0/monitor-alert/notification-rules/view.md index bbbcbe130..7c87c7ee4 100644 --- a/content/v2.0/monitor-alert/notification-rules/view.md +++ b/content/v2.0/monitor-alert/notification-rules/view.md @@ -18,25 +18,28 @@ View notification rule details and statuses and notifications generated by notif - [View statuses generated by a check](#view-statuses-generated-by-a-notification-rule) - [View notifications triggered by a notification rule](#view-notifications-triggered-by-a-notification-rule) -To view notification rules, click **Monitoring & Alerting** in the InfluxDB UI sidebar. +**To view notification rules:** -{{< nav-icon "alerts" >}} +1. In the navigation menu on the left, select **Alerts**. + + {{< nav-icon "alerts" >}} + +2. Select **Notification Rules** near to top of the page. ## View a list of all notification rules -The **Notification Rules** column on the Monitoring & Alerting landing page displays all existing checks. +The **Notification Rules** section of the Alerts landing page displays all existing checks. ## View notification rule details -In the **Notification Rules** column, click the name of the check you want to view. +Click the name of the check you want to view. The check builder appears. Here you can view the check query and logic. ## View statuses generated by a notification rule -1. In the **Notification Rules** column, hover over the check, click the **{{< icon "view" >}}** - icon, then **View History**. - The Statuses History page displays statuses generated by the selected check. +Hover over the check, click the **{{< icon "view" >}}** icon, and then **View History**. +The Statuses History page displays statuses generated by the selected check. ## View notifications triggered by a notification rule -1. In the **Notification Rules** column, hover over the notification rule, click the **{{< icon "view" >}}** - icon, then **View History**. -2. In the top left corner, click **Notifications**. - The Notifications History page displays notifications initiated by the selected notification rule. +1. Hover over the notification rule, click the **{{< icon "view" >}}** + icon, and then **View History**. +2. In the top left corner, click **Notifications**. + The Notifications History page displays notifications initiated by the selected notification rule. diff --git a/content/v2.0/organizations/buckets/create-bucket.md b/content/v2.0/organizations/buckets/create-bucket.md index 3a01c65f8..07942f175 100644 --- a/content/v2.0/organizations/buckets/create-bucket.md +++ b/content/v2.0/organizations/buckets/create-bucket.md @@ -14,14 +14,13 @@ to create a bucket. ## Create a bucket in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Buckets**. - {{< nav-icon "load data" >}} + {{< nav-icon "data" >}} -2. Select **Buckets**. -3. Click **{{< icon "plus" >}} Create Bucket** in the upper right. -4. Enter a **Name** for the bucket. -5. Select when to **Delete Data**: +2. Click **{{< icon "plus" >}} Create Bucket** in the upper right. +3. Enter a **Name** for the bucket. +4. Select when to **Delete Data**: - **Never** to retain data forever. - **Older than** to choose a specific retention policy. 5. Click **Create** to create the bucket. diff --git a/content/v2.0/organizations/buckets/delete-bucket.md b/content/v2.0/organizations/buckets/delete-bucket.md index ab3ce6111..659baa745 100644 --- a/content/v2.0/organizations/buckets/delete-bucket.md +++ b/content/v2.0/organizations/buckets/delete-bucket.md @@ -14,13 +14,12 @@ to delete a bucket. ## Delete a bucket in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Buckets**. - {{< nav-icon "load data" >}} + {{< nav-icon "data" >}} -2. Select **Buckets**. -3. Hover over the bucket you would like to delete. -4. Click **{{< icon "delete" >}} Delete Bucket** and **Confirm** to delete the bucket. +2. Hover over the bucket you would like to delete. +3. Click **{{< icon "delete" >}} Delete Bucket** and **Confirm** to delete the bucket. ## Delete a bucket using the influx CLI diff --git a/content/v2.0/organizations/buckets/update-bucket.md b/content/v2.0/organizations/buckets/update-bucket.md index ea9499252..cfb5933e1 100644 --- a/content/v2.0/organizations/buckets/update-bucket.md +++ b/content/v2.0/organizations/buckets/update-bucket.md @@ -24,25 +24,24 @@ If you change a bucket name, be sure to update the bucket in the above places as ## Update a bucket's name in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Buckets**. - {{< nav-icon "load data" >}} + {{< nav-icon "data" >}} -2. Select **Buckets**. -3. Click **Rename** under the bucket you want to rename. -4. Review the information in the window that appears and click **I understand, let's rename my bucket**. -5. Update the bucket's name and click **Change Bucket Name**. +2. Click **Settings** under the bucket you want to rename. +3. Click **Rename**. +3. Review the information in the window that appears and click **I understand, let's rename my bucket**. +4. Update the bucket's name and click **Change Bucket Name**. ## Update a bucket's retention policy in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Buckets**. - {{< nav-icon "load data" >}} + {{< nav-icon "data" >}} -2. Select **Buckets**. -3. Click the name of the bucket you want to update from the list. -4. In the window that appears, edit the bucket's retention policy. -5. Click **Save Changes**. +2. Click **Settings** next to the bucket you want to update. +3. In the window that appears, edit the bucket's retention policy. +4. Click **Save Changes**. ## Update a bucket using the influx CLI diff --git a/content/v2.0/organizations/buckets/view-buckets.md b/content/v2.0/organizations/buckets/view-buckets.md index c5129b0d5..b0d001b00 100644 --- a/content/v2.0/organizations/buckets/view-buckets.md +++ b/content/v2.0/organizations/buckets/view-buckets.md @@ -11,12 +11,11 @@ weight: 202 ## View buckets in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Buckets**. - {{< nav-icon "load data" >}} + {{< nav-icon "data" >}} -2. Select **Buckets**. -3. Click a bucket to open it **Data Explorer**. +2. Click a bucket to open it **Data Explorer**. ## View buckets using the influx CLI diff --git a/content/v2.0/organizations/create-org.md b/content/v2.0/organizations/create-org.md index b4131e978..d82a8ae67 100644 --- a/content/v2.0/organizations/create-org.md +++ b/content/v2.0/organizations/create-org.md @@ -13,17 +13,18 @@ Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI to create an organization. {{% cloud-msg %}} -You cannot currently create additional organizations in {{< cloud-name >}}. Only the default organization is available. +You cannot currently create additional organizations in {{< cloud-name >}}. +Only the default organization is available. {{% /cloud-msg %}} ## Create an organization in the InfluxDB UI -1. Click the **Influx** icon in the navigation bar. +1. In the navigation menu on the left, click the **Account dropdown**. - {{< nav-icon "admin" >}} + {{< nav-icon "account" >}} 2. Select **Create Organization**. -3. In the window that appears, enter a name for the organization and associated bucket and click **Create**. +3. In the window that appears, enter an **Organization Name** and **Bucket Name** and click **Create**. ## Create an organization using the influx CLI diff --git a/content/v2.0/organizations/delete-org.md b/content/v2.0/organizations/delete-org.md index ff4829ce2..bf44096cf 100644 --- a/content/v2.0/organizations/delete-org.md +++ b/content/v2.0/organizations/delete-org.md @@ -15,9 +15,9 @@ to delete an organization. diff --git a/content/v2.0/organizations/members/remove-member.md b/content/v2.0/organizations/members/remove-member.md index 9ec3a55f5..1bbe3e99b 100644 --- a/content/v2.0/organizations/members/remove-member.md +++ b/content/v2.0/organizations/members/remove-member.md @@ -20,13 +20,12 @@ For information about deleting a user from InfluxDB, see [Delete a user](/v2.0/u ## Remove a member from an organization in the InfluxDB UI -1. Click **Settings** in the left navigation bar. +1. In the navigation menu on the left, select **Org (Organization)** > **Members**. - {{< nav-icon "settings" >}} + {{< nav-icon "org" >}} -2. Select **Members**. -3. Hover over the member you would like to delete and click the **{{< icon "delete" >}}** icon. -4. Click **Delete**. +2. Hover over the member you would like to delete and click the **{{< icon "delete" >}}** icon. +3. Click **Delete**. ## Remove a member from an organization using the influx CLI diff --git a/content/v2.0/organizations/members/view-members.md b/content/v2.0/organizations/members/view-members.md index 1cdc5b444..ec9e78701 100644 --- a/content/v2.0/organizations/members/view-members.md +++ b/content/v2.0/organizations/members/view-members.md @@ -14,11 +14,9 @@ to view members of an organization. ## View members of organization in the InfluxDB UI -* Click the **Settings** tab in the navigation bar. +In the navigation menu on the left, select **Org (Organization)** > **Members**. - {{< nav-icon "settings" >}} - -* Click the name of an organization, then select the **Members** tab. The list of organization members appears. +{{< nav-icon "org" >}} ## View members of organization using the influx CLI diff --git a/content/v2.0/organizations/switch-org.md b/content/v2.0/organizations/switch-org.md index f09113d19..8477441f0 100644 --- a/content/v2.0/organizations/switch-org.md +++ b/content/v2.0/organizations/switch-org.md @@ -13,9 +13,9 @@ Use the InfluxDB user interface (UI) to switch from one organization to another. ## Switch organizations in the InfluxDB UI -1. Click the **Influx** icon in the navigation bar. +1. In the navigation menu on the left, click the **Account dropdown**. - {{< nav-icon "admin" >}} + {{< nav-icon "account" >}} -2. Select **Switch Organizations**. The list of organizations appears. +2. Select **Switch Organizations**. 3. Click the organization you want to switch to. diff --git a/content/v2.0/organizations/update-org.md b/content/v2.0/organizations/update-org.md index fc4fbf834..ec1354464 100644 --- a/content/v2.0/organizations/update-org.md +++ b/content/v2.0/organizations/update-org.md @@ -23,15 +23,14 @@ If you change an organization name, be sure to update the organization in the ab ## Update an organization in the InfluxDB UI -1. Click the **Settings** icon in the navigation bar. +1. In the navigation menu on the left, click the **Org (Organization)** > **About**. - {{< nav-icon "settings" >}} + {{< nav-icon "org" >}} -2. Click the **Org Profile** tab. -3. Click **Rename**. -4. In the window that appears, review the information and click **I understand, let's rename my organization**. -5. Enter a new name for your organization. -6. Click **Change organization name**. +2. Click **{{< icon "edit" >}} Rename**. +3. In the window that appears, review the information and click **I understand, let's rename my organization**. +4. Enter a new name for your organization. +5. Click **Change organization name**. ## Update an organization using the influx CLI diff --git a/content/v2.0/organizations/view-orgs.md b/content/v2.0/organizations/view-orgs.md index a8dd4bf4d..1739b8ade 100644 --- a/content/v2.0/organizations/view-orgs.md +++ b/content/v2.0/organizations/view-orgs.md @@ -14,12 +14,11 @@ to view organizations. ## View organizations in the InfluxDB UI -* Click the **Influx** icon in the navigation bar. +1. In the navigation menu on the left, click the **Account dropdown**. - {{< nav-icon "admin" >}} - -* Select **Switch Organizations**. The list of organizations appears. + {{< nav-icon "account" >}} +2. Select **Switch Organizations**. The list of organizations appears. ## View organizations using the influx CLI @@ -40,9 +39,24 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID. ### Organization ID in the UI After logging in to the InfluxDB UI, your organization ID appears in the URL. +{{< code-tabs-wrapper >}} +{{% code-tabs %}} +[InfluxDB Cloud](#) +[InfluxDB OSS](#) +{{% /code-tabs %}} +{{< code-tab-content >}} +
+https://us-west-2-1.aws.cloud2.influxdata.com/orgs/03a2bbf46249a000/...
+
+{{< /code-tab-content >}} +{{< code-tab-content >}} 
 http://localhost:9999/orgs/03a2bbf46249a000/...
+{{< /code-tab-content >}} +{{< /code-tabs-wrapper >}} + +_For specific InfluxDB Cloud provider and region URLs, see [InfluxDB Cloud URLs](/v2.0/cloud/urls/)._ ### Organization ID in the CLI diff --git a/content/v2.0/process-data/manage-tasks/create-task.md b/content/v2.0/process-data/manage-tasks/create-task.md index 3914fb211..7bc81dcce 100644 --- a/content/v2.0/process-data/manage-tasks/create-task.md +++ b/content/v2.0/process-data/manage-tasks/create-task.md @@ -30,11 +30,11 @@ The InfluxDB UI provides multiple ways to create a task: - [Clone a task](#clone-a-task) ### Create a task from the Data Explorer -1. Click the **Data Explorer** icon in the left navigation menu. +1. In the navigation menu on the left, select **Explore** (**Data Explorer**). {{< nav-icon "data-explorer" >}} -2. Building a query and click **Save As** in the upper right. +2. Build a query and click **Save As** in the upper right. 3. Select the **Task** option. 4. Specify the task options. See [Task options](/v2.0/process-data/task-options) for detailed information about each option. @@ -43,7 +43,7 @@ The InfluxDB UI provides multiple ways to create a task: ### Create a task in the Task UI -1. Click the **Tasks** icon in the left navigation menu. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} @@ -56,7 +56,7 @@ The InfluxDB UI provides multiple ways to create a task: 7. Click **Save** in the upper right. ### Import a task -1. Click the **Tasks** icon in the left navigation menu. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} @@ -69,7 +69,7 @@ The InfluxDB UI provides multiple ways to create a task: 5. Click **Import JSON as Task**. ### Create a task from a template -1. Click the **Settings** icon in the left navigation menu. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "Settings" >}} @@ -78,7 +78,7 @@ The InfluxDB UI provides multiple ways to create a task: ### Clone a task -1. Click the **Tasks** icon in the left navigation menu. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} @@ -92,10 +92,10 @@ It accepts either a file path or raw Flux. ###### Create a task using a file ```sh # Syntax -influx task create --org @ +influx task create --org -f # Example -influx task create --org my-org @/tasks/cq-mean-1h.flux +influx task create --org my-org -f /tasks/cq-mean-1h.flux ``` ###### Create a task using raw Flux diff --git a/content/v2.0/process-data/manage-tasks/delete-task.md b/content/v2.0/process-data/manage-tasks/delete-task.md index 8232e9cb8..2dcbd420a 100644 --- a/content/v2.0/process-data/manage-tasks/delete-task.md +++ b/content/v2.0/process-data/manage-tasks/delete-task.md @@ -13,7 +13,7 @@ related: --- ## Delete a task in the InfluxDB UI -1. Click the **Tasks** icon in the left navigation menu. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} diff --git a/content/v2.0/process-data/manage-tasks/export-task.md b/content/v2.0/process-data/manage-tasks/export-task.md index 52fb52336..18d440786 100644 --- a/content/v2.0/process-data/manage-tasks/export-task.md +++ b/content/v2.0/process-data/manage-tasks/export-task.md @@ -13,7 +13,7 @@ InfluxDB lets you export tasks from the InfluxDB user interface (UI). Tasks are exported as downloadable JSON files. ## Export a task in the InfluxDB UI -1. Click the **Tasks** icon in the left navigation menu. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} diff --git a/content/v2.0/process-data/manage-tasks/run-task.md b/content/v2.0/process-data/manage-tasks/run-task.md index 607e8d759..667e7f071 100644 --- a/content/v2.0/process-data/manage-tasks/run-task.md +++ b/content/v2.0/process-data/manage-tasks/run-task.md @@ -18,7 +18,7 @@ however, you can manually run a task from the InfluxDB user interface (UI) or th `influx` command line interface (CLI). ## Run a task from the InfluxDB UI -1. Click the **Tasks** icon in the left navigation to view the lists of tasks. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} diff --git a/content/v2.0/process-data/manage-tasks/task-run-history.md b/content/v2.0/process-data/manage-tasks/task-run-history.md index a24fe8397..ee266cca1 100644 --- a/content/v2.0/process-data/manage-tasks/task-run-history.md +++ b/content/v2.0/process-data/manage-tasks/task-run-history.md @@ -20,7 +20,7 @@ to view task run histories and associated logs. ## View a task's run history in the InfluxDB UI -1. Click the **Tasks** icon in the left navigation to view the lists of tasks. +1. In the navigation menu on the left, select **Tasks**. {{< nav-icon "tasks" >}} diff --git a/content/v2.0/process-data/manage-tasks/update-task.md b/content/v2.0/process-data/manage-tasks/update-task.md index e0d55a65c..6123945f2 100644 --- a/content/v2.0/process-data/manage-tasks/update-task.md +++ b/content/v2.0/process-data/manage-tasks/update-task.md @@ -13,7 +13,7 @@ related: --- ## Update a task in the InfluxDB UI -To view your tasks, click the **Tasks** icon in the left navigation menu. +Click the **Tasks** icon in the left navigation to view the lists of tasks. {{< nav-icon "tasks" >}} @@ -48,10 +48,10 @@ script are also updated. ```sh # Syntax -influx task update -i @/path/to/updated-task-script +influx task update -i -f # Example -influx task update -i 0343698431c35000 @/tasks/cq-mean-1h.flux +influx task update -i 0343698431c35000 -f /tasks/cq-mean-1h.flux ``` #### Update the status of a task diff --git a/content/v2.0/query-data/execute-queries.md b/content/v2.0/query-data/execute-queries.md index 05516e9b2..17624b841 100644 --- a/content/v2.0/query-data/execute-queries.md +++ b/content/v2.0/query-data/execute-queries.md @@ -21,7 +21,7 @@ This guide covers the different options: ## Data Explorer Queries can be built, executed, and visualized in InfluxDB UI's Data Explorer. -![Data Explorer with Flux](/img/2-0-data-explorer-ui.png) +![Data Explorer with Flux](/img/data-explorer-beta-8.png) ## Influx REPL The [`influx repl` command](/v2.0/reference/cli/influx/repl) starts an interactive @@ -41,7 +41,7 @@ as either a file or raw Flux via stdin. ###### Run a query from a file ```bash -influx query @/path/to/query.flux +influx query --file /path/to/query.flux ``` ###### Pass raw Flux via stdin pipe diff --git a/content/v2.0/reference/cli/influx/config/_index.md b/content/v2.0/reference/cli/influx/config/_index.md index 77992186e..d8ac8a923 100644 --- a/content/v2.0/reference/cli/influx/config/_index.md +++ b/content/v2.0/reference/cli/influx/config/_index.md @@ -30,6 +30,12 @@ influx config influx config local-config ``` +To quickly switch back to the previous configuration, use the following command: + +```sh +influx config - +``` + ## Subcommands | Subcommand | Description | |:---- |:----------- | diff --git a/content/v2.0/reference/cli/influx/query/_index.md b/content/v2.0/reference/cli/influx/query/_index.md index 80705ca46..6746c0f60 100644 --- a/content/v2.0/reference/cli/influx/query/_index.md +++ b/content/v2.0/reference/cli/influx/query/_index.md @@ -16,14 +16,16 @@ or a literal Flux query contained in a file by specifying the file prefixed with ## Usage ``` -influx query [query literal or @/path/to/query.flux] [flags] +influx query [query literal] [flags] ``` ## Flags | Flag | Description | Input type | {{< cli/mapped >}} | -|:---- |:----------- |:----------:|:------------------ | +|----------------|------------------------------|:----------:|--------------------| +| `-f`, `--file` | Path to Flux script file | string | | | `-h`, `--help` | Help for the `query` command | | | -| `-o`, `--org` | Organization name | string | `INFLUX_ORG` | -| `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | +| `-o`, `--org` | Organization name | string | `INFLUX_ORG` | +| `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | + {{% cli/influx-global-flags %}} diff --git a/content/v2.0/reference/cli/influx/task/create.md b/content/v2.0/reference/cli/influx/task/create.md index 388374c1c..0d1cf7e6c 100644 --- a/content/v2.0/reference/cli/influx/task/create.md +++ b/content/v2.0/reference/cli/influx/task/create.md @@ -12,16 +12,18 @@ The `influx task create` command creates a new task in InfluxDB. ## Usage ``` -influx task create [query literal or @/path/to/query.flux] [flags] +influx task create [query literal] [flags] ``` ## Flags -| Flag | Description | Input type | {{< cli/mapped >}} | -|:---- |:----------- |:----------: |:------------------ | -| `-h`, `--help` | Help for the `create` command | | | -| `--hide-headers` | Hide table headers (default `false`) | | `INFLUX_HIDE_HEADERS` | -| `--json` | Output data as JSON (default `false`) | | `INFLUX_OUTPUT_JSON` | -| `--org` | Organization name | string | `INFLUX_ORG` | -| `--org-id` | Organiztion ID | string | `INFLUX_ORG_ID` | +| Flag | Description | Input type | {{< cli/mapped >}} | +|------------------|---------------------------------------|:----------:|-----------------------| +| `-f`, `--file` | Path to Flux script file | string | | +| `-h`, `--help` | Help for the `create` command | | | +| `--hide-headers` | Hide table headers (default `false`) | | `INFLUX_HIDE_HEADERS` | +| `--json` | Output data as JSON (default `false`) | | `INFLUX_OUTPUT_JSON` | +| `--org` | Organization name | string | `INFLUX_ORG` | +| `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | + {{% cli/influx-global-flags %}} diff --git a/content/v2.0/reference/cli/influx/task/update.md b/content/v2.0/reference/cli/influx/task/update.md index 6c62446d0..48b60ee19 100644 --- a/content/v2.0/reference/cli/influx/task/update.md +++ b/content/v2.0/reference/cli/influx/task/update.md @@ -18,10 +18,12 @@ influx task update [flags] ## Flags | Flag | Description | Input type | {{< cli/mapped >}} | |:---- |:----------- |:----------: |:------------------ | +| `-f`, `--file` | Path to Flux script file | string | | | `-h`, `--help` | Help for the `update` command | | | | `--hide-headers` | Hide table headers (default `false`) | | `INFLUX_HIDE_HEADERS` | | `-i`, `--id` | **(Required)** Task ID | string | | | `--json` | Output data as JSON (default `false`) | | `INFLUX_OUTPUT_JSON` | | `--status` | Update task status | string | | + {{% cli/influx-global-flags %}} diff --git a/content/v2.0/reference/cli/influx/write/_index.md b/content/v2.0/reference/cli/influx/write/_index.md index 0f68c7399..f593b05fb 100644 --- a/content/v2.0/reference/cli/influx/write/_index.md +++ b/content/v2.0/reference/cli/influx/write/_index.md @@ -1,8 +1,8 @@ --- title: influx write description: > - The 'influx write' command writes line protocol to InfluxDB either via a single - line of line protocol, or a via a file containing line protocol. + The `influx write` command writes data to InfluxDB via stdin or from a specified file. + Write data using line protocol or annotated CSV. menu: v2_0_ref: name: influx write @@ -11,20 +11,29 @@ weight: 101 v2.0/tags: [write] --- -The `influx write` writes a single line of line protocol to InfluxDB, -or adds an entire file specified with an `@` prefix. +The `influx write` command writes data to InfluxDB via stdin or from a specified file. +Write data using [line protocol](/v2.0/reference/syntax/line-protocol) or +[annotated CSV](/v2.0/reference/syntax/annotated-csv). ## Usage ``` -influx write [line protocol or @/path/to/points.txt] [flags] +influx write [flags] +influx write [command] ``` +## Subcommands +| Subcommand | Description | +|:---------- |:----------- | +| [dryrun](/v2.0/reference/cli/influx/write/dryrun) | Write to stdout instead of InfluxDB | + ## Flags | Flag | Description | Input type | {{< cli/mapped >}} | |:---- |:----------- |:----------:|:------------------ | | `-b`, `--bucket` | Bucket name | string | `INFLUX_BUCKET_NAME` | | `--bucket-id` | Bucket ID | string | `INFLUX_BUCKET_ID` | -| `-h`, `--help` | Help for the `write` command | | | +| `-f`, `--file` | File to import | string | | +| `--format` | Input format (`lp` or `csv`, default `lp`) | string | | +| `-h`, `--help` | Help for the `dryrun` command | | | | `-o`, `--org` | Organization name | string | `INFLUX_ORG` | | `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | | `-p`, `--precision` | Precision of the timestamps (default `ns`) | string | `INFLUX_PRECISION` | diff --git a/content/v2.0/reference/cli/influx/write/dryrun.md b/content/v2.0/reference/cli/influx/write/dryrun.md new file mode 100644 index 000000000..728c4f89e --- /dev/null +++ b/content/v2.0/reference/cli/influx/write/dryrun.md @@ -0,0 +1,38 @@ +--- +title: influx write dryrun +description: > + The 'influx write dryrun' command prints write output to stdout instead of writing + to InfluxDB. Use this command to test writing data. +menu: + v2_0_ref: + name: influx write dryrun + parent: influx write +weight: 101 +v2.0/tags: [write] +--- + +The `influx write dryrun` command prints write output to stdout instead of writing +to InfluxDB. Use this command to test writing data. + +Supports [line protocol](/v2.0/reference/syntax/line-protocol) and +[annotated CSV](/v2.0/reference/syntax/annotated-csv). +Output is always **line protocol**. + +## Usage +``` +influx write dryrun [flags] +``` + +## Flags +| Flag | Description | Input type | {{< cli/mapped >}} | +|:---- |:----------- |:----------:|:------------------ | +| `-b`, `--bucket` | Bucket name | string | `INFLUX_BUCKET_NAME` | +| `--bucket-id` | Bucket ID | string | `INFLUX_BUCKET_ID` | +| `-f`, `--file` | File to import | string | | +| `--format` | Input format (`lp` or `csv`, defaults `lp`) | string | | +| `-h`, `--help` | Help for the `dryrun` command | | | +| `-o`, `--org` | Organization name | string | `INFLUX_ORG` | +| `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | +| `-p`, `--precision` | Precision of the timestamps (default `ns`) | string | `INFLUX_PRECISION` | + +{{% cli/influx-global-flags %}} diff --git a/content/v2.0/reference/cli/influxd/_index.md b/content/v2.0/reference/cli/influxd/_index.md index 4b6bedd42..c391c80e9 100644 --- a/content/v2.0/reference/cli/influxd/_index.md +++ b/content/v2.0/reference/cli/influxd/_index.md @@ -7,6 +7,8 @@ menu: name: influxd parent: Command line tools weight: 102 +related: + - /v2.0/reference/config-options/ --- The `influxd` daemon starts and runs all the processes necessary for InfluxDB to function. @@ -30,33 +32,4 @@ influxd [command] ## Flags -| Flag | Description | Input type | -|:---- |:----------- | :--------: | -| `--assets-path` | Override default assets by serving from a specific directory (developer mode) | string | -| `--bolt-path` | Path to boltdb database (default `~/.influxdbv2/influxd.bolt`) | string | -| `--e2e-testing` | Add /debug/flush endpoint to clear stores; used for end-to-end tests (default `false`) | | -| `--engine-path` | Path to persistent engine files (default `~/.influxdbv2/engine`) | string | -| `-h`, `--help` | Help for the `influxd` command | | -| `--http-bind-address` | Bind address for the REST HTTP API (default `:9999`) | string | -| `--log-level` | Supported log levels are debug, info, and error (default `info`) | string | -| `--new-meta-store` | Enables the new meta store | | -| `--new-meta-store-read-only` | Toggle read-only mode for the new meta store and duplicate reads between old and new store (default `true`) | | -| `--no-tasks` | Disables the task scheduler | | -| `--reporting-disabled` | Disable sending telemetry data to **https://telemetry.influxdata.com** | | -| `--secret-store` | Data store for secrets (bolt or vault) (default `bolt`) | string | -| `--session-length` | TTL in minutes for newly created sessions (default `60`) | integer | -| `--session-renew-disabled` | Disables automatically extending session TTL on request | | -| `--store` | Data store for REST resources (bolt or memory) (default `bolt`) | string | -| `--tls-cert` | Path to TLS certificate file | string | -| `--tls-key` | Path to TLS private key file | string | -| `--tracing-type` | Supported tracing types (log or jaeger) | string | -| `--vault-addr ` | Address of the Vault server (example: `https://127.0.0.1:8200/`) | string | -| `--vault-cacert` | Path to a PEM-encoded CA certificate file | string | -| `--vault-capath` | Path to a directory of PEM-encoded CA certificate files | string | -| `--vault-client-cert` | Path to a PEM-encoded client certificate | string | -| `--vault-client-key` | Path to an unencrypted, PEM-encoded private key which corresponds to the matching client certificate | string | -| `--vault-max-retries` | Maximum number of retries when encountering a 5xx error code (default `2`) | integer | -| `--vault-client-timeout` | Vault client timeout (default `60s`) | duration | -| `--vault-skip-verify` | Skip certificate verification when communicating with Vault | | -| `--vault-tls-server-name` | Name to use as the SNI host when connecting to Vault via TLS | string | -| `--vault-token` | Vault authentication token | string | +{{% cli/influxd-flags %}} diff --git a/content/v2.0/reference/cli/influxd/run.md b/content/v2.0/reference/cli/influxd/run.md index 0c46f1035..e6445e00a 100644 --- a/content/v2.0/reference/cli/influxd/run.md +++ b/content/v2.0/reference/cli/influxd/run.md @@ -6,6 +6,8 @@ menu: v2_0_ref: parent: influxd weight: 201 +related: + - /v2.0/reference/config-options/ --- The `influxd run` command is the default command for `influxd`. @@ -28,30 +30,4 @@ influxd run ## Flags -| Flag | Description | Input type | -| :--------------------- | :---------------------------------------------------------------------------------------------------- | :--------: | -| `--assets-path` | Override default assets by serving from a specific directory (developer mode) | string | -| `--bolt-path` | Path to boltdb database (default `~/.influxdbv2/influxd.bolt`) | string | -| `--e2e-testing` | Add /debug/flush endpoint to clear stores; used for end-to-end tests (default `false`) | | -| `--engine-path` | Path to persistent engine files (default `~/.influxdbv2/engine`) | string | -| `-h`, `--help` | Help for the `influxd` command | | -| `--http-bind-address` | Bind address for the REST HTTP API (default `:9999`) | string | -| `--log-level` | Supported log levels are debug, info, and error (default `info`) | string | -| `--reporting-disabled` | Disable sending telemetry data to **https://telemetry.influxdata.com** | | -| `--secret-store` | Data store for secrets (bolt or vault) (default `bolt`) | string | -| `--session-length` | TTL in minutes for newly created sessions (default `60`) | integer | -| `--session-renew-disabled` | Disables automatically extending session TTL on request | | -| `--store` | Data store for REST resources (bolt or memory) (default `bolt`) | string | -| `--tls-cert` | Path to TLS certificate file | string | -| `--tls-key` | Path to TLS private key file | string | -| `--tracing-type` | Supported tracing types (log or jaeger) | string | -| `--vault-addr ` | Address of the Vault server (example: `https://127.0.0.1:8200/`) | string | -| `--vault-cacert` | Path to a PEM-encoded CA certificate file | string | -| `--vault-capath` | Path to a directory of PEM-encoded CA certificate files | string | -| `--vault-client-cert` | Path to a PEM-encoded client certificate | string | -| `--vault-client-key` | Path to an unencrypted, PEM-encoded private key which corresponds to the matching client certificate | string | -| `--vault-max-retries` | Maximum number of retries when encountering a 5xx error code (default `2`) | integer | -| `--vault-client-timeout` | Vault client timeout (default `60s`) | duration | -| `--vault-skip-verify` | Skip certificate verification when communicating with Vault | | -| `--vault-tls-server-name` | Name to use as the SNI host when connecting to Vault via TLS | string | -| `--vault-token` | Vault authentication token | string | +{{% cli/influxd-flags %}} diff --git a/content/v2.0/reference/config-options.md b/content/v2.0/reference/config-options.md index 1770b42e4..8da33793b 100644 --- a/content/v2.0/reference/config-options.md +++ b/content/v2.0/reference/config-options.md @@ -18,6 +18,14 @@ To configure InfluxDB, use the following configuration options when starting the - [--engine-path](#engine-path) - [--http-bind-address](#http-bind-address) - [--log-level](#log-level) +- [--new-meta-store](#new-meta-store) +- [--new-meta-store-read-only](#new-meta-store-read-only) +- [--no-tasks](#no-tasks) +- [--query-concurrency](#query-concurrency) +- [--query-initial-memory-bytes](#query-initial-memory-bytes) +- [--query-max-memory-bytes](#query-max-memory-bytes) +- [--query-memory-bytes](#query-memory-bytes) +- [--query-queue-size](#query-queue-size) - [--reporting-disabled](#reporting-disabled) - [--secret-store](#secret-store) - [--session-length](#session-length) @@ -40,8 +48,8 @@ To configure InfluxDB, use the following configuration options when starting the --- ## --assets-path +Override the default InfluxDB user interface (UI) assets by serving assets from the specified directory. _Typically, InfluxData internal use only._ -Overrides the default InfluxDB user interface (UI) assets by serving assets from the specified directory. ```sh influxd --assets-path=/path/to/custom/assets-dir @@ -50,7 +58,7 @@ influxd --assets-path=/path/to/custom/assets-dir --- ## --bolt-path -Defines the path to the [BoltDB](https://github.com/boltdb/bolt) database. +Define the path to the [BoltDB](https://github.com/boltdb/bolt) database. BoltDB is a key value store written in Go. InfluxDB uses BoltDB to store data including organization and user information, UI data, REST resources, and other key value data. @@ -64,7 +72,7 @@ influxd --bolt-path=~/.influxdbv2/influxd.bolt --- ## --e2e-testing -Adds a `/debug/flush` endpoint to the InfluxDB HTTP API to clear stores. +Add a `/debug/flush` endpoint to the InfluxDB HTTP API to clear stores. InfluxData uses this endpoint in end-to-end testing. ```sh @@ -74,7 +82,7 @@ influxd --e2e-testing --- ## --engine-path -Defines the path to persistent storage engine files where InfluxDB stores all +Define the path to persistent storage engine files where InfluxDB stores all Time-Structure Merge Tree (TSM) data on disk. **Default:** `~/.influxdbv2/engine` @@ -86,7 +94,7 @@ influxd --engine-path=~/.influxdbv2/engine --- ## --http-bind-address -Defines the bind address for the InfluxDB HTTP API. +Define the bind address for the InfluxDB HTTP API. Customize the URL and port for the InfluxDB API and UI. **Default:** `:9999` @@ -98,7 +106,7 @@ influxd --http-bind-address=:9999 --- ## --log-level -Defines the log output level. +Define the log output level. InfluxDB outputs log entries with severity levels greater than or equal to the level specified. **Options:** `debug`, `info`, `error` @@ -110,6 +118,101 @@ influxd --log-level=info --- +## --new-meta-store +Enable the new meta store. + +**Default:** `false` + +```sh +influxd --new-meta-store=false +``` + +--- + +## --new-meta-store-read-only +Toggle read-only mode for the new meta store. +If `true`, reads are duplicated between old and new meta stores +(if [new meta store](#new-meta-store) is enabled). + +**Default:** `true` + +```sh +influxd --new-meta-store-read-only=true +``` + +--- + +## --no-tasks +Disable the task scheduler. +If problematic tasks prevent InfluxDB from starting, use this option to start +InfluxDB without scheduling or executing tasks. + +```sh +influxd --no-tasks +``` + +--- + +## --query-concurrency +Number of queries allowed to execute concurrently. + +**Default:** `10` + +```sh +influxd --query-concurrency=10 +``` + +--- + +## --query-initial-memory-bytes +Initial bytes of memory allocated for a query. + +**Default:** _equal to_ [query-memory-bytes](#query-memory-bytes) + +```sh +influxd --query-initial-memory-bytes=10485760 +``` + +--- + +## --query-max-memory-bytes +Maximum total bytes of memory allowed for queries. + +**Default:** _equal to_ [query-concurrency](#query-concurrency) × [query-memory-bytes](#query-memory-bytes) + +```sh +influxd --query-max-memory-bytes=104857600 +``` + +--- + +## --query-memory-bytes +Maximum bytes of memory allowed for a single query. + +**Default:** _unlimited_ + +{{% note %}} +Must be greater than or equal to [query-initial-memory-bytes](#query-initial-memory-bytes). +{{% /note %}} + +```sh +influxd --query-memory-bytes=10485760 +``` + +--- + +## --query-queue-size +Maximum number of queries allowed in execution queue. +When queue limit is reached, new queries are rejected. + +**Default:** `10` + +```sh +influxd --query-queue-size=10 +``` + +--- + ## --reporting-disabled Disables sending telemetry data to InfluxData. The [InfluxData telemetry](https://www.influxdata.com/telemetry) page provides diff --git a/content/v2.0/reference/release-notes/influxdb.md b/content/v2.0/reference/release-notes/influxdb.md index 7da9e150a..04e0213e0 100644 --- a/content/v2.0/reference/release-notes/influxdb.md +++ b/content/v2.0/reference/release-notes/influxdb.md @@ -7,6 +7,25 @@ menu: parent: Release notes weight: 101 --- +## v2.0.0-beta.8 [2020-04-10] + +### Features +- Add `influx config` CLI command to switch back to previous activated configuration. +- Introduce new navigation menu. +- Add `-file` option to `influx query` and `influx task` CLI commands. +- Add support for command line options to limit memory for queries. + +### Bug Fixes +- Fix card size and layout issues in dashboards index view. +- Fix check graph font and lines defaulting to black causing graph to be unreadable +- Fix text-wrapping display issue and popover sizing bug when adding labels to a resource. +- Respect the now-time of the compiled query if provided. +- Fix spacing between ticks. +- Fix typos in Flux functions list. + +### UI Improvements +- Update layout of Alerts page to work on all screen sizes. +- Sort dashboards on Getting Started page by recently modified. ## v2.0.0-beta.7 [2020-03-27] diff --git a/content/v2.0/reference/syntax/annotated-csv.md b/content/v2.0/reference/syntax/annotated-csv.md index 854be0c2d..9b1a8db49 100644 --- a/content/v2.0/reference/syntax/annotated-csv.md +++ b/content/v2.0/reference/syntax/annotated-csv.md @@ -2,8 +2,9 @@ title: Annotated CSV syntax list_title: Annotated CSV description: > - Flux returns raw results in Annotated CSV format and also reads Annotated CSV - using the `csv.from()` function. + InfluxDB and Flux return query results in annotated CSV format. + You can also read annotated CSV directly from Flux with the `csv.from()` function + or write data to InfluxDB using annotated CSV and the `influx write` command. weight: 103 menu: v2_0_ref: @@ -14,12 +15,12 @@ aliases: - /v2.0/reference/annotated-csv/ --- -Flux returns raw results in Annotated CSV format and also reads Annotated CSV -using the [`csv.from()` function](/v2.0/reference/flux/stdlib/csv/from/). +InfluxDB and Flux return query results in annotated CSV format. +You can also read annotated CSV directly from Flux with the [`csv.from()` function](/v2.0/reference/flux/stdlib/csv/from/) +or write data to InfluxDB using annotated CSV and the `influx write` command. CSV tables must be encoded in UTF-8 and Unicode Normal Form C as defined in [UAX15](http://www.unicode.org/reports/tr15/). -Line endings must be CRLF (Carriage Return Line Feed) as defined by the `text/csv` -MIME type in [RFC 4180](https://tools.ietf.org/html/rfc4180). +InfluxDB removes carriage returns before newline characters. ## Examples @@ -59,7 +60,7 @@ Encoding of a table with and without a header row. {{% /code-tabs %}} {{% code-tab-content %}} -```js +```sh result,table,_start,_stop,_time,region,host,_value my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 @@ -68,7 +69,7 @@ my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,east, {{% /code-tab-content %}} {{% code-tab-content %}} -```js +```sh my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,east,C,52.62 @@ -111,7 +112,7 @@ Encoding of two tables in the same result with the same schema (header row) and {{% /code-tabs %}} {{% code-tab-content %}} -```js +```sh result,table,_start,_stop,_time,region,host,_value my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 @@ -124,7 +125,7 @@ my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,west, {{% /code-tab-content %}} {{% code-tab-content %}} -```js +```sh ,result,table,_start,_stop,_time,region,host,_value ,my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 ,my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 @@ -138,7 +139,7 @@ my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,west, {{% /code-tab-content %}} {{< /code-tabs-wrapper >}} -### Dialect options +## Dialect options Flux supports the following dialect options for `text/csv` format. @@ -150,25 +151,105 @@ Flux supports the following dialect options for `text/csv` format. | **annotations** | List of annotations to encode (datatype, group, or default). | `empty` | | **commentPrefix** | String prefix to identify a comment. Always added to annotations. | `#` | -### Annotations +## Annotations Annotation rows describe column properties, and start with `#` (or commentPrefix value). The first column in an annotation row always contains the annotation name. Subsequent columns contain annotation values as shown in the table below. -| Annotation name | Values | Description | -|:-------- |:--------- | :------- | -| **datatype** | a [valid data type](#valid-data-types) | Describes the type of data. | -| **group** | boolean flag `true` or `false` | Indicates the column is part of the group key. | -| **default** | a [valid data type](#valid-data-types) | Value to use for rows with an empty string value. | +| Annotation name | Values | Description | +|:-------- |:--------- | :------- | +| **datatype** | a [data type](#data-types) or [line protocol element](#line-protocol-elements) | Describes the type of data or which line protocol element the column represents. | +| **group** | boolean flag `true` or `false` | Indicates the column is part of the group key. | +| **default** | a value of the column's data type | Value to use for rows with an empty value. | + {{% note %}} -To encode a table with its group key, the `datatype`, `group`, and `default` annotations must be included. If a table has no rows, the `default` annotation provides the group key values. +To encode a table with its [group key](/v2.0/reference/glossary/#group-key), +the `datatype`, `group`, and `default` annotations must be included. +If a table has no rows, the `default` annotation provides the group key values. {{% /note %}} -##### Example +## Data types -Example encoding of datatype, group, and default annotations. +| Datatype | Flux type | Description | +| :-------- | :--------- | :---------- | +| boolean | bool | "true" or "false" | +| unsignedLong | uint | unsigned 64-bit integer | +| long | int | signed 64-bit integer | +| double | float | IEEE-754 64-bit floating-point number | +| string | string | UTF-8 encoded string | +| base64Binary | bytes | base64 encoded sequence of bytes as defined in RFC 4648 | +| dateTime | time | instant in time, may be followed with a colon : and a description of the format (number, RFC3339, RFC3339Nano) | +| duration | duration | length of time represented as an unsigned 64-bit integer number of nanoseconds | + + +## Line protocol elements +The `datatype` annotation accepts accepts [data types](#data-types) and **line protocol elements**. +Line protocol elements identify how columns are converted into line protocol when using the +[`influx write` command](/v2.0/reference/cli/influx/write/) to write annotated CSV to InfluxDB. + +| Line protocol element | Description | +|:--------------------- |:----------- | +| `measurement` | column value is the measurement | +| `field` _(default)_ | column header is the field key, column value is the field value | +| `tag` | column header is the tag key, column value is the tag value | +| `time` | column value is the timestamp _(alias for `dateTime`)_ | +| `ignore` or`ignored` | column is ignored and not included in line protocol | + +### Mixing data types and line protocol elements +Columns with [data types](#data-types) (other than `dateTime`) in the +`#datatype` annotation are treated as **fields** when converted to line protocol. +Columns without a specified data type default to `field` when converted to line protocol +and **column values are left unmodified** in line protocol. +_See an example [below](#example-of-mixing-data-types-line-protocol-elements) and +[line protocol data types and format](/v2.0/reference/syntax/line-protocol/#data-types-and-format)._ + +### Time columns +A column with `time` or `dateTime` `#datatype` annotations are used as the timestamp +when converted to line protocol. +If there are multiple `time` or `dateTime` columns, the last column (on the right) +is used as the timestamp in line protocol. +Other time columns are ignored and the `influx write` command outputs a warning. + +Time column values should be **Unix timestamps** (in an [accepted timestamp precision](/v2.0/write-data/#timestamp-precision)), +**RFC3339**, or **RFC3339Nano**. + +##### Example line protocol elements in datatype annotation +``` +#datatype measurement,tag,tag,field,field,ignored,time +m,cpu,host,time_steal,usage_user,nothing,time +cpu,cpu1,host1,0,2.7,a,1482669077000000000 +cpu,cpu1,host2,0,2.2,b,1482669087000000000 +``` + +Resulting line protocol: + +``` +cpu,cpu=cpu1,host=host1 time_steal=0,usage_user=2.7 1482669077000000000 +cpu,cpu=cpu1,host=host2 time_steal=0,usage_user=2.2 1482669087000000000 +``` + +##### Example of mixing data types line protocol elements +``` +#datatype measurement,tag,string,double,boolean,long,unsignedLong,duration,dateTime +#default test,annotatedDatatypes,,,,,, +m,name,s,d,b,l,ul,dur,time +,,str1,1.0,true,1,1,1ms,1 +,,str2,2.0,false,2,2,2us,2020-01-11T10:10:10Z +``` + +Resulting line protocol: + +``` +test,name=annotatedDatatypes s="str1",d=1,b=true,l=1i,ul=1u,dur=1000000i 1 +test,name=annotatedDatatypes s="str2",d=2,b=false,l=2i,ul=2u,dur=2000i 1578737410000000000 +``` + +## Annotated CSV in Flux +Flux requires all annotation and header rows in annotated CSV. +The example below illustrates how to use the [`csv.from()` function](/v2.0/reference/flux/stdlib/csv/from/) +to read annotated CSV in Flux: ```js import "csv" @@ -177,29 +258,21 @@ csvData = "#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3 #group,false,false,false,false,false,false,false,false #default,,,,,,,, ,result,table,_start,_stop,_time,region,host,_value -,my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 -,my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 -,my-result,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,east,C,52.62 -,my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,west,A,62.73 -,my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,west,B,12.83 -,my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,west,C,51.62 +,,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,east,A,15.43 +,,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,east,B,59.25 +,,0,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,east,C,52.62 +,,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,west,A,62.73 +,,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:20Z,west,B,12.83 +,,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,west,C,51.62 " csv.from(csv: csvData) ``` -### Valid data types - -| Datatype | Flux type | Description | -| :-------- | :--------- | :---------- | -| boolean | bool | a truth value, one of "true" or "false" | -| unsignedLong | uint | an unsigned 64-bit integer | -| long | int | a signed 64-bit integer | -| double | float | an IEEE-754 64-bit floating-point number | -| string | string | a UTF-8 encoded string | -| base64Binary | bytes | a base64 encoded sequence of bytes as defined in RFC 4648 | -| dateTime | time | an instant in time, may be followed with a colon : and a description of the format | -| duration | duration | a length of time represented as an unsigned 64-bit integer number of nanoseconds | +{{% warn %}} +Flux only supports [data types](#data-types) in the `#datatype` annotation. +It does **does not** support [line protocol elements](#line-protocol-elements). +{{% /warn %}} ## Errors @@ -218,7 +291,7 @@ If an error occurs: Encoding for an error with the datatype annotation: -```csv +``` #datatype,string,long ,error,reference ,Failed to parse query,897 @@ -226,7 +299,7 @@ Encoding for an error with the datatype annotation: Encoding for an error that occurs after a valid table has been encoded: -```csv +``` #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double ,result,table,_start,_stop,_time,region,host,_value ,my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:00Z,west,A,62.73 @@ -234,7 +307,7 @@ Encoding for an error that occurs after a valid table has been encoded: ,my-result,1,2018-05-08T20:50:00Z,2018-05-08T20:51:00Z,2018-05-08T20:50:40Z,west,C,51.62 ``` -```csv +``` #datatype,string,long ,error,reference,query terminated: reached maximum allowed memory limits,576 ``` diff --git a/content/v2.0/security/tokens/create-token.md b/content/v2.0/security/tokens/create-token.md index 748cbbe01..f5c1b93b2 100644 --- a/content/v2.0/security/tokens/create-token.md +++ b/content/v2.0/security/tokens/create-token.md @@ -16,15 +16,14 @@ command line interface (CLI). ## Create a token in the InfluxDB UI -1. Click the **Load Data** icon in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Tokens**. {{< nav-icon "disks" >}} -2. Click **Tokens**. -3. Click **{{< icon "plus" >}} Generate** and select a token type +2. Click **{{< icon "plus" >}} Generate** and select a token type (**Read/Write Token** or **All Access Token**). -4. In the window that appears, enter a description for your token in the **Description** field. -5. If generating a **read/write token**: +3. In the window that appears, enter a description for your token in the **Description** field. +4. If generating a **read/write token**: - Search for and select buckets to read from in the **Read** pane. - Search for and select buckets to write to in the **Write** pane. 5. Click **Save**. diff --git a/content/v2.0/security/tokens/delete-token.md b/content/v2.0/security/tokens/delete-token.md index e7ea5fb89..d0b1d37f2 100644 --- a/content/v2.0/security/tokens/delete-token.md +++ b/content/v2.0/security/tokens/delete-token.md @@ -17,12 +17,11 @@ have access to your InfluxDB instance. ## Delete tokens in the InfluxDB UI -1. Click the Click the **Load Data** icon in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Tokens**. {{< nav-icon "disks" >}} -2. Click **Tokens**. All of your account's tokens appear. -3. Hover over the token you want to delete and click **Delete** and **Confirm**. +2. Hover over the token you want to delete and click **Delete** and **Confirm**. ## Delete tokens using the influx CLI diff --git a/content/v2.0/security/tokens/update-tokens.md b/content/v2.0/security/tokens/update-tokens.md index ed979902f..22b7b1f00 100644 --- a/content/v2.0/security/tokens/update-tokens.md +++ b/content/v2.0/security/tokens/update-tokens.md @@ -15,19 +15,17 @@ Update an authentication token's description using the InfluxDB user interface ( ## Update a token in the InfluxDB UI -1. Click the **Load Data** icon in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Tokens**. {{< nav-icon "disks" >}} -2. Click **Tokens**. All of your account's tokens appear. -3. Click the pencil icon {{< icon "pencil" >}} next to the token's name in the **Description** column. -4. Update the token description, then click anywhere else to save. +2. Click the pencil icon {{< icon "pencil" >}} next to the token's name in the **Description** column. +3. Update the token description, then click anywhere else to save. ## Enable or disable a token -1. Click the **Load Data** icon in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Tokens**. {{< nav-icon "disks" >}} -2. Click **Tokens**. All of your account's tokens appear. -3. Click the **{{< icon "toggle-green" >}} Status** toggle. +2. Click the **{{< icon "toggle-green" >}} Status** toggle. diff --git a/content/v2.0/security/tokens/view-tokens.md b/content/v2.0/security/tokens/view-tokens.md index 2de383107..7e2730e50 100644 --- a/content/v2.0/security/tokens/view-tokens.md +++ b/content/v2.0/security/tokens/view-tokens.md @@ -16,12 +16,11 @@ command line interface (CLI). ## View tokens in the InfluxDB UI -1. Click the **Load Data** icon in the navigation bar. +1. In the navigation menu on the left, select **Data (Load Data)** > **Tokens**. {{< nav-icon "disks" >}} -2. Click **Tokens**. All of your account's tokens appear. -3. Click a token name from the list to view the token and a summary of access permissions. +2. Click a token name from the list to view the token and a summary of access permissions. ## View tokens using the influx CLI diff --git a/content/v2.0/visualize-data/dashboards/control-dashboard.md b/content/v2.0/visualize-data/dashboards/control-dashboard.md index d01c99abc..f83059933 100644 --- a/content/v2.0/visualize-data/dashboards/control-dashboard.md +++ b/content/v2.0/visualize-data/dashboards/control-dashboard.md @@ -12,7 +12,7 @@ weight: 203 ## Control at the dashboard level -Use dashboard controls in the upper right to update your dashboard. +Use dashboard controls in the upper left to update your dashboard. ### Add a cell diff --git a/content/v2.0/visualize-data/dashboards/create-dashboard.md b/content/v2.0/visualize-data/dashboards/create-dashboard.md index 5f34a000e..1212a059b 100644 --- a/content/v2.0/visualize-data/dashboards/create-dashboard.md +++ b/content/v2.0/visualize-data/dashboards/create-dashboard.md @@ -14,7 +14,7 @@ weight: 201 ## Create a new dashboard -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} @@ -24,7 +24,7 @@ weight: 201 **To import an existing dashboard**: -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} @@ -38,7 +38,7 @@ weight: 201 **To create a dashboard from a template in the dashboards page**: -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} @@ -62,7 +62,7 @@ weight: 201 ## Clone a dashboard -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} @@ -79,7 +79,7 @@ weight: 201 You can also send data to your dashboard directly from the Data Explorer. For details, [Explore metrics](/v2.0/visualize-data/explore-metrics). #### Add a note to your dashboard -1. From your dashboard, click **{{< icon "note" >}} Add Note** in the upper right. +1. From your dashboard, click **{{< icon "note" >}} Add Note** in the upper left. 2. Enter your note in the window that appears. You can use Markdown syntax to format your note. 3. To preview your Markdown formatting, click the **Preview** option. 4. Click **Save**. diff --git a/content/v2.0/visualize-data/dashboards/delete-dashboard.md b/content/v2.0/visualize-data/dashboards/delete-dashboard.md index 717e36e08..1a65f7fec 100644 --- a/content/v2.0/visualize-data/dashboards/delete-dashboard.md +++ b/content/v2.0/visualize-data/dashboards/delete-dashboard.md @@ -11,7 +11,7 @@ weight: 204 To delete a dashboard from the InfluxDB user interface (UI): -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} diff --git a/content/v2.0/visualize-data/dashboards/export-dashboard.md b/content/v2.0/visualize-data/dashboards/export-dashboard.md index 0a2608631..4a0f8496a 100644 --- a/content/v2.0/visualize-data/dashboards/export-dashboard.md +++ b/content/v2.0/visualize-data/dashboards/export-dashboard.md @@ -15,7 +15,7 @@ InfluxDB lets you export dashboards from the InfluxDB user interface (UI). ## Export a dashboard -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} diff --git a/content/v2.0/visualize-data/explore-metrics.md b/content/v2.0/visualize-data/explore-metrics.md index 833293fc6..9105307ef 100644 --- a/content/v2.0/visualize-data/explore-metrics.md +++ b/content/v2.0/visualize-data/explore-metrics.md @@ -16,7 +16,7 @@ The InfluxDB user interface (UI) allows you to move seamlessly between using the Flux builder or templates and manually editing the query. Choose between [visualization types](/v2.0/visualize-data/visualization-types/) for your query. -To open the **Data Explorer**, click the **Data Explorer** icon in the navigation bar: +To open the **Data Explorer**, click the **Explore** (**Data Explorer**) icon in the left navigation menu: {{< nav-icon "data-explorer" >}} @@ -26,7 +26,7 @@ Flux is InfluxData's functional data scripting language designed for querying, analyzing, and acting on time series data. See [Get started with Flux](/v2.0/query-data/get-started) to learn more about Flux. -1. Click the **Data Explorer** icon in the sidebar. +1. In the navigation menu on the left, select **Explore* (**Data Explorer**). {{< nav-icon "data-explorer" >}} @@ -48,14 +48,10 @@ See [Get started with Flux](/v2.0/query-data/get-started) to learn more about Fl Select from available [visualization types](/v2.0/visualize-data/visualization-types/) or enable the **View Raw Data** option to view all of your query's results. -1. Select a visualization type from the dropdown menu in the upper-left. +Select a visualization type from the dropdown menu in the upper-left. {{< img-hd src="/img/2-0-visualization-dropdown.png" title="Visualization dropdown" />}} -2. Select the **Visualization** tab at the bottom of the **Data Explorer**. - For details about all of the available visualization options, see - [Visualization types](/v2.0/visualize-data/visualization-types/). - ## Control your dashboard cell To open the cell editor overlay, click the gear icon in the upper right of a cell and select **Configure**. @@ -65,7 +61,7 @@ To open the cell editor overlay, click the gear icon in the upper right of a cel Toggle the **View Raw Data** {{< icon "toggle" >}} option to see your data in table format instead of a graph. Use this option when data can't be visualized using a visualization type. - {{< img-hd src="/img/2-0-controls-view-raw-data.png" alt="View raw data" />}} + {{< img-hd src="/img/beta-8-raw-data.png" alt="View raw data" />}} ### Save as CSV @@ -75,7 +71,7 @@ Click the CSV icon to save the cells contents as a CSV file. Select how frequently to refresh the dashboard's data. By default, refreshing is paused. -{{< img-hd src="/img/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}} +{{< img-hd src="/img/beta-8-interval-dropdown.png" alt="Select refresh interval" />}} ### Manually refresh dashboard diff --git a/content/v2.0/visualize-data/labels.md b/content/v2.0/visualize-data/labels.md index 48a260409..cb6ea8592 100644 --- a/content/v2.0/visualize-data/labels.md +++ b/content/v2.0/visualize-data/labels.md @@ -14,11 +14,10 @@ weight: 104 Labels are a way to add visual metadata to dashboards, tasks, and other items in the InfluxDB UI. To manage labels: -1. Click the **Settings** icon in the navigation bar. +- In the navigation menu on the left, select **Settings** > **Labels**. {{< nav-icon "settings" >}} -2. Click **Labels**. #### Create a label 1. Click **{{< icon "plus" >}} Create Label**. diff --git a/content/v2.0/visualize-data/templates/create-template.md b/content/v2.0/visualize-data/templates/create-template.md index be07b6c5e..6697dfc15 100644 --- a/content/v2.0/visualize-data/templates/create-template.md +++ b/content/v2.0/visualize-data/templates/create-template.md @@ -13,7 +13,7 @@ weight: 201 ## Create a template from an existing dashboard -1. Click the **Dashboards** icon in the navigation bar. +1. In the navigation menu on the left, select **Boards** (**Dashboards**). {{< nav-icon "dashboards" >}} @@ -28,11 +28,10 @@ weight: 201 Only [user templates](/v2.0/visualize-data/templates/#dashboard-template-types) can be cloned. {{% /note %}} -1. Click the **Settings** icon in the left navigation. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "settings" >}} -2. Select the **Templates** tab. 3. Select **User Templates**. {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}} @@ -42,11 +41,10 @@ Only [user templates](/v2.0/visualize-data/templates/#dashboard-template-types) ## Import an existing dashboard template -1. Click the **Settings** icon in the left navigation. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "settings" >}} -2. Select the **Templates** tab. 3. Click **Import Template** in the upper right. 4. In the window that appears: * Select **Upload File** to drag-and-drop or select a file. diff --git a/content/v2.0/visualize-data/templates/delete-template.md b/content/v2.0/visualize-data/templates/delete-template.md index d7bcf0c31..2211bed39 100644 --- a/content/v2.0/visualize-data/templates/delete-template.md +++ b/content/v2.0/visualize-data/templates/delete-template.md @@ -13,10 +13,9 @@ weight: 203 To delete a template in the InfluxDB UI: -1. Click the **Settings** icon in the left navigation. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "settings" >}} -2. Select the **Templates** tab. 3. Hover over the name of the template you want to delete, then click **{{< icon "trash" >}}**. 3. Click **Delete** to delete your dashboard. diff --git a/content/v2.0/visualize-data/templates/use-template.md b/content/v2.0/visualize-data/templates/use-template.md index 73398ec00..c3a902890 100644 --- a/content/v2.0/visualize-data/templates/use-template.md +++ b/content/v2.0/visualize-data/templates/use-template.md @@ -13,11 +13,10 @@ weight: 202 To create a new dashboard from an InfluxDB dashboard template: -1. Click the **Settings** icon in the left navigation. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "settings" >}} -2. Select the **Templates** tab. 3. Select the [template type](/v2.0/visualize-data/templates/#dashboard-template-types). {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}} diff --git a/content/v2.0/visualize-data/templates/view-template.md b/content/v2.0/visualize-data/templates/view-template.md index 45ee9b6d3..0689c944b 100644 --- a/content/v2.0/visualize-data/templates/view-template.md +++ b/content/v2.0/visualize-data/templates/view-template.md @@ -12,11 +12,10 @@ weight: 202 To view templates in the InfluxDB userface (UI): -1. Click the **Settings** icon in the left navigation. +1. In the navigation menu on the left, select **Settings** > **Templates**. {{< nav-icon "settings" >}} -2. Select the **Templates** tab. 3. Select templates to view: {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}} diff --git a/content/v2.0/visualize-data/visualization-types/gauge.md b/content/v2.0/visualize-data/visualization-types/gauge.md index 951cd4a77..ad87b5697 100644 --- a/content/v2.0/visualize-data/visualization-types/gauge.md +++ b/content/v2.0/visualize-data/visualization-types/gauge.md @@ -13,7 +13,7 @@ menu: The **Gauge** visualization displays the most recent value for a time series in a gauge. -{{< img-hd src="/img/2-0-visualizations-gauge-example.png" alt="Gauge example" />}} +{{< img-hd src="/img/2-0-visualizations-gauge-example-8.png" alt="Gauge example" />}} Select the **Gauge** option from the visualization dropdown in the upper right. @@ -64,4 +64,4 @@ from(bucket: "example-bucket") ``` ###### Visualization options for pressure gauge -{{< img-hd src="/img/2-0-visualizations-guage-pressure.png" alt="Pressure guage example" />}} +{{< img-hd src="/img/2-0-visualizations-gauge-pressure-8.png" alt="Pressure guage example" />}} diff --git a/content/v2.0/visualize-data/visualization-types/graph-single-stat.md b/content/v2.0/visualize-data/visualization-types/graph-single-stat.md index 2bc556c7d..ca5a90da9 100644 --- a/content/v2.0/visualize-data/visualization-types/graph-single-stat.md +++ b/content/v2.0/visualize-data/visualization-types/graph-single-stat.md @@ -18,7 +18,7 @@ related: The **Graph + Single Stat** view displays the specified time series in a line graph and overlays the single most recent value as a large numeric value. -{{< img-hd src="/img/2-0-visualizations-line-graph-single-stat-example.png" alt="Line Graph + Single Stat example" />}} +{{< img-hd src="/img/2-0-visualizations-line-graph-single-stat-example-8.png" alt="Line Graph + Single Stat example" />}} Select the **Graph + Single Stat** option from the visualization dropdown in the upper right. @@ -92,5 +92,5 @@ from(bucket: "example-bucket") r._field == "used_percent" ) ``` -###### Memory usage visualization -{{< img-hd src="/img/2-0-visualizations-graph-single-stat-mem.png" alt="Graph + Single Stat Memory Usage Example" />}} +###### Memory allocations visualization +{{< img-hd src="/img/2-0-visualizations-graph-single-stat-mem-8.png" alt="Graph + Single Stat Memory Usage Example" />}} diff --git a/content/v2.0/visualize-data/visualization-types/graph.md b/content/v2.0/visualize-data/visualization-types/graph.md index c21988049..fc41435d7 100644 --- a/content/v2.0/visualize-data/visualization-types/graph.md +++ b/content/v2.0/visualize-data/visualization-types/graph.md @@ -14,7 +14,7 @@ menu: The Graph visualization provides several types of graphs, each configured through the [Graph controls](#graph-controls). -{{< img-hd src="/img/2-0-visualizations-line-graph-example.png" alt="Line Graph example" />}} +{{< img-hd src="/img/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}} Select the **Graph** option from the visualization dropdown in the upper right. @@ -59,13 +59,13 @@ the visualization dropdown. ## Graph Examples ##### Graph with linear interpolation -{{< img-hd src="/img/2-0-visualizations-line-graph-example.png" alt="Line Graph example" />}} +{{< img-hd src="/img/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}} ##### Graph with smooth interpolation -{{< img-hd src="/img/2-0-visualizations-line-graph-smooth-example.png" alt="Step-Plot Graph example" />}} +{{< img-hd src="/img/2-0-visualizations-line-graph-smooth-example-8.png" alt="Step-Plot Graph example" />}} ##### Graph with step interpolation -{{< img-hd src="/img/2-0-visualizations-line-graph-step-example.png" alt="Step-Plot Graph example" />}} +{{< img-hd src="/img/2-0-visualizations-line-graph-step-example-8.png" alt="Step-Plot Graph example" />}} diff --git a/content/v2.0/visualize-data/visualization-types/single-stat.md b/content/v2.0/visualize-data/visualization-types/single-stat.md index 94ccf7bd7..3873be82e 100644 --- a/content/v2.0/visualize-data/visualization-types/single-stat.md +++ b/content/v2.0/visualize-data/visualization-types/single-stat.md @@ -13,7 +13,7 @@ menu: The **Single Stat** view displays the most recent value of the specified time series as a numerical value. -{{< img-hd src="/img/2-0-visualizations-single-stat-example.png" alt="Single stat example" />}} +{{< img-hd src="/img/2-0-visualizations-single-stat-example-8.png" alt="Single stat example" />}} Select the **Single Stat** option from the visualization dropdown in the upper right. @@ -62,4 +62,4 @@ from(bucket: "example-bucket") ``` ###### Memory usage as a single stat -{{< img-hd src="/img/2-0-visualizations-single-stat-memor.png" alt="Graph + Single Stat Memory Usage Example" />}} +{{< img-hd src="/img/2-0-visualizations-single-stat-example-8.png" alt="Graph + Single Stat Memory Usage Example" />}} diff --git a/content/v2.0/write-data/_index.md b/content/v2.0/write-data/_index.md index 34ab545b4..9760e4b1e 100644 --- a/content/v2.0/write-data/_index.md +++ b/content/v2.0/write-data/_index.md @@ -9,6 +9,12 @@ menu: v2_0: name: Write data v2.0/tags: [write, line protocol] +related: + - /v2.0/write-data/use-telegraf/ + - /v2.0/api/#tag/Write, InfluxDB API /write endpoint + - /v2.0/reference/syntax/line-protocol + - /v2.0/reference/syntax/annotated-csv + - /v2.0/reference/cli/influx/write --- Collect and write time series data to InfluxDB using [line protocol](/v2.0/reference/syntax/line-protocol), @@ -87,10 +93,9 @@ To quickly start writing data, use the provided user interface. where you're hosting the UI (by default, **localhost:9999**). - _**InfluxDB 2.0 Cloud**_: In your browser, go to https://cloud2.influxdata.com/. -2. Click **Load Data** in the navigation menu on the left. -3. Select **Buckets**. -4. Under the bucket you want to write data to, click **{{< icon "plus" >}} Add Data**. -5. Select from the following options: +2. In the navigation menu on the left, select **Data** (**Load Data**) > **Buckets**. +3. Under the bucket you want to write data to, click **{{< icon "plus" >}} Add Data**. +4. Select from the following options: - [Configure Telegraf Agent](#configure-telegraf-agent) - [Line Protocol](#line-protocol) @@ -114,7 +119,7 @@ To configure a Telegraf agent, see [Automatically create a Telegraf configuratio - **Enter Manually:** Select the time precision of your data. Manually enter line protocol. -2. Click **Continue**. +2. Click **Write Data**. A message indicates whether data is successfully written to InfluxDB. 3. To add more data or correct line protocol, click **Previous**. 4. Click **Finish**. @@ -133,26 +138,45 @@ To scrape metrics, see [Create a scraper](/v2.0/write-data/scrape-data/manage-sc From the command line, use the [`influx write` command](/v2.0/reference/cli/influx/write/) to write data to InfluxDB. Include the following in your command: -| Requirement | Include by | -|:----------- |:---------- | -| Organization | Use the `-o`,`--org`, or `--org-id` flags. | -| Bucket | Use the `-b`, `--bucket`, or `--bucket-id` flags. | -| Precision | Use the `-p`, `--precision` flag. | -| Authentication token | Set the `INFLUX_TOKEN` environment variable or use the `t`, `--token` flag. | -| Line protocol | Write a single line as a string or pass a file path prefixed with `@`. | +| Requirement | Include by | +|:----------- |:---------- | +| Organization | Use the `-o`,`--org`, or `--org-id` flags. | +| Bucket | Use the `-b`, `--bucket`, or `--bucket-id` flags. | +| Precision | Use the `-p`, `--precision` flag. | +| Authentication token | Set the `INFLUX_TOKEN` environment variable or use the `t`, `--token` flag. | +| Data | Write data using **line protocol** or **annotated CSV**. Pass a file with the `-f`, `--file` flag. | -##### Example influx write commands +_See [Line protocol](/v2.0/reference/syntax/line-protocol/) and [Annotated CSV](/v2.0/reference/syntax/annotated-csv)_ -To write a single data point, for example, run +#### Example influx write commands +##### Write a single line of line protocol ```sh -influx write -b bucketName -o orgName -p s 'myMeasurement,host=myHost testField="testData" 1556896326' +influx write \ + -b bucketName \ + -o orgName \ + -p s \ + 'myMeasurement,host=myHost testField="testData" 1556896326' ``` -To write data in line protocol from a file, try - +##### Write line protocol from a file +```sh +influx write \ + -b bucketName \ + -o orgName \ + -p s \ + --format=lp + -f /path/to/line-protocol.txt ``` -influx write -b bucketName -o orgName -p s @/path/to/line-protocol.txt + +##### Write annotated CSV from a file +```sh +influx write \ + -b bucketName \ + -o orgName \ + -p s \ + --format=csv + -f /path/to/data.csv ``` ### InfluxDB API diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md index 5abec8bb1..1eb6e903c 100644 --- a/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md +++ b/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md @@ -13,11 +13,10 @@ weight: 301 Create a new scraper in the InfluxDB user interface (UI). ## Create a scraper in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data** (**Load Data**) > **Scrapers**. {{< nav-icon "load data" >}} -2. Click **Scrapers**. 3. Click **{{< icon "plus" >}} Create Scraper**. 4. Enter a **Name** for the scraper. 5. Select a **Bucket** to store the scraped data. diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md index e65ea251c..f41c4f9fb 100644 --- a/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md +++ b/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md @@ -13,10 +13,9 @@ weight: 303 Delete a scraper from the InfluxDB user interface (UI). ## Delete a scraper from the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data** (**Load Data**) > **Scrapers**. {{< nav-icon "load data" >}} -2. Click **Scrapers**. 3. Hover over the scraper you want to delete and click the **{{< icon "delete" >}}** icon. 4. Click **Delete**. diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md index cac4848be..519ba5847 100644 --- a/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md +++ b/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md @@ -18,11 +18,9 @@ To modify either, [create a new scraper](/v2.0/write-data/scrape-data/manage-scr {{% /note %}} ## Update a scraper in the InfluxDB UI -1. Click **Load Data** in the navigation bar. +1. In the navigation menu on the left, select **Data** (**Load Data**) > **Scrapers**. {{< nav-icon "load data" >}} -2. Click **Scrapers**. -3. Hover over the scraper you would like to update and click the **{{< icon "pencil" >}}** - that appears next to the scraper name. +3. Hover over the scraper you would like to update and click the **{{< icon "pencil" >}}** that appears next to the scraper name. 4. Enter a new name for the scraper. Press Return or click out of the name field to save the change. diff --git a/content/v2.0/write-data/use-telegraf/auto-config/_index.md b/content/v2.0/write-data/use-telegraf/auto-config/_index.md index 90dc6efeb..9bf903594 100644 --- a/content/v2.0/write-data/use-telegraf/auto-config/_index.md +++ b/content/v2.0/write-data/use-telegraf/auto-config/_index.md @@ -30,11 +30,10 @@ for using Telegraf with InfluxDB v2.0._ ## Create a Telegraf configuration 1. Open the InfluxDB UI _(default: [localhost:9999](http://localhost:9999))_. -2. Click **Load Data** in the left navigation menu. +2. In the navigation menu on the left, select **Data** (**Load Data**) > **Telegraf**. {{< nav-icon "load data" >}} -3. Select **Telegraf**. 4. Click **{{< icon "plus" >}} Create Configuration**. 5. In the **Bucket** dropdown, select the bucket where Telegraf will store collected data. 6. Select one or more of the available plugin groups and click **Continue**. diff --git a/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md b/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md index a021bb107..1860d9ae9 100644 --- a/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md +++ b/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md @@ -12,11 +12,10 @@ weight: 303 To delete a Telegraf configuration: -1. Click **Load Data** in the left navigation menu. +1. In the navigation menu on the left, select **Data** (**Load Data**) > **Telegraf**. {{< nav-icon "load data" >}} -2. Select **Telegraf**. 3. Hover over the configuration you want to delete, click the **{{< icon "trash" >}}** icon, and click **Delete**. diff --git a/content/v2.0/write-data/use-telegraf/auto-config/update-telegraf-config.md b/content/v2.0/write-data/use-telegraf/auto-config/update-telegraf-config.md index aa26523eb..6958f7c21 100644 --- a/content/v2.0/write-data/use-telegraf/auto-config/update-telegraf-config.md +++ b/content/v2.0/write-data/use-telegraf/auto-config/update-telegraf-config.md @@ -17,11 +17,10 @@ of a Telegraf configuration created in the UI. You cannot modify Telegraf settings in existing Telegraf configurations through the UI. {{% /note %}} -1. Click **Load Data** in left the navigation bar. +1. In the navigation menu on the left, select **Data** (**Load Data**) > **Telegraf**. {{< nav-icon "load data" >}} -2. Select **Telegraf**. 3. Hover over the configuration you want to edit and click **{{< icon "pencil" >}}** to update the name or description. 4. Press Return or click out of the editable field to save your changes. diff --git a/content/v2.0/write-data/use-telegraf/auto-config/view-telegraf-config.md b/content/v2.0/write-data/use-telegraf/auto-config/view-telegraf-config.md index 52b87b54f..5dbafc829 100644 --- a/content/v2.0/write-data/use-telegraf/auto-config/view-telegraf-config.md +++ b/content/v2.0/write-data/use-telegraf/auto-config/view-telegraf-config.md @@ -14,11 +14,10 @@ weight: 301 View Telegraf configuration information in the InfluxDB user interface (UI): -1. Click **Load Data** in the navigation bar. +- In the navigation menu on the left, select **Data** (**Load Data**) > **Telegraf**. {{< nav-icon "load data" >}} -2. Click **Telegraf**. ### View and download the telegraf.conf To view the actual `telegraf.conf` associated with the configuration, diff --git a/layouts/partials/article/related.html b/layouts/partials/article/related.html index 7817ad286..3dc5ff2ea 100644 --- a/layouts/partials/article/related.html +++ b/layouts/partials/article/related.html @@ -3,7 +3,7 @@
    {{ range .Params.related }} - {{ if in . "http" }} + {{ if or (in . "http") (in . "/v2.0/api") }} {{ $link := replaceRE `\,\s(.*)$` "" . }} {{ $title := replaceRE `^(\S*\,\s)` "" . }}
  • {{ $title }}
    • diff --git a/layouts/shortcodes/cli/influxd-flags.md b/layouts/shortcodes/cli/influxd-flags.md new file mode 100644 index 000000000..79abb8ad8 --- /dev/null +++ b/layouts/shortcodes/cli/influxd-flags.md @@ -0,0 +1,35 @@ +| Flag | Description | Input type | +|:---- |:----------- | :--------: | +| `--assets-path` | Override default assets by serving from a specific directory (developer mode) | string | +| `--bolt-path` | Path to boltdb database (default `~/.influxdbv2/influxd.bolt`) | string | +| `--e2e-testing` | Add /debug/flush endpoint to clear stores; used for end-to-end tests (default `false`) | | +| `--engine-path` | Path to persistent engine files (default `~/.influxdbv2/engine`) | string | +| `-h`, `--help` | Help for the `influxd` command | | +| `--http-bind-address` | Bind address for the REST HTTP API (default `:9999`) | string | +| `--log-level` | Supported log levels are debug, info, and error (default `info`) | string | +| `--new-meta-store` | Enables the new meta store | | +| `--new-meta-store-read-only` | Toggle read-only mode for the new meta store and duplicate reads between old and new store (default `true`) | | +| `--no-tasks` | Disables the task scheduler | | +| `--query-concurrency` | Number of queries allowed to execute concurrently (default `10`) | integer | +| `--query-initial-memory-bytes` | Initial bytes of memory allocated for a query (default = `query-memory-bytes`) | integer | +| `--query-max-memory-bytes` | Maximum total bytes of memory allowed for queries (default = `query-concurrency` × `query-memory-bytes`) | integer | +| `--query-memory-bytes` | Maximum bytes of memory allowed for a single query (default _unlimited_, must be >= `query-initial-memory-bytes`) | integer | +| `--query-queue-size` | Maximum number of queries allowed in execution queue (default `10`) | integer | +| `--reporting-disabled` | Disable sending telemetry data to **https://telemetry.influxdata.com** | | +| `--secret-store` | Data store for secrets (bolt or vault) (default `bolt`) | string | +| `--session-length` | TTL in minutes for newly created sessions (default `60`) | integer | +| `--session-renew-disabled` | Disables automatically extending session TTL on request | | +| `--store` | Data store for REST resources (bolt or memory) (default `bolt`) | string | +| `--tls-cert` | Path to TLS certificate file | string | +| `--tls-key` | Path to TLS private key file | string | +| `--tracing-type` | Supported tracing types (log or jaeger) | string | +| `--vault-addr ` | Address of the Vault server (example: `https://127.0.0.1:8200/`) | string | +| `--vault-cacert` | Path to a PEM-encoded CA certificate file | string | +| `--vault-capath` | Path to a directory of PEM-encoded CA certificate files | string | +| `--vault-client-cert` | Path to a PEM-encoded client certificate | string | +| `--vault-client-key` | Path to an unencrypted, PEM-encoded private key which corresponds to the matching client certificate | string | +| `--vault-max-retries` | Maximum number of retries when encountering a 5xx error code (default `2`) | integer | +| `--vault-client-timeout` | Vault client timeout (default `60s`) | duration | +| `--vault-skip-verify` | Skip certificate verification when communicating with Vault | | +| `--vault-tls-server-name` | Name to use as the SNI host when connecting to Vault via TLS | string | +| `--vault-token` | Vault authentication token | string | diff --git a/layouts/shortcodes/nav-icon.html b/layouts/shortcodes/nav-icon.html index 6a39fae71..c5b3604af 100644 --- a/layouts/shortcodes/nav-icon.html +++ b/layouts/shortcodes/nav-icon.html @@ -1,33 +1,79 @@ {{ $navIcon := lower (.Get 0) | default "influx" }} + {{ if or (eq $navIcon "admin") (eq $navIcon "influx") }} {{ .Scratch.Set "icon" "influx-icon" }} {{ .Scratch.Set "title" "username (org-name)" }} -{{ else if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") }} + {{ .Scratch.Set "short_title" "User" }} +{{ else if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") (eq $navIcon "explore") }} {{ .Scratch.Set "icon" "data-explorer" }} {{ .Scratch.Set "title" "Data Explorer" }} -{{ else if eq $navIcon "dashboards" }} + {{ .Scratch.Set "short_title" "Explore" }} +{{ else if or (eq $navIcon "dashboards") (eq $navIcon "boards") }} {{ .Scratch.Set "icon" "dashboards" }} {{ .Scratch.Set "title" "Dashboards" }} + {{ .Scratch.Set "short_title" "Dashboards" }} + {{ .Scratch.Set "short_title" "Boards" }} {{ else if eq $navIcon "tasks" }} {{ .Scratch.Set "icon" "calendar" }} {{ .Scratch.Set "title" "Tasks" }} + {{ .Scratch.Set "short_title" "Tasks" }} {{ else if or (eq $navIcon "monitor") (eq $navIcon "alerts") (eq $navIcon "bell") }} {{ .Scratch.Set "icon" "bell" }} - {{ .Scratch.Set "title" "Monitoring & Alerting" }} -{{ else if or (eq $navIcon "disks") (eq $navIcon "load data") (eq $navIcon "load-data") }} + {{ .Scratch.Set "title" "Alerts" }} + {{ .Scratch.Set "short_title" "Alerts" }} +{{ else if or (eq $navIcon "disks") (eq $navIcon "load data") (eq $navIcon "load-data") (eq $navIcon "data") }} {{ .Scratch.Set "icon" "disks-nav" }} {{ .Scratch.Set "title" "Load Data" }} + {{ .Scratch.Set "short_title" "Data" }} {{ else if eq $navIcon "settings" }} {{ .Scratch.Set "icon" "wrench-nav" }} {{ .Scratch.Set "title" "Settings" }} -{{ else if or (eq $navIcon "feedback") }} - {{ .Scratch.Set "icon" "nav-chat" }} - {{ .Scratch.Set "title" "Feedback" }} + {{ .Scratch.Set "short_title" "Settings" }} +{{ else if or (eq $navIcon "org") (eq $navIcon "organization") }} + {{ .Scratch.Set "icon" "users-trio" }} + {{ .Scratch.Set "title" "Organization" }} + {{ .Scratch.Set "short_title" "Org" }} {{ end }} -{{ $icon := .Scratch.Get "icon" }} -{{ $title := .Scratch.Get "title" }} - -
    - {{ $title }} -
    +{{ if or (eq $navIcon "profile") (eq $navIcon "account") }} +
    + + +
    +{{ else }} + {{ $icon := .Scratch.Get "icon" }} + {{ $title := .Scratch.Get "title" }} + {{ $shortTitle := .Scratch.Get "short_title" }} +
    +
    +
    + +
    + {{ $shortTitle }} +
    +
    +
    +
    +
    + +
    + {{ $title }} +
    +
    +
    +
    +{{ end }} diff --git a/static/fonts/icomoon.eot b/static/fonts/icomoon.eot old mode 100755 new mode 100644 index c2e03e9b4..76da8948c Binary files a/static/fonts/icomoon.eot and b/static/fonts/icomoon.eot differ diff --git a/static/fonts/icomoon.svg b/static/fonts/icomoon.svg old mode 100755 new mode 100644 index df72e9985..3f41602ce --- a/static/fonts/icomoon.svg +++ b/static/fonts/icomoon.svg @@ -69,7 +69,9 @@ + + diff --git a/static/fonts/icomoon.ttf b/static/fonts/icomoon.ttf old mode 100755 new mode 100644 index 0a5bee255..72ed90623 Binary files a/static/fonts/icomoon.ttf and b/static/fonts/icomoon.ttf differ diff --git a/static/fonts/icomoon.woff b/static/fonts/icomoon.woff old mode 100755 new mode 100644 index a232e31cc..3b6501310 Binary files a/static/fonts/icomoon.woff and b/static/fonts/icomoon.woff differ diff --git a/static/img/2-0-visualizations-gauge-example-8.png b/static/img/2-0-visualizations-gauge-example-8.png new file mode 100644 index 000000000..d90b599c0 Binary files /dev/null and b/static/img/2-0-visualizations-gauge-example-8.png differ diff --git a/static/img/2-0-visualizations-gauge-pressure-8.png b/static/img/2-0-visualizations-gauge-pressure-8.png new file mode 100644 index 000000000..5c48f4658 Binary files /dev/null and b/static/img/2-0-visualizations-gauge-pressure-8.png differ diff --git a/static/img/2-0-visualizations-graph-single-stat-mem-8.png b/static/img/2-0-visualizations-graph-single-stat-mem-8.png new file mode 100644 index 000000000..a02a9b76c Binary files /dev/null and b/static/img/2-0-visualizations-graph-single-stat-mem-8.png differ diff --git a/static/img/2-0-visualizations-line-graph-example-8.png b/static/img/2-0-visualizations-line-graph-example-8.png new file mode 100644 index 000000000..8a6a2b7dc Binary files /dev/null and b/static/img/2-0-visualizations-line-graph-example-8.png differ diff --git a/static/img/2-0-visualizations-line-graph-single-stat-example-8.png b/static/img/2-0-visualizations-line-graph-single-stat-example-8.png new file mode 100644 index 000000000..6a2f56892 Binary files /dev/null and b/static/img/2-0-visualizations-line-graph-single-stat-example-8.png differ diff --git a/static/img/2-0-visualizations-line-graph-smooth-example-8.png b/static/img/2-0-visualizations-line-graph-smooth-example-8.png new file mode 100644 index 000000000..a392c916f Binary files /dev/null and b/static/img/2-0-visualizations-line-graph-smooth-example-8.png differ diff --git a/static/img/2-0-visualizations-line-graph-step-example-8.png b/static/img/2-0-visualizations-line-graph-step-example-8.png new file mode 100644 index 000000000..b22d53453 Binary files /dev/null and b/static/img/2-0-visualizations-line-graph-step-example-8.png differ diff --git a/static/img/2-0-visualizations-single-stat-example-8.png b/static/img/2-0-visualizations-single-stat-example-8.png new file mode 100644 index 000000000..ece3e1fd8 Binary files /dev/null and b/static/img/2-0-visualizations-single-stat-example-8.png differ diff --git a/static/img/beta-8-interval-dropdown.png b/static/img/beta-8-interval-dropdown.png new file mode 100644 index 000000000..a5e9712c3 Binary files /dev/null and b/static/img/beta-8-interval-dropdown.png differ diff --git a/static/img/beta-8-raw-data.png b/static/img/beta-8-raw-data.png new file mode 100644 index 000000000..83abb17b7 Binary files /dev/null and b/static/img/beta-8-raw-data.png differ diff --git a/static/img/data-explorer-beta-8.png b/static/img/data-explorer-beta-8.png new file mode 100644 index 000000000..cdb82eafe Binary files /dev/null and b/static/img/data-explorer-beta-8.png differ