From ef8d70485d197273e86514be845db366c3abba47 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 18 Jun 2020 16:56:17 -0600 Subject: [PATCH] updated file flag on template and stack related cmds, resolves #1108 --- content/v2.0/reference/cli/influx/apply/_index.md | 9 ++++----- content/v2.0/reference/cli/influx/template/_index.md | 3 +-- content/v2.0/reference/cli/influx/template/validate.md | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/content/v2.0/reference/cli/influx/apply/_index.md b/content/v2.0/reference/cli/influx/apply/_index.md index c351d494d..1ac0e76cc 100644 --- a/content/v2.0/reference/cli/influx/apply/_index.md +++ b/content/v2.0/reference/cli/influx/apply/_index.md @@ -30,7 +30,7 @@ influx apply [flags] | | `--disable-table-borders` | Disable table borders | | | | `-e` | `--encoding` | Encoding of the input stream | string | | | | `--env-ref` | Environment references to provide with the template (format: `--env-ref=REF_KEY=REF_VALUE`) | string | | -| `-f` | `--file` | Path to template file | string | | +| `-f` | `--file` | Path to template file (supports HTTP(S) URLs or file paths) | string | | | | `--filter` | Resources to skip when applying the template (filter by `kind` or `resource`) | string | | | | `--force` | Ignore warnings about destructive changes | | | | `-h` | `--help` | Help for the `apply` command | | | @@ -41,7 +41,6 @@ influx apply [flags] | `-R` | `--recurse` | Recurse through files in the directory specified in `-f`, `--file` | | | | | `--secret` | Secrets to provide with the template (format: `--secret=SECRET_KEY=SECRET_VALUE`) | string | | | | `--stack-id` | Stack ID to associate when applying the template | string | | -| `-u` | `--template-url` | URL of template file | string | | {{% cli/influx-global-flags %}} @@ -50,6 +49,9 @@ influx apply [flags] # Apply a template from a file. influx apply -f path/to/template.json +# Apply a template from a URL. +influx apply -f https://raw.githubusercontent.com/influxdata/community-templates/master/docker/docker.yml + # Apply a stack that has associated templates. influx apply --stack-id $STACK_ID @@ -62,9 +64,6 @@ influx apply \ -f path/to/template_1.json \ -f path/to/template_2.yml -# Apply a template from a URL. -influx apply -u https://raw.githubusercontent.com/influxdata/community-templates/master/docker/docker.yml - # Apply a template from STDIN. cat template.json | influx apply --encoding json diff --git a/content/v2.0/reference/cli/influx/template/_index.md b/content/v2.0/reference/cli/influx/template/_index.md index 20b13f840..64287b63c 100644 --- a/content/v2.0/reference/cli/influx/template/_index.md +++ b/content/v2.0/reference/cli/influx/template/_index.md @@ -30,10 +30,9 @@ influx template [command] | `-c` | `--disable-color` | Disable color in output | | | | | `--disable-table-borders` | Disable table borders | | | | `-e` | `--encoding` | Encoding of the input stream | string | | -| `-f` | `--file` | Template file to summarize | string | | +| `-f` | `--file` | Path to template file (supports HTTP(S) URLs or file paths) | string | | | `-h` | `--help` | Help for the `template` command | | | | | `--json` | Output data as JSON (default `false`) | | `INFLUX_OUTPUT_JSON` | | `-R` | `--recurse` | Recurse through files in the directory specified in `-f`, `--file` | | | -| `-u` | `--template-url` | URL of template file to summarize | string | | {{% cli/influx-global-flags %}} diff --git a/content/v2.0/reference/cli/influx/template/validate.md b/content/v2.0/reference/cli/influx/template/validate.md index 18b40c46b..15f9d48ab 100644 --- a/content/v2.0/reference/cli/influx/template/validate.md +++ b/content/v2.0/reference/cli/influx/template/validate.md @@ -22,7 +22,7 @@ influx template validate [flags] | Flag | | Description | Input Type | |:---- |:--- |:----------- |:---------- | | `-e` | `--encoding` | Encoding of the input stream | string | -| `-f` | `--file` | Template file to validate | string | +| `-f` | `--file` | Path to template file (supports HTTP(S) URLs or file paths) | string | | `-h` | `--help` | Help for the `validate` command | | | `-R` | `--recurse` | Recurse through files in the directory specified in `-f`, `--file` | | | `-u` | `--template-url` | URL of template file to validate | string |