Skip to content

Commit 34cb5a0

Browse files
authored
Add Prettier tool & normalize markdown of selected files (open-telemetry#1290)
1 parent a88943e commit 34cb5a0

File tree

7 files changed

+134
-87
lines changed

7 files changed

+134
-87
lines changed

CONTRIBUTING.md

+33-27
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ files][].
1313
These instructions are for [Gitpod.io][], adjust as needed for your favorite
1414
cloud IDE:
1515

16-
1. Fork this repo. For help, see [Fork a repo][Fork].
17-
2. From [gitpod.io/workspaces][], create a new workspace (do this only once) or
16+
1. Fork this repo. For help, see [Fork a repo][fork].
17+
2. From [gitpod.io/workspaces][], create a new workspace (do this only once) or
1818
open an existing workspace over your fork. You can also visit a link of the
1919
form:
2020
<https://gitpod.io#https://github.com/YOUR_GITHUB_ID/opentelemetry.io>.
2121

2222
> **Note**: If you have the necessary permissions to work from this repo, or
23-
just want to look around, open
24-
<https://gitpod.io/#https://github.com/open-telemetry/opentelemetry.io>.
23+
> just want to look around, open
24+
> <https://gitpod.io/#https://github.com/open-telemetry/opentelemetry.io>.
2525
2626
Gitpod will automatically install the repo-specific packages for you. You're now
2727
ready to [build](#build), [serve](#serve) and/or make updates to the website
2828
files.
2929

3030
### Local setup
3131

32-
1. Install the latest [LTS release][] of **Node**. We recommend using
32+
1. Install the latest [LTS release][] of **Node**. We recommend using
3333
**[nvm][]** to manage your Node installation (Linux command shown):
3434
```console
3535
$ nvm install --lts
3636
```
37-
2. [Fork][] and then [clone][] this repo.
38-
3. Change to the repo directory.
39-
4. Get npm packages and other prerequisites:
37+
2. [Fork][] and then [clone][] this repo.
38+
3. Change to the repo directory.
39+
4. Get npm packages and other prerequisites:
4040
```console
4141
$ npm install
4242
```
@@ -62,13 +62,13 @@ To **serve** the site run:
6262
$ npm run serve
6363
```
6464

65-
> **Note 1**: The Netlify CLI will locally serve the site at at [localhost:8888][].
65+
> **Note 1**: The Netlify CLI will locally serve the site at [localhost:8888][].
6666
6767
> **Note 2**: The serve command serves files from memory, not from disk.
6868
6969
> **Note 3**: See an error like `too many open files` or `pipe failed` under
70-
> macOS? You may need to increase the file descriptor limit. See [Hugo issue
71-
> #6109](https://github.com/gohugoio/hugo/issues/6109).
70+
> macOS? You may need to increase the file descriptor limit. See
71+
> [Hugo issue #6109](https://github.com/gohugoio/hugo/issues/6109).
7272
7373
## Content and submodules
7474

@@ -81,8 +81,10 @@ The website is built from the following content:
8181
Note that nonstandard mount points and symlinked sections under `content/` refer
8282
to directories under [content-modules][], and no where else.
8383

84-
[config.yaml]: https://github.com/open-telemetry/opentelemetry.io/blob/main/config.yaml
85-
[content-modules]: https://github.com/open-telemetry/opentelemetry.io/tree/main/content-modules
84+
[config.yaml]:
85+
https://github.com/open-telemetry/opentelemetry.io/blob/main/config.yaml
86+
[content-modules]:
87+
https://github.com/open-telemetry/opentelemetry.io/tree/main/content-modules
8688

8789
## Submitting a change
8890

@@ -100,11 +102,11 @@ that the corresponding submodule is linked to, rather than inside the submodule
100102
itself.
101103

102104
> **For expert contributors**, you can work directly in the submodule. You'll
103-
then be able to directly build and serve your (submodule) changes. By default,
104-
the CI scripts get submodules on every invocation. To prevent this behavior
105-
while you work within a submodule, set the environment variable `GET="no"`.
106-
You'll also need to `git fetch --unshallow` the submodule before you can submit
107-
a PR. Alternatively, set `DEPTH=" "` and re-fetch submodules.
105+
> then be able to directly build and serve your (submodule) changes. By default,
106+
> the CI scripts get submodules on every invocation. To prevent this behavior
107+
> while you work within a submodule, set the environment variable `GET="no"`.
108+
> You'll also need to `git fetch --unshallow` the submodule before you can
109+
> submit a PR. Alternatively, set `DEPTH=" "` and re-fetch submodules.
108110
109111
## Site deploys and PR previews
110112

@@ -117,15 +119,19 @@ the production server.
117119
To see deploy logs and more, visit project's [dashboard][] -- Netlify login
118120
required.
119121

120-
[clone]: https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository
122+
[clone]:
123+
https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository
121124
[dashboard]: https://app.netlify.com/sites/opentelemetry/overview
122-
[deploy preview]: https://www.netlify.com/blog/2016/07/20/introducing-deploy-previews-in-netlify/
123-
[Editing files]: https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files
124-
[Fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
125-
[Gitpod.io]: https://gitpod.io
125+
[deploy preview]:
126+
https://www.netlify.com/blog/2016/07/20/introducing-deploy-previews-in-netlify/
127+
[editing files]:
128+
https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files
129+
[fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
130+
[gitpod.io]: https://gitpod.io
126131
[gitpod.io/workspaces]: https://gitpod.io/workspaces
127-
[Hugo]: https://gohugo.io
132+
[hugo]: https://gohugo.io
128133
[localhost:8888]: http://localhost:8888
129-
[LTS release]: https://nodejs.org/en/about/releases/
130-
[Netlify]: https://netlify.com
131-
[nvm]: https://github.com/nvm-sh/nvm/blob/master/README.md#installing-and-updating
134+
[lts release]: https://nodejs.org/en/about/releases/
135+
[netlify]: https://netlify.com
136+
[nvm]:
137+
https://github.com/nvm-sh/nvm/blob/master/README.md#installing-and-updating

README.md

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# <img src="https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png" alt="OpenTelemetry Icon" width="45" height=""> OpenTelemetry.io
22

33
This is the source repo for the [OpenTelemetry][] website and project
4-
documentation. The site is [built][CONTRIBUTING.md] using [Hugo][] and hosted on
4+
documentation. The site is [built][contributing.md] using [Hugo][] and hosted on
55
[Netlify][].
66

77
## Adding a project to the OpenTelemetry Registry
88

99
Do you maintain or contribute to an integration for OpenTelemetry? We'd love to
1010
feature your project in the [registry][]!
1111

12-
To add your project, submit a [pull request][PR]. You'll need to create a data
12+
To add your project, submit a [pull request][pr]. You'll need to create a data
1313
file in `/content/en/registry` for your project. You can find a template in
1414
`./templates/registry-entry.md`
1515

1616
## Submitting a blog post
1717

18-
Follow the [setup instructions][CONTRIBUTING.md] then, to create a skeletal blog
18+
Follow the [setup instructions][contributing.md] then, to create a skeletal blog
1919
post, run the following command from the repo root:
2020

2121
```console
@@ -25,33 +25,40 @@ $ hugo new content/en/blog/2022/file-name-for-your-blog-post.md
2525
Start editing the markdown file at the path you provided in the previous
2626
command. The file is initialized from the blog-post starter under
2727
[archetypes](archetypes). Once your post is ready, submit it through a [pull
28-
request][PR].
28+
request][pr].
2929

