Skip to content

Commit f9f7ff3

Browse files
michael2893michael2893
authored
Merge branch 'main' into michael2893-update-collector-docs-gateway
2 parents 1695255 + 5e3b11b commit f9f7ff3

File tree

624 files changed

+10217
-2438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

624 files changed

+10217
-2438
lines changed

‎.cspell.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import:
99
caseSensitive: true
1010
ignorePaths:
1111
- '*.svg'
12+
- data/community/members.yaml
1213
- vendors.yaml
1314
- content/ja
1415
- content/zh

‎.cspell/en-words.txt

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ adservice
88
alibaba
99
Alolita
1010
APAC
11+
apidocs
1112
appdynamics
1213
appender
1314
appenders
@@ -52,6 +53,7 @@ jaeger
5253
jaegertracing
5354
javaagent
5455
javadoc
56+
javadocs
5557
jboss
5658
jdbc
5759
julia

‎.cspell/pt-palavras.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
desserializa
22
autoinstrumentação
33
autoconsistentes
4+
serialização
5+
verbosidade

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[submodule "content-modules/opentelemetry-specification"]
88
path = content-modules/opentelemetry-specification
99
url = https://github.com/open-telemetry/opentelemetry-specification.git
10-
spec-pin = v1.36.0
10+
spec-pin = v1.37.0
1111
[submodule "content-modules/community"]
1212
path = content-modules/community
1313
url = https://github.com/open-telemetry/community

‎.htmltest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IgnoreDirs:
1010
- ^blog/(\d+/)?page/\d+
1111
IgnoreInternalURLs: # list of paths
1212
IgnoreURLs: # list of regexs of paths or URLs to be ignored
13-
- ^(/..)?/docs/languages/\w+/(api|examples|registry)/$
13+
- ^((/..)?/docs/languages/\w+|\.\.)/(api|examples|registry)/$
1414
- ^(/..)?/docs/collector/registry/$
1515
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
1616
- ^((/..)?/docs/migration/)?opencensus/$

