Skip to content

Commit

Permalink
Merge branch 'main' into remove-zero-code-under-construction-banner
Browse files Browse the repository at this point in the history
  • Loading branch information
theletterf authored Sep 25, 2024
2 parents 11ea6cb + de2da7b commit 0b212fa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
8 changes: 3 additions & 5 deletions content/en/blog/2024/otel-operator-q-and-a/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ is a
that manages OTel for you in your Kubernetes cluster to make life a little
easier. It does the following:

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

Please note that this post assumes that you have some familiarity with
OpenTelemetry, the
[OpenTelemetry Collector](http://localhost:1313/docs/collector/), the
OpenTelemetry, the [OpenTelemetry Collector](/docs/collector/), the
[OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator)
(including the
[Target Allocator](https://adri-v.medium.com/prometheus-opentelemetry-better-together-41dc637f2292)),
Expand Down
6 changes: 2 additions & 4 deletions content/en/docs/languages/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ redirects: [{ from: /docs/instrumentation/*, to: ':splat' }]
OpenTelemetry code [instrumentation][] is supported for the languages listed in
the [Statuses and Releases](#status-and-releases) table below. Unofficial
implementations for [other languages](/docs/languages/other) are available as
well. You can find them in the
[registry](http://localhost:1313/ecosystem/registry/).
well. You can find them in the [registry](/ecosystem/registry/).

For Go, .NET, PHP, Python, Java and JavaScript you can use
[zero-code solutions](/docs/zero-code) to add instrumentation to your
Expand Down Expand Up @@ -51,8 +50,7 @@ references are available:

{{% alert title="Tip" color="info" %}}

You can find a list of available API references at
<https://opentelemetry.io/api-docs>.
You can find a list of available API references at </api-docs>.

{{% /alert %}}

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ Declarative configuration is currently under development. It allows for YAML
file-based configuration as described in
[opentelemetry-configuration](https://github.com/open-telemetry/opentelemetry-configuration)
and
[declarative configuration](http://localhost:1313/docs/specs/otel/configuration/#declarative-configuration).
[declarative configuration](/docs/specs/otel/configuration/#declarative-configuration).

To use, include
`io.opentelemetry:opentelemetry-sdk-extension-incubator:{{% param vers.otel %}}-alpha`
Expand Down

0 comments on commit 0b212fa

Please sign in to comment.