3030
## Contributing
3131

3232
See [CONTRIBUTING.md][].
3333

3434
Roles:
35+
3536
- Approvers: [@open-telemetry/docs-approvers][]
3637
- Maintainers: [@open-telemetry/docs-maintainers][]
3738
- Blog approvers: [@open-telemetry/blog-approvers][]
3839

3940
Learn more about roles in the [community repository][]. Thanks to [all who have
4041
already contributed][contributors]!
4142

42-
## Licenses
43+
## Licenses
4344

4445
- Documentation: [CC-BY-4.0](LICENSE)
4546
- Code: [Apache-2.0](LICENSE-CODE)
4647

47-
[@open-telemetry/blog-approvers]: https://github.com/orgs/open-telemetry/teams/blog-approvers
48-
[@open-telemetry/docs-approvers]: https://github.com/orgs/open-telemetry/teams/docs-approvers
49-
[@open-telemetry/docs-maintainers]: https://github.com/orgs/open-telemetry/teams/docs-maintainers
50-
[community repository]: https://github.com/open-telemetry/community/blob/main/community-membership.md
51-
[CONTRIBUTING.md]: CONTRIBUTING.md
52-
[contributors]: https://github.com/open-telemetry/opentelemetry.io/graphs/contributors
53-
[Hugo]: https://gohugo.io
54-
[Netlify]: https://netlify.com
55-
[OpenTelemetry]: https://opentelemetry.io
56-
[PR]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
48+
[@open-telemetry/blog-approvers]:
49+
https://github.com/orgs/open-telemetry/teams/blog-approvers
50+
[@open-telemetry/docs-approvers]:
51+
https://github.com/orgs/open-telemetry/teams/docs-approvers
52+
[@open-telemetry/docs-maintainers]:
53+
https://github.com/orgs/open-telemetry/teams/docs-maintainers
54+
[community repository]:
55+
https://github.com/open-telemetry/community/blob/main/community-membership.md
56+
[contributing.md]: CONTRIBUTING.md
57+
[contributors]:
58+
https://github.com/open-telemetry/opentelemetry.io/graphs/contributors
59+
[hugo]: https://gohugo.io
60+
[netlify]: https://netlify.com
61+
[opentelemetry]: https://opentelemetry.io
62+
[pr]:
63+
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
5764
[registry]: https://opentelemetry.io/registry/

