This is an automated email from the ASF dual-hosted git repository.
aengineer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new da56899 HDDS-1733. Fix Ozone documentation (#1031)
da56899 is described below
commit da568996afdeb42c401338607ba623ffa5741422
Author: dineshchitlangia <[email protected]>
AuthorDate: Fri Jun 28 18:59:33 2019 -0400
HDDS-1733. Fix Ozone documentation (#1031)
---
hadoop-hdds/docs/content/_index.md | 6 +++---
hadoop-hdds/docs/content/beyond/Containers.md | 3 ++-
hadoop-hdds/docs/content/recipe/Prometheus.md | 2 +-
.../recipe}/prometheus-key-allocate.png | Bin
.../docs/{static => content/recipe}/prometheus.png | Bin
hadoop-hdds/docs/content/start/_index.md | 16 ++++++++--------
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hadoop-hdds/docs/content/_index.md
b/hadoop-hdds/docs/content/_index.md
index 7558ce3..bb1bf9a 100644
--- a/hadoop-hdds/docs/content/_index.md
+++ b/hadoop-hdds/docs/content/_index.md
@@ -34,11 +34,11 @@ ref "JavaApi.md"
>}}), [S3 protocol support] ({{< ref "S3.md" >}}), and a [command line
>interface]
({{< ref "shell/_index.md" >}}) which makes it easy to use Ozone.
-Ozone consists of volumes, buckets, and Keys:
+Ozone consists of volumes, buckets, and keys:
* Volumes are similar to user accounts. Only administrators can create or
delete volumes.
-* Buckets are similar to directories. A bucket can contain any number of keys,
but buckets cannot contain other buckets.
-* Keys are similar to files. A bucket can contain any number of keys.
+* Buckets are similar to directories. A bucket can contain any number of keys,
but buckets cannot contain other buckets.
+* Keys are similar to files.
<a href="{{< ref "start/_index.md" >}}"> <button type="button"
class="btn btn-success btn-lg">Next >></button>
diff --git a/hadoop-hdds/docs/content/beyond/Containers.md
b/hadoop-hdds/docs/content/beyond/Containers.md
index 1f3390f..b4dc94f 100644
--- a/hadoop-hdds/docs/content/beyond/Containers.md
+++ b/hadoop-hdds/docs/content/beyond/Containers.md
@@ -202,7 +202,7 @@ Ozone related container images and source locations:
<td>docker-hadoop-runner</td>
<td>centos</td>
<td>jdk11,jdk8,latest</td>
- <td>This is the base image used for testing Hadoop Ozone.
+ <td>This is the base image used for testing Hadoop Ozone.
This is a set of utilities that make it easy for us run ozone.</td>
</tr>
<tr>
@@ -211,6 +211,7 @@ Ozone related container images and source locations:
<td>https://github.com/apache/hadoop-docker-ozone</td>
<td>ozone-build </td>
<td> </td>
+ <td> </td>
<td>TODO: Add more documentation here.</td>
</tr>
</tbody>
diff --git a/hadoop-hdds/docs/content/recipe/Prometheus.md
b/hadoop-hdds/docs/content/recipe/Prometheus.md
index 0c0239d..9151b31 100644
--- a/hadoop-hdds/docs/content/recipe/Prometheus.md
+++ b/hadoop-hdds/docs/content/recipe/Prometheus.md
@@ -81,7 +81,7 @@ http://localhost:9090/targets
http://localhost:9090/graph?g0.range_input=1h&g0.expr=om_metrics_num_key_allocate&g0.tab=1
-
+
## Note
diff --git a/hadoop-hdds/docs/static/prometheus-key-allocate.png
b/hadoop-hdds/docs/content/recipe/prometheus-key-allocate.png
similarity index 100%
rename from hadoop-hdds/docs/static/prometheus-key-allocate.png
rename to hadoop-hdds/docs/content/recipe/prometheus-key-allocate.png
diff --git a/hadoop-hdds/docs/static/prometheus.png
b/hadoop-hdds/docs/content/recipe/prometheus.png
similarity index 100%
rename from hadoop-hdds/docs/static/prometheus.png
rename to hadoop-hdds/docs/content/recipe/prometheus.png
diff --git a/hadoop-hdds/docs/content/start/_index.md
b/hadoop-hdds/docs/content/start/_index.md
index 9334e55..5529661 100644
--- a/hadoop-hdds/docs/content/start/_index.md
+++ b/hadoop-hdds/docs/content/start/_index.md
@@ -38,7 +38,7 @@ Kubernetes or bare-metal.
<h2>Running Ozone from Docker Hub</h2>
You can try out Ozone using docker hub without downloading the official
release. This makes it easy to explore Ozone.
-
+<br />
{{<card title="Starting ozone inside a single container"
link="start/StartFromDockerHub.md" link-text="Ozone In Docker"
image="start/docker.png">}}
The simplest and easiest way to start an ozone cluster
to explore what it can do is to start ozone via docker.
@@ -54,21 +54,21 @@ You can try out Ozone using docker hub without downloading
the official release.
<h2>Running Ozone from an Official Release</h2>
Apache Ozone can also be run from the official release packages. Along with
the official source releases, we also release a set of convenience binary
packages. It is easy to run these binaries in different configurations.
-
- {{<card title="Deploying Ozone on a physical cluster" link="start/OnPrem"
link-text="On-Prem Ozone Cluster" image="start/hadoop.png">}}
+<br />
+ {{<card title="Ozone on a physical cluster" link="start/OnPrem"
link-text="On-Prem Ozone Cluster" image="start/hadoop.png">}}
Ozone is designed to work concurrently with HDFS. The physical cluster
instructions explain each component of Ozone and how to deploy with maximum
control.
{{</card>}}
- {{<card title="Deploying Ozone on K8s" link="start/Kubernetes"
link-text="Kubernetes" image="start/k8s.png">}}
-Ozone is designed to work well under Kubernetes. These are instructions on how
to deploy Ozone on K8s platform. Ozone provides a replicated storage solution
for K8s based Applications.
+ {{<card title="Ozone on K8s" link="start/Kubernetes" link-text="Kubernetes"
image="start/k8s.png">}}
+Ozone is designed to work well under Kubernetes. These are instructions to
deploy Ozone on K8s. Ozone provides a replicated storage solution for K8s based
apps.
{{</card>}}
- {{<card title="Deploy Ozone using MiniKube" link="start/Minikube"
link-text="Minikube cluster" image="start/minikube.png">}}
+ {{<card title="Ozone using MiniKube" link="start/Minikube"
link-text="Minikube cluster" image="start/minikube.png">}}
Ozone comes with a standard set of K8s resources. You can deploy them to
MiniKube and experiment with the K8s based deployments.
{{</card>}}
- {{<card title="An Ozone cluster in Local Node."
link="start/RunningViaDocker.md" link-text="docker-compose"
image="start/docker.png">}}
- We also ship standard docker files with official release, if you want to use
them. These are part of official release and not depend upon Docker Hub.
+ {{<card title="Ozone cluster in Local Node" link="start/RunningViaDocker.md"
link-text="docker-compose" image="start/docker.png">}}
+ We also ship standard docker files with official release. These are part of
official release and not depend upon Docker Hub.
{{</card>}}
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
