Skip to content

Commit 065ae35

Browse files
[Collector] Standardize distribution in Quick Start & Installation (#8430)
Signed-off-by: jaehanbyun <[email protected]> Co-authored-by: Vitor Vasconcellos <[email protected]>
1 parent 96b2a4d commit 065ae35

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

content/en/docs/collector/install/docker.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Replace `{{% param vers %}}` with the version of the Collector you want to run.
1212
{{< tabpane text=true >}} {{% tab DockerHub %}}
1313

1414
```sh
15-
docker pull otel/opentelemetry-collector-contrib:{{% param vers %}}
16-
docker run otel/opentelemetry-collector-contrib:{{% param vers %}}
15+
docker pull otel/opentelemetry-collector:{{% param vers %}}
16+
docker run otel/opentelemetry-collector:{{% param vers %}}
1717
```
1818

1919
{{% /tab %}} {{% tab ghcr.io %}}
2020

2121
```sh
22-
docker pull ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{% param vers %}}
23-
docker run ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{% param vers %}}
22+
docker pull ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{% param vers %}}
23+
docker run ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{% param vers %}}
2424
```
2525

2626
{{% /tab %}} {{< /tabpane >}}
@@ -31,13 +31,13 @@ as a volume:
3131
{{< tabpane text=true >}} {{% tab DockerHub %}}
3232

3333
```sh
34-
docker run -v $(pwd)/config.yaml:/etc/otelcol-contrib/config.yaml otel/opentelemetry-collector-contrib:{{% param vers %}}
34+
docker run -v $(pwd)/config.yaml:/etc/otelcol/config.yaml otel/opentelemetry-collector:{{% param vers %}}
3535
```
3636

3737
{{% /tab %}} {{% tab ghcr.io %}}
3838

3939
```sh
40-
docker run -v $(pwd)/config.yaml:/etc/otelcol-contrib/config.yaml ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{% param vers %}}
40+
docker run -v $(pwd)/config.yaml:/etc/otelcol/config.yaml ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{% param vers %}}
4141
```
4242

4343
{{% /tab %}} {{< /tabpane >}}
@@ -49,9 +49,9 @@ as in the following example:
4949

5050
```yaml
5151
otel-collector:
52-
image: otel/opentelemetry-collector-contrib
52+
image: otel/opentelemetry-collector
5353
volumes:
54-
- ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml
54+
- ./otel-collector-config.yaml:/etc/otelcol/config.yaml
5555
ports:
5656
- 1888:1888 # pprof extension
5757
- 8888:8888 # Prometheus metrics exposed by the Collector

content/en/docs/collector/quick-start.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ preferred shell.
3939

4040
## Set up the environment
4141

42-
1. Pull in the OpenTelemetry Collector Contrib Docker image:
42+
1. Pull in the OpenTelemetry Collector core Docker image:
4343

4444
```sh
45-
docker pull otel/opentelemetry-collector-contrib:{{% param vers %}}
45+
docker pull otel/opentelemetry-collector:{{% param vers %}}
4646
```
4747

4848
2. Install the [telemetrygen] utility:
@@ -64,7 +64,7 @@ preferred shell.
6464
-p 127.0.0.1:4317:4317 \
6565
-p 127.0.0.1:4318:4318 \
6666
-p 127.0.0.1:55679:55679 \
67-
otel/opentelemetry-collector-contrib:{{% param vers %}} \
67+
otel/opentelemetry-collector:{{% param vers %}} \
6868
2>&1 | tee collector-output.txt # Optionally tee output for easier search later
6969
```
7070

content/en/docs/zero-code/python/_index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ title: Python zero-code instrumentation
33
linkTitle: Python
44
weight: 30
55
aliases: [/docs/languages/python/automatic]
6+
cascade:
7+
collector_vers: 0.141.0
68
cSpell:ignore: distro myapp
79
---
810

content/en/docs/zero-code/python/logs-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Open up a new terminal window and start the OTel Collector:
102102
docker run -it --rm -p 4317:4317 -p 4318:4318 \
103103
-v $(pwd)/otel-collector-config.yaml:/etc/otelcol-config.yml \
104104
--name otelcol \
105-
otel/opentelemetry-collector-contrib:0.76.1 \
105+
otel/opentelemetry-collector:{{% param collector_vers %}} \
106106
"--config=/etc/otelcol-config.yml"
107107
```
108108

scripts/auto-update/all-versions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ function auto_update_versions() {
99

1010
"opentelemetry-collector-releases
1111
vers content/en/docs/collector/_index.md
12-
collector_vers content/en/docs/security/_index.md"
12+
collector_vers content/en/docs/security/_index.md
13+
collector_vers content/en/docs/zero-code/python/_index.md"
1314
"opentelemetry-java
1415
otel content/en/docs/languages/java/_index.md
1516
otel content/en/docs/zero-code/java/_index.md"

0 commit comments

Comments
 (0)