content/en/_index.md

+38-19
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,85 @@
11
---
22
title: OpenTelemetry
33
show_banner: true
4-
mission_url: https://github.com/open-telemetry/community/blob/main/mission-vision-values.md#otel-mission-vision-and-values
54
---
65

76
{{< blocks/cover image_anchor="top" height="max" color="primary" >}}
87
<img src="/img/logos/opentelemetry-horizontal-color.svg" class="otel-logo" alt="OpenTelemetry"/>
8+
99
<h1>High-quality, ubiquitous, and portable telemetry to enable effective observability</h1>
1010

1111
<div class="l-primary-buttons mt-5">
1212

13-
- [Learn more]({{< relref "/docs/concepts" >}})
14-
- <a href="{{<param mission_url >}}" target="_blank" rel="noopener">Mission and vision</a>
13+
- [Learn more](/docs/concepts/)
14+
- [Mission and vision][]
15+
16+
[mission and vision]:
17+
https://github.com/open-telemetry/community/blob/main/mission-vision-values.md#otel-mission-vision-and-values
18+
1519
</div>
1620

1721
<div class="h3 mt-4">Get started!</div>
1822
<div class="l-get-started-buttons">
1923

20-
- [Collector]({{< relref "/docs/collector/getting-started" >}})
21-
- [Java]({{< relref "/docs/instrumentation/java/getting-started" >}})
22-
- [Go]({{< relref "/docs/instrumentation/go/getting-started" >}})
23-
- [.NET]({{< relref "/docs/instrumentation/net/getting-started" >}})
24-
- [JavaScript]({{< relref "/docs/instrumentation/js/getting-started" >}})
25-
- [<i class="fas fa-ellipsis-h"></i>]({{< relref "/docs/instrumentation" >}})
24+
- [Collector](/docs/collector/getting-started/)
25+
- [Java](/docs/instrumentation/java/getting-started/)
26+
- [Go](/docs/instrumentation/go/getting-started/)
27+
- [.NET](/docs/instrumentation/net/getting-started/)
28+
- [JavaScript](/docs/instrumentation/js/getting-started/)
29+
- [<i class="fas fa-ellipsis-h"></i>](/docs/instrumentation/)
2630
</div>
2731
{{< /blocks/cover >}}
2832

2933
{{% blocks/lead color="white" %}}
34+
3035
OpenTelemetry is a collection of tools, APIs, and SDKs. Use it to instrument,
31-
generate, collect, and export telemetry data (metrics, logs, and traces) to
32-
help you analyze your software's performance and behavior.
36+
generate, collect, and export telemetry data (metrics, logs, and traces) to help
37+
you analyze your software's performance and behavior.
38+
39+
> OpenTelemetry is **generally available** across
40+
> [several languages](/docs/instrumentation/) and is suitable for use.
3341
34-
> OpenTelemetry is **generally available** across [several languages]({{< relref "/docs/instrumentation" >}}) and is suitable for use.
3542
{{% /blocks/lead %}}
3643

3744
{{% blocks/section color="dark" %}}
3845

3946
{{% blocks/feature icon="fas fa-chart-line" title="Traces, Metrics, Logs"%}}
40-
Create and collect telemetry data from your services and software, then forward them to a variety of analysis tools.
41-
{{% /blocks/feature %}}
47+
48+
Create and collect telemetry data from your services and software, then forward
49+
them to a variety of analysis tools. {{% /blocks/feature %}}
4250