‎.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
!/layouts/shortcodes
88
/layouts/shortcodes/*
99
!/layouts/shortcodes/docs
10+
/layouts/shortcodes/pt
1011

1112
/content/ja
1213
/content/zh

‎.textlintrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ rules:
136136
- '(?<![.-])java\b(?![.])'
137137
- Java
138138
- ['java[- ]?agent', Java agent]
139+
- ['java ?doc(s)?', 'Javadoc$1']
139140
- [mac ?os, macOS]
140141
- ['meta[- ]data', metadata]
141142
- [nd-?json, NDJSON]

‎content-modules/opentelemetry-specification

Submodule opentelemetry-specification updated 22 files

‎content/en/api-docs.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: API Documentation
3+
linkTitle: Docs
4+
---
5+
6+
{{% blocks/section color="white" %}}
7+
8+
## {{% param title %}}
9+
10+
Below you will find links to all the API references available for the different
11+
implementations of the OpenTelemetry API & SDK
12+
13+
{{% apidocs %}}
14+
15+
{{% /blocks/section %}}

‎content/en/blog/2024/otel-arrow-production/index.md

+419
Large diffs are not rendered by default.

‎content/en/blog/2024/otel-arrow-production/setup.png

151 KB
Loading

‎content/en/blog/2024/otel-operator-q-and-a/index.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ is a
2020
that manages OTel for you in your Kubernetes cluster to make life a little
2121
easier. It does the following:
2222

23-
- Manages deployment of the
24-
[OpenTelemetry Collector](http://localhost:1313/docs/collector/), supported by
25-
the
23+
- Manages deployment of the [OpenTelemetry Collector](/docs/collector/),
24+
supported by the
2625
[`OpenTelemetryCollector`](https://github.com/open-telemetry/opentelemetry-operator?tab=readme-ov-file#getting-started)
2726
[custom resource (CR)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/).
2827
- Manages the configuration of a fleet of OpenTelemetry Collectors via
@@ -42,8 +41,7 @@ cool things, so I thought it might be helpful to share some little OTel Operator
4241
goodies that I’ve picked up along the way, in the form of a Q&A.
4342

4443
Please note that this post assumes that you have some familiarity with
45-
OpenTelemetry, the
46-
[OpenTelemetry Collector](http://localhost:1313/docs/collector/), the
44+
OpenTelemetry, the [OpenTelemetry Collector](/docs/collector/), the
4745
[OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator)
4846
(including the
4947
[Target Allocator](https://adri-v.medium.com/prometheus-opentelemetry-better-together-41dc637f2292)),

‎content/en/community/end-user/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: End-user resources
33
linkTitle: End user
44
description: Vendor-agnostic resources for OpenTelemetry users
5+
weight: 40
56
---
67

78
Looking to connect with other OpenTelemetry end users in a vendor-agnostic

‎content/en/community/marketing-guidelines.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: OpenTelemetry Marketing Guidelines for Contributing Organizations
33
linkTitle: Marketing Guidelines
44
cSpell:ignore: devstats
5+
weight: 999
56
---
67

78
OpenTelemetry (aka OTel) is a collaboration among end-users, adjacent OSS

‎content/en/community/members.md

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
title: Members of the OpenTelemetry Project
3+
linkTitle: Members
4+
weight: 30
5+
cSpell:ignore: subproject triagers
6+
---
7+
8+
The OpenTelemetry community consists of many individuals from different
9+
backgrounds, who help to accomplish the
10+
[vision and mission](/community/mission/) of the project.
11+
12+
Below you find all the established community members in their different roles
13+
for the project.
14+
15+
If you are a contributor to the OpenTelemetry project already, and not listed
16+
here, you either have not
17+
[set your membership to public](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership),
18+
or you need to take a look in our
19+
[contributor guidelines](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md)
20+
on how you can start your contributor as a member, and move up the ladder, all
21+
the way to maintainer!
22+
23+
## Governance Committee
24+
25+
The Governance Committee (GC) is the governing body of the OpenTelemetry
26+
project. Members of the GC are
27+
[elected by the Members Of Standing in the OpenTelemetry community](https://github.com/open-telemetry/community/blob/main/governance-charter.md#elections)
28+
29+
{{% community/members-list "governance-committee" %}}
30+
31+
## Technical Committee
32+
33+
The Technical Committee (TC) is responsible for all technical development within
34+
the OpenTelemetry project.
35+
36+
{{% community/members-list "technical-committee" %}}
37+
38+
## Specification Sponsors
39+
40+
Specification sponsors are trusted collaborators of the technical committee, and
41+
work to review, approve, and sponsor
42+
[OpenTelemetry specification](/docs/specs/otel/) issues and PRs.
43+
44+
{{% community/members-list "spec-sponsors" %}}
45+
46+
## Maintainers
47+
48+
Maintainers are the technical authority for a subproject in the OpenTelemetry
49+
project. Maintainers set technical direction and make or approve design
50+
decisions for their subproject.
51+
52+
{{% community/members-list "maintainers" %}}
53+
54+
## Approvers
55+
56+
Code approvers are able to both review and approve code contributions, as well
57+
as help maintainers triage issues and do project management.
58+
59+
{{% community/members-list "approvers" %}}
60+
61+
## Triagers
62+
63+
Triagers assist the maintainers and approvers with project management and
64+
backlog organization. The specific workflows and triage requirements depend on
65+
the project, and are set by the project maintainers.
66+
67+
{{% community/members-list "triagers" %}}
68+
69+
## Members
70+
71+
Members are continuously active contributors in the community. They can have
72+
issues and PRs assigned to them. Members are expected to participate in SIG(s)
73+
and remain active contributors to the community.
74+
75+
{{% community/members-list "members" %}}

‎content/en/docs/collector/_index.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Collector
33
description: Vendor-agnostic way to receive, process and export telemetry data.
44
aliases: [collector/about]
55
cascade:
6-
vers: 0.108.0
6+
vers: 0.110.0
77
weight: 270
88
---
99

@@ -54,12 +54,18 @@ you launch a collector it will automatically start receiving telemetry.
5454

5555
## Status and releases
5656

57-
The **collector** status is: [mixed][], since core collector components
57+
The **Collector** status is: [mixed][], since core Collector components
5858
currently have mixed [stability levels][].
5959

6060
**Collector components** differ in their maturity levels. Each component has its
6161
stability documented in its `README.md`. You can find a list of all available
62-
collector components in the [registry][].
62+
Collector components in the [registry][].
63+
64+
Support is guaranteed for Collector software artifacts for a certain time period
65+
based on the artifact's intended audience. This support includes, at minimum,
66+
fixes for critical bugs and security issues. See the
67+
[support policies](https://github.com/open-telemetry/opentelemetry-collector/blob/main/VERSIONING.md)
68+
for more details.
6369

6470
{{% docs/latest-release collector-releases /%}}
6571

‎content/en/docs/collector/installation.md

-33
Original file line numberDiff line numberDiff line change
@@ -105,39 +105,6 @@ amd64/arm64/i386 systems. You can find the default configuration in
105105

106106
> Note: `systemd` is required for automatic service configuration.
107107
108-
### APK Installation
109-
110-
To get started on Alpine systems run the following commands:
111-
112-
{{< tabpane text=true >}} {{% tab AMD64 %}}
113-
114-
```sh
115-
apk update
116-
apk add wget shadow
117-
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_amd64.apk
118-
apk add --allow-untrusted otelcol_{{% param vers %}}_linux_amd64.apk
119-
```
120-
121-
{{% /tab %}} {{% tab ARM64 %}}
122-
123-
```sh
124-
apk update
125-
apk add wget shadow
126-
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_arm64.apk
127-
apk add --allow-untrusted otelcol_{{% param vers %}}_linux_arm64.apk
128-
```
129-
130-
{{% /tab %}} {{% tab i386 %}}
131-
132-
```sh
133-
apk update
134-
apk add wget shadow
135-
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_386.apk
136-
apk add --allow-untrusted otelcol_{{% param vers %}}_linux_386.apk
137-
```
138-
139-
{{% /tab %}} {{< /tabpane >}}
140-
141108
### DEB Installation
142109

143110
To get started on Debian systems run the following commands:

0 commit comments

Comments
 (0)