Skip to content

Commit

Permalink
Fix references to harvester usage
Browse files Browse the repository at this point in the history
  • Loading branch information
rconway committed Apr 3, 2024
1 parent 1917944 commit a7c7ebb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion deploy/bin/harvest
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main() {
# Copy config to pod and invoke harvester
kubectl -n rm exec -i "${pod_name}" -- rm -f "${tmp_config_file}"
kubectl -n rm cp "$(realpath "${tmp_config_file}")" "${pod_name}":"${tmp_config_file}"
kubectl -n rm exec -i "${pod_name}" -- python3 -m harvester harvest --config-file "${tmp_config_file}" --host data-access-redis-master --port 6379 "${harvester_name}"
kubectl -n rm exec -i "${pod_name}" -- python3 -m harvester harvest --config-file "${tmp_config_file}" "${harvester_name}"
}

create_config_file() {
Expand Down
10 changes: 5 additions & 5 deletions docs/eoepca/data-access.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,12 @@ The harvester can either do one-off harvests via the CLI or listen on a redis qu

In order to start a harvest from the CLI, the operator first needs to connect to the kubernetes pod of the harvester. Within that pod, the harvest can be executed like this...
```bash
python3 -m harvester harvest --config-file /config-run.yaml --host data-access-redis-master --port 6379 Creodias-Opensearch
python3 -m harvester harvest --config-file /config-run.yaml Sentinel2
```

This will invoke the Creodias-Opensearch harvester with default arguments. When some values are to be overridden, the --values switch can be used to pass override values. These values must be a JSON string. The following example adjusts the begin and end times of the query parameters...
This will invoke the `Sentinel2` harvester with default arguments. When some values are to be overridden, the --values switch can be used to pass override values. These values must be a JSON string. The following example adjusts the begin and end times of the query parameters...
```bash
python3 -m harvester harvest --config-file /config-run.yaml --host data-access-redis-master --port 6379 Creodias-Opensearch --values '{"resource": {"query": {"time": {"begin": "2020-09-10T00:00:00Z", "end": "2020-09-11T00:00:00Z"}}}}'
python3 -m harvester harvest --config-file /config-run.yaml Sentinel2 --values '{"resource": {"query": {"time": {"begin": "2020-09-10T00:00:00Z", "end": "2020-09-11T00:00:00Z"}}}}'
```

##### Harvests via the harvest daemon
Expand All @@ -324,7 +324,7 @@ The harvester pod runs a service listening on a redis queue. When a message is r

To send a harvesting request via the redis queue, it is necessary to connect to the redis pod and execute the redis-cli there. Then the following command can be used to achieve the same result as above with CLI harvesting...
```bash
redis-cli LPUSH '{"name": "Creodias-Opensearch", "values": {"resource": {"query": {"time": {"begin": "2020-09-10T00:00:00Z", "end": "2020-09-11T00:00:00Z"}}}}}'
redis-cli LPUSH '{"name": "Sentinel2", "values": {"resource": {"query": {"time": {"begin": "2020-09-10T00:00:00Z", "end": "2020-09-11T00:00:00Z"}}}}}'
```

#### Results of the harvesting
Expand Down Expand Up @@ -531,7 +531,7 @@ The Data Access and Resource Catalogue services are configured to properly inter

The harvesting of data can be triggered (post deployment), in accordance with this default configuration, by connecting to the `rm/harvester` service and executing the command...
```
python3 -m harvester harvest --config-file /config-run.yaml --host data-access-redis-master --port 6379 Creodias-Opensearch
python3 -m harvester harvest --config-file /config-run.yaml Sentinel2
```
### Ad-hoc Harvesting
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart/creodias-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Once the file `creodias-options` has been well populated for your environment, t

The harvester can be [deployed with a default configuration](../eoepca/data-access.md#harvester-helm-configuration) file at `/config.yaml`. As described in the [Data Access section](../eoepca/data-access.md#starting-the-harvester), harvesting according to this configuration can be triggered with...
```
kubectl -n rm exec -it deployment.apps/data-access-harvester -- python3 -m harvester harvest --config-file /config.yaml --host data-access-redis-master --port 6379 Creodias-Opensearch
kubectl -n rm exec -it deployment.apps/data-access-harvester -- python3 -m harvester harvest --config-file /config.yaml Sentinel2
```

See the [Harvester](#harvester) section below for an explanation of this harvester configuration.
Expand Down

0 comments on commit a7c7ebb

Please sign in to comment.