4351
{{% blocks/feature icon="fas fa-magic" title="Drop-In Instrumentation"%}}
44-
OpenTelemetry integrates with popular libraries and frameworks such as [Spring](https://spring.io/), [ASP.NET Core](https://docs.microsoft.com/aspnet/core), [Express](https://expressjs.com/), [Quarkus](https://quarkus.io/), and more! Installation and integration can be as simple as a few lines of code.
52+
53+
OpenTelemetry integrates with popular libraries and frameworks such as
54+
[Spring](https://spring.io),
55+
[ASP.NET Core](https://docs.microsoft.com/aspnet/core),
56+
[Express](https://expressjs.com), [Quarkus](https://quarkus.io), and more!
57+
Installation and integration can be as simple as a few lines of code.
58+
4559
{{% /blocks/feature %}}
4660

4761
{{% blocks/feature icon="fab fa-github" title="Open Source, Vendor Neutral" url="https://github.com/open-telemetry"%}}
48-
100% Free and Open Source, OpenTelemetry is adopted and supported by [industry leaders](/vendors) in the observability space.
62+
63+
100% Free and Open Source, OpenTelemetry is adopted and supported by
64+
[industry leaders](/vendors) in the observability space.
65+
4966
{{% /blocks/feature %}}
5067

5168
{{% /blocks/section %}}
5269

5370
{{% blocks/section color="secondary" %}}
71+
5472
<div id="cncf">
5573

5674
**OpenTelemetry is a [CNCF][] [incubating][] project**.
5775

5876
Formed through a merger of the OpenTracing and OpenCensus projects.
5977

60-
[![CNCF logo][]][CNCF]
78+
[![CNCF logo][]][cncf]
6179

62-
[CNCF]: https://cncf.io/
63-
[CNCF logo]: /img/logos/cncf-white.svg
80+
[cncf]: https://cncf.io
81+
[cncf logo]: /img/logos/cncf-white.svg
6482
[incubating]: https://www.cncf.io/projects/
83+
6584
</div>
6685
{{% /blocks/section %}}

content/en/community/_index.md

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
---
22
title: Community
3-
menu:
4-
main:
5-
weight: 40
3+
menu: { main: { weight: 40 } }
64
---
75

86
{{% blocks/section color="dark" %}}
97

108
{{% blocks/feature icon="fas fa-users" title="Special Interest Groups" url="https://github.com/open-telemetry/community#special-interest-groups"%}}
11-
We organize the community into Special Interest Groups (SIGs) in order to improve our workflow and more easily manage a community project.
9+
10+
We organize the community into Special Interest Groups (SIGs) in order to
11+
improve our workflow and more easily manage a community project.
12+
1213
{{% /blocks/feature %}}
1314

1415
{{% blocks/feature icon="fab fa-github" title="Open Source Collaboration" url="/integrations"%}}
15-
OpenTelemetry collaborates and integrates with other open-source projects including Fluent Bit, Jaeger, Kubernetes, Prometheus, OpenMetrics, and W3C.
16+
17+
OpenTelemetry collaborates and integrates with other open-source projects
18+
including Fluent Bit, Jaeger, Kubernetes, Prometheus, OpenMetrics, and W3C.
19+
1620
{{% /blocks/feature %}}
1721

1822
{{% blocks/feature icon="far fa-building" title="Vendor Supported" url="/vendors"%}}
19-
Several cloud providers and observability vendors distribute or natively support OpenTelemetry.
23+
24+
Several cloud providers and observability vendors distribute or natively support
25+
OpenTelemetry.
26+
2027
{{% /blocks/feature %}}
2128

2229
{{% /blocks/section %}}
@@ -25,9 +32,11 @@ Several cloud providers and observability vendors distribute or natively support
2532

2633
<div class="community-contribution">
2734

28-
Interested in getting involved but not sure where to start? Check out our [community repo](https://github.com/open-telemetry/community) to find out more!
35+
Interested in getting involved but not sure where to start? Check out our
36+
[community repo](https://github.com/open-telemetry/community) to find out more!
2937

30-
OpenTelemetry follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
38+
OpenTelemetry follows the
39+
[CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
3140

3241
</div>
3342

content/en/docs/_index.md

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
---
22
title: Documentation
33
linkTitle: Docs
4-
menu:
5-
main:
6-
weight: 10
4+
menu: { main: { weight: 10 } }
75
---
86

9-
OpenTelemetry is a set of APIs, SDKs, tooling and integrations that are
10-
designed for the creation and management of _telemetry data_ such as traces,
11-
metrics, and logs. The OpenTelemetry documentation is intended to broadly cover
12-
key terms, concepts, and instructions on how to use OpenTelemetry in your
13-
software.
7+
OpenTelemetry is a set of APIs, SDKs, tooling and integrations that are designed
8+
for the creation and management of _telemetry data_ such as traces, metrics, and
9+
logs. The OpenTelemetry documentation is intended to broadly cover key terms,
10+
concepts, and instructions on how to use OpenTelemetry in your software.
1411

1512
![Implementation of the OpenTelemetry Reference Architecture](https://raw.github.com/open-telemetry/opentelemetry.io/main/iconography/Reference_Architecture.svg)
1613

0 commit comments

Comments
 (0)