Skip to content

Commit f3969a6

Browse files
fmassotPSeitzevanxg852000
authored
Complete CLI docs. (#1029)
* Complete CLI docs. * Update docs/reference/cli.md Co-authored-by: PSeitz <[email protected]> * Update docs/reference/cli.md Co-authored-by: PSeitz <[email protected]> * Improve CLI wording/examples. * Update CONTRIBUTING.md Co-authored-by: Evance Soumaoro <[email protected]> * Update docs/reference/cli.md Co-authored-by: Evance Soumaoro <[email protected]> Co-authored-by: PSeitz <[email protected]> Co-authored-by: Evance Soumaoro <[email protected]>
1 parent 4cea573 commit f3969a6

File tree

15 files changed

+360
-157
lines changed

15 files changed

+360
-157
lines changed

CONTRIBUTING.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,27 @@ We also have nightly builds that are pushed to dockerhub. This helps continiousl
5555
## Testing release (alpha, beta, rc)
5656

5757
The following Quickwit installation command `curl -L https://install.quickwit.io | sh` always installs the latest stable version of quickwit. To make it easier in installing and testing new (alpha, beta, rc) releases, you can manually pull and execute the script as `./install.sh --allow-any-latest-version`. This will force the script to install any latest available release package.
58+
59+
60+
# Documentation
61+
62+
Quickwit documentation is located in the docs directory.
63+
64+
## Generating the CLI docs.
65+
66+
The [CLI doc page](docs/reference/cli.md) is partly generated by a script.
67+
To update it, first run the script:
68+
```bash
69+
cargo run --bin generate_markdown > docs/reference/cli_insert.md
70+
```
71+
72+
Then manually edit the [doc page](docs/reference/cli.md) to update it.
73+
I put two comments to indicate where you want to insert the new docs and where it ends:`
74+
```markdown
75+
[comment]: <> (Insert auto generated CLI docs from here.)
76+
77+
...docs to insert...
78+
79+
[comment]: <> (End of auto generated CLI docs.)
80+
```
81+

config/tutorials/gh-archive/index-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#
44
version: 0
55

6+
index_id: gh-archive
7+
68
doc_mapping:
79
store_source: false
810
field_mappings:

config/tutorials/hdfs-logs/index-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
version: 0
66

7+
index_id: hdfs-logs
8+
79
doc_mapping:
810
field_mappings:
911
- name: timestamp

config/tutorials/wikipedia/index-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
version: 0
66

7+
index_id: wikipedia
8+
79
doc_mapping:
810
field_mappings:
911
- name: title

docs/get-started/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ curl -o wikipedia_index_config.yaml https://raw.githubusercontent.com/quickwit-i
9191
curl -o wiki-articles-10000.json https://quickwit-datasets-public.s3.amazonaws.com/wiki-articles-10000.json
9292

9393
# create, index and search using the container
94-
docker run -v "$(pwd)":"/quickwit/qwdata" quickwit/quickwit index create --index wikipedia --index-config ./qwdata/wikipedia_index_config.yaml
94+
docker run -v "$(pwd)":"/quickwit/qwdata" quickwit/quickwit index create --index-config ./qwdata/wikipedia_index_config.yaml
9595

9696
docker run -v "$(pwd)":"/quickwit/qwdata" quickwit/quickwit index ingest --index wikipedia --input-path ./qwdata/wiki-articles-10000.json
9797

docs/get-started/quickstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export QW_CONFIG=./config/quickwit.yaml
8080
Now we can create the index with the command:
8181

8282
```bash
83-
./quickwit index create --index wikipedia --index-config ./wikipedia_index_config.yaml
83+
./quickwit index create --index-config ./wikipedia_index_config.yaml
8484
```
8585

8686
Check that a directory `./qwdata/wikipedia` has been created, Quickwit will write index files here and a `quickwit.json` which contains the [index metadata](../overview/architecture.md#index-metadata).
@@ -155,7 +155,7 @@ Run the following command from within Quickwit's installation directory.
155155
```bash
156156
curl -o wikipedia_index_config.yaml https://raw.githubusercontent.com/quickwit-inc/quickwit/main/config/tutorials/wikipedia/index-config.yaml
157157
export QW_CONFIG=./config/quickwit.yaml
158-
./quickwit index create --index wikipedia --index-config ./wikipedia_index_config.yaml
158+
./quickwit index create --index-config ./wikipedia_index_config.yaml
159159
curl -o wiki-articles-10000.json https://quickwit-datasets-public.s3.amazonaws.com/wiki-articles-10000.json
160160
./quickwit index ingest --index wikipedia --input-path ./wiki-articles-10000.json
161161
./quickwit index search --index wikipedia --query "barack AND obama"

docs/guides/add-full-text-search-to-your-olap-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ search_settings:
8080

8181
```bash
8282
curl -o gh-archive-index-config.yaml https://raw.githubusercontent.com/quickwit-inc/quickwit/main/config/tutorials/gh-archive/index-config.yaml
83-
./quickwit index create --index gh-archive --index-config gh-archive-index-config.yaml
83+
./quickwit index create --index-config gh-archive-index-config.yaml
8484
```
8585

8686
## Indexing events

docs/guides/tutorial-hdfs-logs-distributed-search-aws-s3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export S3_PATH=s3://{path/to/bucket}/indexes
8181
```
8282

8383
```bash
84-
# configuration for our indexer node
84+
# Create Quickwit config file.
8585
echo "version: 0
8686
metastore_uri: ${S3_PATH}
8787
default_index_root_uri: ${S3_PATH}
@@ -91,7 +91,7 @@ default_index_root_uri: ${S3_PATH}
9191
We can now create the index with the `create` subcommand.
9292

9393
```bash
94-
./quickwit index create --index hdfslogs --index-config ./hdfslogs_index_config.yaml --config ./config.yaml
94+
./quickwit index create --index-config hdfslogs_index_config.yaml --config config.yaml
9595
```
9696

9797
:::note

docs/guides/tutorial-hdfs-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export QW_CONFIG=./config/quickwit.yaml
8686
```
8787

8888
```bash
89-
./quickwit index create --index hdfslogs --index-config ./hdfslogs_index_config.yaml
89+
./quickwit index create --index-config hdfslogs_index_config.yaml
9090
```
9191

9292
You're now ready to fill the index.

0 commit comments

Comments
 (0)