Skip to content

Commit 35c4f2b

Browse files
author
Nik Richers
authored
Regenerate command reference topics in Asciidoc for v1.0.0-beta1 (#128)
* Regenerate command reference topics in Asciidoc * Fix heading case
1 parent 13bff46 commit 35c4f2b

28 files changed

+616
-76
lines changed

docs/ecctl-command-reference-index.adoc

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ include::ecctl_deployment.adoc[]
99
include::ecctl_deployment_apm.adoc[]
1010
include::ecctl_deployment_apm_create.adoc[]
1111
include::ecctl_deployment_apm_delete.adoc[]
12-
include::ecctl_deployment_apm_enable.adoc[]
1312
include::ecctl_deployment_apm_list.adoc[]
1413
include::ecctl_deployment_apm_plan.adoc[]
1514
include::ecctl_deployment_apm_plan_cancel.adoc[]
@@ -25,7 +24,6 @@ include::ecctl_deployment_create.adoc[]
2524
include::ecctl_deployment_delete.adoc[]
2625
include::ecctl_deployment_elasticsearch.adoc[]
2726
include::ecctl_deployment_elasticsearch_console.adoc[]
28-
include::ecctl_deployment_elasticsearch_create.adoc[]
2927
include::ecctl_deployment_elasticsearch_delete.adoc[]
3028
include::ecctl_deployment_elasticsearch_diagnose.adoc[]
3129
include::ecctl_deployment_elasticsearch_instances.adoc[]
@@ -58,7 +56,6 @@ include::ecctl_deployment_elasticsearch_upgrade.adoc[]
5856
include::ecctl_deployment_kibana.adoc[]
5957
include::ecctl_deployment_kibana_create.adoc[]
6058
include::ecctl_deployment_kibana_delete.adoc[]
61-
include::ecctl_deployment_kibana_enable.adoc[]
6259
include::ecctl_deployment_kibana_list.adoc[]
6360
include::ecctl_deployment_kibana_plan.adoc[]
6461
include::ecctl_deployment_kibana_plan_monitor.adoc[]
@@ -75,6 +72,17 @@ include::ecctl_deployment_note_create.adoc[]
7572
include::ecctl_deployment_note_list.adoc[]
7673
include::ecctl_deployment_note_show.adoc[]
7774
include::ecctl_deployment_note_update.adoc[]
75+
include::ecctl_deployment_plan.adoc[]
76+
include::ecctl_deployment_plan_cancel.adoc[]
77+
include::ecctl_deployment_resource.adoc[]
78+
include::ecctl_deployment_resource_delete.adoc[]
79+
include::ecctl_deployment_resource_restore.adoc[]
80+
include::ecctl_deployment_resource_shutdown.adoc[]
81+
include::ecctl_deployment_resource_start-maintenance.adoc[]
82+
include::ecctl_deployment_resource_start.adoc[]
83+
include::ecctl_deployment_resource_stop-maintenance.adoc[]
84+
include::ecctl_deployment_resource_stop.adoc[]
85+
include::ecctl_deployment_resource_upgrade.adoc[]
7886
include::ecctl_deployment_restore.adoc[]
7987
include::ecctl_deployment_search.adoc[]
8088
include::ecctl_deployment_show.adoc[]

docs/ecctl_deployment.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ ecctl deployment [flags]
5151
* xref:ecctl_deployment_kibana[ecctl deployment kibana] - Manages Kibana instances
5252
* xref:ecctl_deployment_list[ecctl deployment list] - Lists the platform's deployments
5353
* xref:ecctl_deployment_note[ecctl deployment note] - Manages a deployment's notes
54+
* xref:ecctl_deployment_plan[ecctl deployment plan] - Manages deployment plans
55+
* xref:ecctl_deployment_resource[ecctl deployment resource] - Manages deployment resources
5456
* xref:ecctl_deployment_restore[ecctl deployment restore] - Restores a previously shut down deployment and all of its associated sub-resources
5557
* xref:ecctl_deployment_search[ecctl deployment search] - Performs advanced deployment search using the Elasticsearch Query DSL
5658
* xref:ecctl_deployment_show[ecctl deployment show] - Shows the specified deployment resources

docs/ecctl_deployment_apm.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ ecctl deployment apm [flags]
4444
=== See also
4545

4646
* xref:ecctl_deployment[ecctl deployment] - Manages deployments
47-
* xref:ecctl_deployment_apm_create[ecctl deployment apm create] - Creates an APM instance in the selected deployment
47+
* xref:ecctl_deployment_apm_create[ecctl deployment apm create] - Creates an Apm instance
4848
* xref:ecctl_deployment_apm_delete[ecctl deployment apm delete] - Deletes an APM deployment
49-
* xref:ecctl_deployment_apm_enable[ecctl deployment apm enable] - Enables an APM instance in the selected deployment
5049
* xref:ecctl_deployment_apm_list[ecctl deployment apm list] - Lists the APM deployments
5150
* xref:ecctl_deployment_apm_plan[ecctl deployment apm plan] - Manages APM plans
5251
* xref:ecctl_deployment_apm_restart[ecctl deployment apm restart] - Restarts an APM deployment

docs/ecctl_deployment_apm_create.adoc

Lines changed: 74 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,92 @@
11
[#ecctl_deployment_apm_create]
22
== ecctl deployment apm create
33

4-
Creates an APM instance in the selected deployment
4+
Creates an Apm instance
55

66
[float]
77
=== Synopsis
88

9-
Creates an APM instance in the selected deployment
9+
Creates an APM deployment, limitting the creation scope to APM resources.
10+
There are a few ways to create an APM deployment, sane default values are provided, making
11+
the command work out of the box even when no parameters are set. When version is not specified,
12+
the matching elasticsearch deployment version will be used. These are the available options:
1013

14+
* Simplified flags: --zones +++<zone count="">+++--size +++<node memory="" in="" MB="">++++++</node>++++++</zone>+++
15+
* File definition: --file=+++<file path="">+++(shorthand: -f). The definition can be found in: https://www.elastic.co/guide/en/cloud-enterprise/current/definitions.html#ApmPayload+++</file>+++
16+
17+
As an option, "--generate-payload" can be used in order to obtain the generated ApmPayload
18+
that would be sent as a request, save it, update or extend the topology and create an Apm
19+
deployment using the saved payload with the "--file" flag.
20+
21+
----
22+
ecctl deployment apm create --id <deployment-id> [flags]
1123
----
12-
ecctl deployment apm create -f <file definition> --id <deployment id> [flags]
24+
25+
[float]
26+
=== Examples
27+
28+
----
29+
## Create a single APM server. The command will exit after the API response has been returned,
30+
## without waiting until the deployment resources have been created. To make the command wait until
31+
the resources have been created use the "--track" flag.
32+
$ ecctl deployment apm create --id=a57f8b7ce54c4afb90ce3755d1e94000 --track
33+
{
34+
"id": "a57f8b7ce54c4afb90ce3755d1e94000",
35+
"name": "a57f8b7ce54c4afb90ce3755d1e94000",
36+
"resources": [
37+
{
38+
"elasticsearch_cluster_ref_id": "elasticsearch",
39+
"id": "53d104a432a648f68ec76d52ecb521d5",
40+
"kind": "apm",
41+
"ref_id": "apm",
42+
"region": "ece-region"
43+
},
44+
{
45+
"elasticsearch_cluster_ref_id": "elasticsearch",
46+
"id": "39e4a65fc2b14651b666aaff18a13b8f",
47+
"kind": "kibana",
48+
"ref_id": "kibana",
49+
"region": "ece-region"
50+
},
51+
{
52+
"cloud_id": "a57f8b7ce54c4afb90ce3755d1e94000:MTkyLjE2OC40NC4xMC5pcC5lcy5pbzo5MjQzJGQzODIwOWU4ZTYwYzRlYTliY2UzMDc1OThhMTljNGI3JDM5ZTRhNjVmYzJiMTQ2NTFiNjY2YWFmZjE4YTEzYjhm",
53+
"id": "d38209e8e60c4ea9bce307598a19c4b7",
54+
"kind": "elasticsearch",
55+
"ref_id": "elasticsearch",
56+
"region": "ece-region"
57+
}
58+
]
59+
}
60+
Cluster [53d104a432a648f68ec76d52ecb521d5][Apm]: running step "wait-until-running" (Plan duration 1.38505959s)...
61+
Cluster [39e4a65fc2b14651b666aaff18a13b8f][Kibana]: finished running all the plan steps (Total plan duration: 1.73493053s)
62+
Cluster [d38209e8e60c4ea9bce307598a19c4b7][Elasticsearch]: finished running all the plan steps (Total plan duration: 1.849794895s)
63+
Cluster [53d104a432a648f68ec76d52ecb521d5][Apm]: running step "set-maintenance" (Plan duration 11.162178491s)...
64+
Cluster [53d104a432a648f68ec76d52ecb521d5][Apm]: finished running all the plan steps (Total plan duration: 16.677195277s)
65+
66+
## Save the definition to a file for later use.
67+
$ ecctl deployment apm create --generate-payload --id a57f8b7ce54c4afb90ce3755d1e94000 --zones 2 --size 2048 > apm_create_example.json
68+
69+
## Create the deployment piping through the file contents tracking the creation progress
70+
$ cat apm_create_example.json | dev-cli deployment apm create --track --id a57f8b7ce54c4afb90ce3755d1e94000
71+
[...]
1372
----
1473

1574
[float]
1675
=== Options
1776

1877
----
19-
-f, --file string Deployment definition
20-
-h, --help help for create
21-
--id string Overrides the deployment ID on which it's tied
22-
--track Tracks the progress of the performed task
78+
--deployment-template string Optional deployment template ID, automatically obtained from the current deployment
79+
--elasticsearch-ref-id string Optional Elasticsearch ref ID where the Apm deployment will connect to
80+
-f, --file string ApmPayload file definition. See help for more information
81+
--generate-payload Returns the ApmPayload without actually creating the deployment resources
82+
-h, --help help for create
83+
--id string Deployment ID where to create the Apm deployment
84+
--name string Optional name to set for the Apm deployment (Overrides name if present)
85+
--ref-id string RefId for the Apm deployment (default "main-apm")
86+
--size int32 Memory (RAM) in MB that each of the deployment nodes will have (default 512)
87+
-t, --track Tracks the progress of the performed task
88+
--version string Optional version to use. If not specified, it will default to the deployment's stack version
89+
--zones int32 Number of zones the deployment will span (default 1)
2390
----
2491

2592
[float]

docs/ecctl_deployment_create.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Creates a deployment from a file definition, allowing certain flag overrides
77
=== Synopsis
88

99
Creates a deployment from a file definition with an automatically generated idempotency token.
10-
On creation failure, please use the displayed idempotency token to retry the cluster creation with --request-id=+++<token>+++.+++</token>+++
10+
On creation failure, please use the displayed idempotency token to retry the cluster creation with --request-id=+++<token>+++. To track the creation of the resources toggle the --track flag.+++</token>+++
1111

1212
Read more about the deployment definition in https://www.elastic.co/guide/en/cloud-enterprise/current/Deployment_-_CRUD.html
1313

@@ -97,7 +97,7 @@ $ cat deployment_example.json
9797
$ ecctl deployment create -f deployment_example.json --version=7.4.1
9898
[...]
9999
100-
## If th previous deployment creation failed
100+
## If the previous deployment creation failed
101101
$ ecctl deployment create -f deployment_example.json --name adeploy --version=7.4.1
102102
The deployment creation returned with an error, please use the displayed idempotency token
103103
to recreate the deployment resources
@@ -115,7 +115,8 @@ $ ecctl deployment create -f deployment_example.json --name adeploy --version=7.
115115
-h, --help help for create
116116
--name string Overrides the deployment name
117117
--request-id string Optional idempotency token - Can be found in the Stderr device when a previous deployment creation failed, for more information see the examples in the help command page
118-
--version string Overrides all thee deployment's resources to the specified version
118+
-t, --track Tracks the progress of the performed task
119+
--version string Overrides all the deployment's resources to the specified version
119120
----
120121

121122
[float]

docs/ecctl_deployment_elasticsearch.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ ecctl deployment elasticsearch [flags]
4545

4646
* xref:ecctl_deployment[ecctl deployment] - Manages deployments
4747
* xref:ecctl_deployment_elasticsearch_console[ecctl deployment elasticsearch console] - Starts an interactive console with the cluster
48-
* xref:ecctl_deployment_elasticsearch_create[ecctl deployment elasticsearch create] - Creates an Elasticsearch cluster
4948
* xref:ecctl_deployment_elasticsearch_delete[ecctl deployment elasticsearch delete] - Deletes an Elasticsearch cluster
5049
* xref:ecctl_deployment_elasticsearch_diagnose[ecctl deployment elasticsearch diagnose] - Generates a diagnostics bundle for the cluster
5150
* xref:ecctl_deployment_elasticsearch_instances[ecctl deployment elasticsearch instances] - Manages elasticsearch at the instance level

docs/ecctl_deployment_elasticsearch_diagnose.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Generates a diagnostics bundle for the cluster
66
[float]
77
=== Synopsis
88

9-
Generates a diagnostics bundle for the cluster
9+
Generates a diagnostics bundle for the cluster, a timeout increase might be necessary
1010

1111
----
1212
ecctl deployment elasticsearch diagnose <cluster id> [flags]

docs/ecctl_deployment_elasticsearch_monitoring_enable.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[#ecctl_deployment_elasticsearch_monitoring_enable]
22
== ecctl deployment elasticsearch monitoring enable
33

4-
Enables monitoring for the cluster by sending data to a monitoring cluster you specify.
4+
Enables monitoring for the cluster by sending data to a monitoring cluster you specify
55

66
[float]
77
=== Synopsis
88

9-
Enables monitoring for the cluster by sending data to a monitoring cluster you specify.
9+
Enables monitoring for the cluster by sending data to a monitoring cluster you specify
1010

1111
----
1212
ecctl deployment elasticsearch monitoring enable <monitored cluster id> <monitoring cluster id> [flags]

docs/ecctl_deployment_elasticsearch_upgrade.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ecctl deployment elasticsearch upgrade <cluster id> --version=<version> [flags]
1818
----
1919
-h, --help help for upgrade
2020
-t, --track Tracks the progress of the performed task
21-
-v, --version string Filters per version (required)
21+
-v, --version string Version to upgrade to (required)
2222
----
2323

2424
[float]

docs/ecctl_deployment_kibana.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ ecctl deployment kibana [flags]
4646
* xref:ecctl_deployment[ecctl deployment] - Manages deployments
4747
* xref:ecctl_deployment_kibana_create[ecctl deployment kibana create] - Creates a Kibana instance
4848
* xref:ecctl_deployment_kibana_delete[ecctl deployment kibana delete] - Deletes a Kibana instance
49-
* xref:ecctl_deployment_kibana_enable[ecctl deployment kibana enable] - Enables a kibana instance in the selected deployment
5049
* xref:ecctl_deployment_kibana_list[ecctl deployment kibana list] - Returns the list of kibana instances
5150
* xref:ecctl_deployment_kibana_plan[ecctl deployment kibana plan] - Manages Kibana plans
5251
* xref:ecctl_deployment_kibana_reallocate[ecctl deployment kibana reallocate] - Reallocates Kibana instances

0 commit comments

Comments
 (0)