Skip to content

Commit

Permalink
docs: merge s3_gateway.md into gateway.md (#5353)
Browse files Browse the repository at this point in the history
  • Loading branch information
timfeirg authored Dec 10, 2024
1 parent 0b1a218 commit 9c19b3d
Show file tree
Hide file tree
Showing 19 changed files with 261 additions and 573 deletions.
4 changes: 2 additions & 2 deletions docs/en/administration/monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ See [CSI Driver documentation](https://juicefs.com/docs/csi/administration/going
This feature needs to run JuiceFS client version 0.17.1 and above.
:::

The [JuiceFS S3 Gateway](../deployment/s3_gateway.md) will provide monitoring metrics at the address `http://localhost:9567/metrics` by default, or you can customize it with the `-metrics` option. For example:
The [JuiceFS S3 Gateway](../guide/gateway.md) will provide monitoring metrics at the address `http://localhost:9567/metrics` by default, or you can customize it with the `-metrics` option. For example:

```shell
juicefs gateway --metrics localhost:9567 ...
```

If you are deploying JuiceFS S3 Gateway [in Kubernetes](../deployment/s3_gateway.md#deploy-in-kubernetes), you can refer to the Prometheus configuration in the [Kubernetes](#kubernetes) section to collect monitoring metrics (the difference is mainly in the regular expression for the label `__meta_kubernetes_pod_label_app_kubernetes_io_name`), e.g.:
If you are deploying JuiceFS S3 Gateway [in Kubernetes](../guide/gateway.md#deploy-in-kubernetes), you can refer to the Prometheus configuration in the [Kubernetes](#kubernetes) section to collect monitoring metrics (the difference is mainly in the regular expression for the label `__meta_kubernetes_pod_label_app_kubernetes_io_name`), e.g.:

```yaml {6-8}
scrape_configs:
Expand Down
2 changes: 1 addition & 1 deletion docs/en/administration/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Please refer to [official documentation](https://juicefs.com/docs/csi/upgrade-cs

Like [mount point](#mount-point), upgrading S3 Gateway is to replace the old version with the new version.

If it is [deployed through Kubernetes](../deployment/s3_gateway.md#deploy-in-kubernetes), you need to upgrade according to the specific deployment method, which is described in detail below.
If it is [deployed through Kubernetes](../guide/gateway.md#deploy-in-kubernetes), you need to upgrade according to the specific deployment method, which is described in detail below.

### Upgrade via kubectl

Expand Down
250 changes: 0 additions & 250 deletions docs/en/deployment/s3_gateway.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/en/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ In addition to mounting, the following methods are also supported:

- Kubernetes CSI Driver: Use JuiceFS as the storage layer of Kubernetes cluster through the Kubernetes CSI Driver. For details, please refer to ["Use JuiceFS on Kubernetes"](deployment/how_to_use_on_kubernetes.md).
- Hadoop Java SDK: It is convenient to use a Java client compatible with the HDFS interface to access JuiceFS in the Hadoop ecosystem. For details, please refer to ["Use JuiceFS on Hadoop Ecosystem"](deployment/hadoop_java_sdk.md).
- S3 Gateway: Access JuiceFS through the S3 protocol. For details, please refer to ["Deploy JuiceFS S3 Gateway"](deployment/s3_gateway.md).
- S3 Gateway: Access JuiceFS through the S3 protocol. For details, please refer to ["Deploy JuiceFS S3 Gateway"](./guide/gateway.md).
- Docker Volume Plugin: A convenient way to use JuiceFS in Docker, please refer to ["Use JuiceFS on Docker"](deployment/juicefs_on_docker.md).
- WebDAV Gateway: Access JuiceFS via WebDAV protocol

Expand Down
Loading

0 comments on commit 9c19b3d

Please sign in to comment.