From 9af6a7f7ec2fa5af2e91b575761ef87b7e30ebea Mon Sep 17 00:00:00 2001 From: Kelly Date: Mon, 12 Oct 2020 11:26:52 -0700 Subject: [PATCH 1/3] clarify delete with predicate works w Cloud --- .../reference/cli/influx/delete/_index.md | 41 ++++++++++--------- .../v2.0/reference/syntax/delete-predicate.md | 7 +++- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md index dbf384286..c9ed3a6a5 100644 --- a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md +++ b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md @@ -1,8 +1,5 @@ --- title: influx delete -aliases: - - /influxdb/v2.0/tags/delete/ - - /influxdb/v2.0/reference/syntax/delete-predicate/ description: The `influx delete` command deletes points from an InfluxDB bucket. menu: influxdb_2_0_ref: @@ -13,24 +10,30 @@ influxdb/v2.0/tags: [delete] --- The `influx delete` command deletes [points](/influxdb/v2.0/reference/glossary/#point) -from an InfluxDB bucket. +from an InfluxDB bucket. Identify points to delete using [delete predicate syntax](/influxdb/v2.0/reference/syntax/delete-predicate). {{% note %}} -In this release, the delete with predicate API (`/api/v2/delete`) has been disabled. This API now returns a 501 Not implemented message. +In **InfluxDB OSS 2.0rc0**, the `influx delete --predicate` flag has been disabled. +The `-p`, `--predicate` flag is supported in **InfluxDB Cloud** and **InfluxDB OSS 2.0 beta 16 or earlier**. + +Running `influx delete` without the `-p` or `--predicate` flag deletes all data with timestamps between the specified +`--start` and `--stop` times in the specified bucket. {{% /note %}} ## Flags -| Flag | | Description | Input type | {{< cli/mapped >}} | -|:---- |:--- |:----------- |:----------:|:------------------ | -| `-c` | `--active-config` | CLI configuration to use for command | string | | -| `-b` | `--bucket` | Name of bucket to remove data from | string | `INFLUX_BUCKET_NAME` | -| | `--bucket-id` | Bucket ID | string | `INFLUX_BUCKET_ID` | -| | `--configs-path` | Path to `influx` CLI configurations (default `~/.influxdbv2/configs`) | string |`INFLUX_CONFIGS_PATH` | -| `-h` | `--help` | Help for the `delete` command | | | -| | `--host` | HTTP address of InfluxDB (default `http://localhost:8086`) | string | `INFLUX_HOST` | -| `-o` | `--org` | Organization name | string | `INFLUX_ORG` | -| | `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | -| | `--skip-verify` | Skip TLS certificate verification | | | -| | `--start` | Start time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | -| | `--stop` | Stop time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | -| `-t` | `--token` | Authentication token | string | `INFLUX_TOKEN` | +| Flag | | Description | Input type | {{< cli/mapped >}} | +|:---- |:--- |:----------- |:----------:|:------------------ | +| `-c` | `--active-config` | CLI configuration to use for command | string | | +| `-b` | `--bucket` | Name of bucket to remove data from | string | `INFLUX_BUCKET_NAME` | +| | `--bucket-id` | Bucket ID | string | `INFLUX_BUCKET_ID` | +| | `--configs-path` | Path to `influx` CLI configurations (default `~/.influxdbv2/configs`) | string |`INFLUX_CONFIGS_PATH` | +| `-h` | `--help` | Help for the `delete` command | | | +| | `--host` | HTTP address of InfluxDB (default `http://localhost:8086`) | string | `INFLUX_HOST` | +| `-o` | `--org` | Organization name | string | `INFLUX_ORG` | +| | `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | +| `-p` | `--predicate` | Only supported in InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier. + InfluxQL-like predicate string (see [Delete predicate](/v2.0/reference/syntax/delete-predicate)) | string | | +| | `--skip-verify` | Skip TLS certificate verification | | | +| | `--start` | Start time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | +| | `--stop` | Stop time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | +| `-t` | `--token` | Authentication token | string | `INFLUX_TOKEN` | diff --git a/content/influxdb/v2.0/reference/syntax/delete-predicate.md b/content/influxdb/v2.0/reference/syntax/delete-predicate.md index 9c4d2b017..f581f79f6 100644 --- a/content/influxdb/v2.0/reference/syntax/delete-predicate.md +++ b/content/influxdb/v2.0/reference/syntax/delete-predicate.md @@ -9,12 +9,17 @@ menu: parent: Syntax name: Delete predicate weight: 104 -draft: true influxdb/v2.0/tags: [syntax, delete] related: - /influxdb/v2.0/reference/cli/influx/delete/ --- +{{% note %}} +In InfluxDB OSS 2.0rc0, the delete with predicate API (`/api/v2/delete`) has been disabled and returns a 501 Not implemented message. + +Use the InfluxDB `/delete` endpoint with InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier. +{{% /note %}} + The InfluxDB `/delete` endpoint uses an InfluxQL-like predicate syntax to determine what data [points](/influxdb/v2.0/reference/glossary/#point) to delete. InfluxDB uses the delete predicate to evaluate the [series keys](/influxdb/v2.0/reference/glossary/#series-key) From 41d27d1766eca7e97b7b4bf22b91b713346f0cd0 Mon Sep 17 00:00:00 2001 From: Kelly Date: Mon, 12 Oct 2020 11:38:06 -0700 Subject: [PATCH 2/3] fixed table formatting --- content/influxdb/v2.0/reference/cli/influx/delete/_index.md | 3 +-- content/influxdb/v2.0/reference/syntax/delete-predicate.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md index c9ed3a6a5..13401aaaa 100644 --- a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md +++ b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md @@ -31,8 +31,7 @@ Running `influx delete` without the `-p` or `--predicate` flag deletes all data | | `--host` | HTTP address of InfluxDB (default `http://localhost:8086`) | string | `INFLUX_HOST` | | `-o` | `--org` | Organization name | string | `INFLUX_ORG` | | | `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | -| `-p` | `--predicate` | Only supported in InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier. - InfluxQL-like predicate string (see [Delete predicate](/v2.0/reference/syntax/delete-predicate)) | string | | +| `-p` | `--predicate` | Only supported in InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier InfluxQL-like predicate string (see [Delete predicate](/v2.0/reference/syntax/delete-predicate)). | string | | | | `--skip-verify` | Skip TLS certificate verification | | | | | `--start` | Start time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | | | `--stop` | Stop time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | diff --git a/content/influxdb/v2.0/reference/syntax/delete-predicate.md b/content/influxdb/v2.0/reference/syntax/delete-predicate.md index f581f79f6..05ef12244 100644 --- a/content/influxdb/v2.0/reference/syntax/delete-predicate.md +++ b/content/influxdb/v2.0/reference/syntax/delete-predicate.md @@ -15,9 +15,9 @@ related: --- {{% note %}} -In InfluxDB OSS 2.0rc0, the delete with predicate API (`/api/v2/delete`) has been disabled and returns a 501 Not implemented message. +In **InfluxDB OSS 2.0rc0**, the delete with predicate API (`/api/v2/delete`) has been disabled and returns a 501 Not implemented message. -Use the InfluxDB `/delete` endpoint with InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier. +Use the InfluxDB `/delete` endpoint with **InfluxDB Cloud** and **InfluxDB OSS 2.0 beta 16 or earlier**. {{% /note %}} The InfluxDB `/delete` endpoint uses an InfluxQL-like predicate syntax to determine From 56e346b2a31a7b3dc39a399e29ca7fd2d9383639 Mon Sep 17 00:00:00 2001 From: Kelly Date: Mon, 12 Oct 2020 11:38:36 -0700 Subject: [PATCH 3/3] fix link --- content/influxdb/v2.0/reference/cli/influx/delete/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md index 13401aaaa..f556a3b2c 100644 --- a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md +++ b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md @@ -31,7 +31,7 @@ Running `influx delete` without the `-p` or `--predicate` flag deletes all data | | `--host` | HTTP address of InfluxDB (default `http://localhost:8086`) | string | `INFLUX_HOST` | | `-o` | `--org` | Organization name | string | `INFLUX_ORG` | | | `--org-id` | Organization ID | string | `INFLUX_ORG_ID` | -| `-p` | `--predicate` | Only supported in InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier InfluxQL-like predicate string (see [Delete predicate](/v2.0/reference/syntax/delete-predicate)). | string | | +| `-p` | `--predicate` | Only supported in InfluxDB Cloud and InfluxDB OSS 2.0 beta 16 or earlier InfluxQL-like predicate string (see [Delete predicate](/influxdb/v2.0/reference/syntax/delete-predicate)). | string | | | | `--skip-verify` | Skip TLS certificate verification | | | | | `--start` | Start time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | | | | `--stop` | Stop time in RFC3339 format (i.e. `2009-01-02T23:00:00Z`) | string | |