InfluxDB 1.8 backup/restore revamp (#4095)

* WIP 1.x backup/restore revamp

* WIP backup and restore revamp

* WIP backup restore refactor

* WIP backup and restore rework

* added code-callout shortcode

* finished out backup/restore restructure
pull/4102/head^2
Scott Anderson 2022-06-08 17:02:19 -06:00 committed by GitHub
parent 0f3ef0d9ca
commit 85fdbc439f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 687 additions and 379 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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