From 1e914cd0c56d2da779ff838a8eb275c9ba9fdfbf Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Wed, 23 Jul 2025 12:36:10 +0200 Subject: [PATCH 1/2] Replace versions and remove update script --- .github/workflows/updatecli.yml | 46 ---- docs/docset.yml | 14 -- .../config/default-config-standalone.md | 12 +- docs/reference/edot-collector/download.md | 18 +- .../edot-sdks/java/setup/runtime-attach.md | 4 +- docs/reference/index.md | 18 +- docs/reference/quickstart/ech/docker.md | 2 +- docs/reference/quickstart/ech/k8s.md | 2 +- .../quickstart/self-managed/docker.md | 2 +- docs/reference/quickstart/self-managed/k8s.md | 2 +- .../reference/quickstart/serverless/docker.md | 2 +- docs/reference/quickstart/serverless/k8s.md | 2 +- .../use-cases/kubernetes/customization.md | 2 +- .../use-cases/kubernetes/deployment.md | 2 +- .../kubernetes/instrumenting-applications.md | 8 +- .../kubernetes/prerequisites-compatibility.md | 2 +- .../reference/use-cases/kubernetes/upgrade.md | 2 +- updatecli/updatecli.d/versions.yml | 213 ------------------ updatecli/values.d/scm.yml | 5 - 19 files changed, 40 insertions(+), 318 deletions(-) delete mode 100644 .github/workflows/updatecli.yml delete mode 100644 updatecli/updatecli.d/versions.yml delete mode 100644 updatecli/values.d/scm.yml diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml deleted file mode 100644 index 99a552de..00000000 --- a/.github/workflows/updatecli.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: updatecli - -on: - workflow_dispatch: - schedule: - - cron: "0 5 * * 1-5" - -permissions: - contents: read - -env: - JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" - -jobs: - bump: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Get token - id: get_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 - with: - app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }} - private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} - permissions: >- - { - "contents": "write", - "pull_requests": "write" - } - repositories: >- - ["opentelemetry"] - - - uses: elastic/oblt-actions/updatecli/run@v1 - with: - command: apply --config updatecli/updatecli.d/versions.yml --values updatecli/values.d/scm.yml - env: - GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} - - - if: ${{ failure() }} - uses: elastic/oblt-actions/slack/send@v1 - with: - bot-token: ${{ secrets.SLACK_BOT_TOKEN }} - channel-id: "#obs-docs-automation-alerts" - message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, please look what's going on <${{ env.JOB_URL }}|here>" diff --git a/docs/docset.yml b/docs/docset.yml index 118ec83e..42e7bb16 100644 --- a/docs/docset.yml +++ b/docs/docset.yml @@ -30,20 +30,6 @@ toc: - toc: reference subs: - - # Versions metadata - - edot-stack-version: 9.0.1 - edot-collector-version: 9.0.3 - edot-android-version: 1.1.0 - edot-dotnet-version: 1.0.2 - edot-ios-version: 1.2.1 - edot-java-version: 1.4.1 - edot-nodejs-version: 1.1.1 - edot-php-version: 1.0.0 - edot-python-version: 1.4.0 - - # Substitutions motlp: Elastic Cloud Managed OTLP Endpoint edot: Elastic Distribution of OpenTelemetry ecloud: "Elastic Cloud" diff --git a/docs/reference/edot-collector/config/default-config-standalone.md b/docs/reference/edot-collector/config/default-config-standalone.md index f1ab8e01..0f5046b3 100644 --- a/docs/reference/edot-collector/config/default-config-standalone.md +++ b/docs/reference/edot-collector/config/default-config-standalone.md @@ -205,10 +205,10 @@ Each pipeline connects specific receivers, processors, and exporters to handle d [`resource`]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor [`resourcedetection`]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor [`OTLP`]: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver -[Logs - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/platformlogs.yml -[Logs - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/managed_otlp/platformlogs.yml -[Logs | Metrics - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml -[Logs | Metrics - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/managed_otlp/platformlogs_hostmetrics.yml -[Logs | Metrics | App - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/logs_metrics_traces.yml -[Logs | Metrics | App - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/internal/pkg/otel/samples/linux/managed_otlp/logs_metrics_traces.yml +[Logs - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/platformlogs.yml +[Logs - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/managed_otlp/platformlogs.yml +[Logs | Metrics - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml +[Logs | Metrics - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/managed_otlp/platformlogs_hostmetrics.yml +[Logs | Metrics | App - ES]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/logs_metrics_traces.yml +[Logs | Metrics | App - OTLP]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/internal/pkg/otel/samples/linux/managed_otlp/logs_metrics_traces.yml [Gateway mode]: https://raw.githubusercontent.com/elastic/elastic-agent/refs/heads/main/internal/pkg/otel/samples/linux/gateway.yml diff --git a/docs/reference/edot-collector/download.md b/docs/reference/edot-collector/download.md index 16e5237b..f202a7ad 100644 --- a/docs/reference/edot-collector/download.md +++ b/docs/reference/edot-collector/download.md @@ -21,15 +21,15 @@ The following table contains direct download links for the latest EDOT Collector | Platform | Architecture | Download link | |--------------|--------------|---------------| -| Windows | x86_64 | [Download (Zip)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-windows-x86_64.zip) | -| macOS | x86_64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-darwin-x86_64.tar.gz) | -| macOS | aarch64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-darwin-aarch64.tar.gz) | -| Linux | x86_64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-linux-x86_64.tar.gz) | -| Linux | aarch64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-linux-arm64.tar.gz) | -| Linux (DEB) | x86_64 | [Download (Deb)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-amd64.deb) | -| Linux (DEB) | aarch64 | [Download (Deb)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-arm64.deb) | -| Linux (RPM) | x86_64 | [Download (Rpm)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-x86_64.rpm) | -| Linux (RPM) | aarch64 | [Download (Rpm)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{edot-collector-version}}-aarch64.rpm) | +| Windows | x86_64 | [Download (Zip)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-windows-x86_64.zip) | +| macOS | x86_64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-darwin-x86_64.tar.gz) | +| macOS | aarch64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-darwin-aarch64.tar.gz) | +| Linux | x86_64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-linux-x86_64.tar.gz) | +| Linux | aarch64 | [Download (Tar.gz)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-linux-arm64.tar.gz) | +| Linux (DEB) | x86_64 | [Download (Deb)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-amd64.deb) | +| Linux (DEB) | aarch64 | [Download (Deb)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-arm64.deb) | +| Linux (RPM) | x86_64 | [Download (Rpm)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-x86_64.rpm) | +| Linux (RPM) | aarch64 | [Download (Rpm)](https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.edot_collector}}-aarch64.rpm) | After you've downloaded and uncompressed the file, you can get EDOT Collector running with the following command: diff --git a/docs/reference/edot-sdks/java/setup/runtime-attach.md b/docs/reference/edot-sdks/java/setup/runtime-attach.md index 1e0ae1a9..646e0da0 100644 --- a/docs/reference/edot-sdks/java/setup/runtime-attach.md +++ b/docs/reference/edot-sdks/java/setup/runtime-attach.md @@ -45,14 +45,14 @@ Follow these steps to instrument your Java application using runtime attach. co.elastic.otel elastic-otel-runtime-attach - {{edot-java-version}} + {{version.edot_java}} ``` ::: :::{tab-item} Gradle ```kotlin subs=true -implementation("co.elastic.otel:elastic-otel-runtime-attach:{{edot-java-version}}") +implementation("co.elastic.otel:elastic-otel-runtime-attach:{{version.edot_java}}") ``` ::: diff --git a/docs/reference/index.md b/docs/reference/index.md index 01a811cf..580a7425 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -27,15 +27,15 @@ The following Elastic OpenTelemetry distributions are available: | Distribution | Version | Status | | ------------ | ------- | ------ | -| [EDOT Collector](/reference/edot-collector/index.md) | {{edot-collector-version}} | GA | -| [EDOT .NET](/reference/edot-sdks/dotnet/index.md) | {{edot-dotnet-version}} | GA | -| [EDOT Java](/reference/edot-sdks/java/index.md) | {{edot-java-version}} | GA | -| [EDOT Node.js](/reference/edot-sdks/nodejs/index.md) | {{edot-nodejs-version}} | GA | -| [EDOT PHP](/reference/edot-sdks/php/index.md) | {{edot-php-version}} | GA | -| [EDOT Python](/reference/edot-sdks/python/index.md) | {{edot-python-version}} | GA | -| [EDOT Android](/reference/edot-sdks/android/index.md) | {{edot-android-version}} | GA | -| [EDOT iOS](/reference/edot-sdks/ios/index.md) | {{edot-ios-version}} | GA | -| [EDOT Cloud Forwarder for AWS](/reference/edot-cloud-forwarder/aws.md) | 0.1.6 | Technical Preview | +| [EDOT Collector](/reference/edot-collector/index.md) | {{version.edot_collector}} | GA | +| [EDOT .NET](/reference/edot-sdks/dotnet/index.md) | {{version.edot_dotnet}} | GA | +| [EDOT Java](/reference/edot-sdks/java/index.md) | {{version.edot_java}} | GA | +| [EDOT Node.js](/reference/edot-sdks/nodejs/index.md) | {{version.edot_node}} | GA | +| [EDOT PHP](/reference/edot-sdks/php/index.md) | {{version.edot_php}} | GA | +| [EDOT Python](/reference/edot-sdks/python/index.md) | {{version.edot_python}} | GA | +| [EDOT Android](/reference/edot-sdks/android/index.md) | {{version.edot_android}} | GA | +| [EDOT iOS](/reference/edot-sdks/ios/index.md) | {{version.edot_ios}} | GA | +| [EDOT Cloud Forwarder for AWS](/reference/edot-cloud-forwarder/aws.md) | {{version.edot_cf_aws}} | Technical Preview | Each EDOT distribution undergoes production-grade testing before being declared Generally Available (GA). Elastic provides full support for GA releases in accordance with our [support matrix](https://www.elastic.co/support/matrix) and SLAs. diff --git a/docs/reference/quickstart/ech/docker.md b/docs/reference/quickstart/ech/docker.md index 40d61609..ffb1b094 100644 --- a/docs/reference/quickstart/ech/docker.md +++ b/docs/reference/quickstart/ech/docker.md @@ -54,7 +54,7 @@ Create an `.env` file with the following content. Replace the placeholder values HOST_FILESYSTEM=/ DOCKER_SOCK=/var/run/docker.sock ELASTIC_AGENT_OTEL=true - COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{edot-collector-version}} + COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{version.edot_collector}} ELASTIC_API_KEY= ELASTIC_ENDPOINT= OTEL_COLLECTOR_CONFIG=/path/to/otel-collector-config.yml diff --git a/docs/reference/quickstart/ech/k8s.md b/docs/reference/quickstart/ech/k8s.md index c998ee3c..0f27c618 100644 --- a/docs/reference/quickstart/ech/k8s.md +++ b/docs/reference/quickstart/ech/k8s.md @@ -71,7 +71,7 @@ Install the OpenTelemetry Operator using the `kube-stack` Helm chart with the co ```bash subs=true helm install opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ --namespace opentelemetry-operator-system \ ---values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ +--values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ --version '0.3.9' ``` :::: diff --git a/docs/reference/quickstart/self-managed/docker.md b/docs/reference/quickstart/self-managed/docker.md index 9a28f363..ca7cc9c8 100644 --- a/docs/reference/quickstart/self-managed/docker.md +++ b/docs/reference/quickstart/self-managed/docker.md @@ -53,7 +53,7 @@ Create an `.env` file with the following content. Replace the placeholder values HOST_FILESYSTEM=/ DOCKER_SOCK=/var/run/docker.sock ELASTIC_AGENT_OTEL=true -COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{edot-collector-version}} +COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{version.edot_collector}} ELASTIC_API_KEY= ELASTIC_ENDPOINT= OTEL_COLLECTOR_CONFIG=/path/to/otel-collector-config.yml diff --git a/docs/reference/quickstart/self-managed/k8s.md b/docs/reference/quickstart/self-managed/k8s.md index bca23706..03c9455a 100644 --- a/docs/reference/quickstart/self-managed/k8s.md +++ b/docs/reference/quickstart/self-managed/k8s.md @@ -63,7 +63,7 @@ Install the OpenTelemetry Operator using the `kube-stack` Helm chart with the pr ```bash subs=true helm install opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ --namespace opentelemetry-operator-system \ ---values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ +--values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ --version '0.3.9' ``` diff --git a/docs/reference/quickstart/serverless/docker.md b/docs/reference/quickstart/serverless/docker.md index 3a8ad2a6..8a43c7df 100644 --- a/docs/reference/quickstart/serverless/docker.md +++ b/docs/reference/quickstart/serverless/docker.md @@ -56,7 +56,7 @@ Create a `.env` file with the following content, replacing the placeholder value HOST_FILESYSTEM=/ DOCKER_SOCK=/var/run/docker.sock ELASTIC_AGENT_OTEL=true -COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{edot-collector-version}} +COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:{{version.edot_collector}} ELASTIC_API_KEY= ELASTIC_OTLP_ENDPOINT= OTEL_COLLECTOR_CONFIG=/path/to/otel-collector-config.yml diff --git a/docs/reference/quickstart/serverless/k8s.md b/docs/reference/quickstart/serverless/k8s.md index 91c9f7f6..e763955a 100644 --- a/docs/reference/quickstart/serverless/k8s.md +++ b/docs/reference/quickstart/serverless/k8s.md @@ -67,7 +67,7 @@ Install the OpenTelemetry Operator using the `kube-stack` Helm chart with the co ```bash subs=true helm install opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ --namespace opentelemetry-operator-system \ ---values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml' \ +--values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml' \ --version '0.3.9' ``` diff --git a/docs/reference/use-cases/kubernetes/customization.md b/docs/reference/use-cases/kubernetes/customization.md index b7c18f25..d378ecd6 100644 --- a/docs/reference/use-cases/kubernetes/customization.md +++ b/docs/reference/use-cases/kubernetes/customization.md @@ -53,7 +53,7 @@ For example: ```bash subs=true helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ ---values https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/values.yaml --version 0.3.3 \ +--values https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/values.yaml --version 0.3.3 \ --set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.admissionWebhooks.autoGenerateCert=null ``` diff --git a/docs/reference/use-cases/kubernetes/deployment.md b/docs/reference/use-cases/kubernetes/deployment.md index 0386cae2..7d254c4c 100644 --- a/docs/reference/use-cases/kubernetes/deployment.md +++ b/docs/reference/use-cases/kubernetes/deployment.md @@ -85,7 +85,7 @@ Follow these steps to install the operator: helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts helm repo update helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ - --values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ + --values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ --version 0.3.3 ``` diff --git a/docs/reference/use-cases/kubernetes/instrumenting-applications.md b/docs/reference/use-cases/kubernetes/instrumenting-applications.md index e2cd1147..20cd773e 100644 --- a/docs/reference/use-cases/kubernetes/instrumenting-applications.md +++ b/docs/reference/use-cases/kubernetes/instrumenting-applications.md @@ -53,13 +53,13 @@ The `Instrumentation` object stores important parameters: ```yaml subs=true dotnet: - image: docker.elastic.co/observability/elastic-otel-dotnet:{{edot-dotnet-version}} + image: docker.elastic.co/observability/elastic-otel-dotnet:{{version.edot_dotnet}} java: - image: docker.elastic.co/observability/elastic-otel-javaagent:{{edot-java-version}} + image: docker.elastic.co/observability/elastic-otel-javaagent:{{version.edot_java}} nodejs: - image: docker.elastic.co/observability/elastic-otel-node:{{edot-nodejs-version}} + image: docker.elastic.co/observability/elastic-otel-node:{{version.edot_node}} python: - image: docker.elastic.co/observability/elastic-otel-python:{{edot-python-version}} + image: docker.elastic.co/observability/elastic-otel-python:{{version.edot_python}} ``` ## Configure auto-instrumentation diff --git a/docs/reference/use-cases/kubernetes/prerequisites-compatibility.md b/docs/reference/use-cases/kubernetes/prerequisites-compatibility.md index e693fbb6..8d7b63c5 100644 --- a/docs/reference/use-cases/kubernetes/prerequisites-compatibility.md +++ b/docs/reference/use-cases/kubernetes/prerequisites-compatibility.md @@ -31,7 +31,7 @@ The following is the current list of supported versions: | Stack Version | Helm chart Version | Values file | |---------------|--------------------|--------------------| -| Serverless | 0.3.3 | [values.yaml](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml) | +| Serverless | 0.3.3 | [values.yaml](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml) | | 8.16.0 | 0.3.3 | [values.yaml](https://raw.githubusercontent.com/elastic/opentelemetry/refs/heads/8.16/resources/kubernetes/operator/helm/values.yaml) | | 8.17.0 | 0.3.3 | [values.yaml](https://raw.githubusercontent.com/elastic/elastic-agent/refs/heads/8.17/deploy/helm/edot-collector/kube-stack/values.yaml) | | 9.0.1 | 0.3.3 | [values.yaml](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v9.0.1/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml) | diff --git a/docs/reference/use-cases/kubernetes/upgrade.md b/docs/reference/use-cases/kubernetes/upgrade.md index 9f33cdc8..b5b5ddea 100644 --- a/docs/reference/use-cases/kubernetes/upgrade.md +++ b/docs/reference/use-cases/kubernetes/upgrade.md @@ -26,7 +26,7 @@ helm repo update open-telemetry # update information of available charts locally helm search repo open-telemetry/opentelemetry-kube-stack --versions # list available versions of the chart helm upgrade --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \ ---values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{edot-collector-version}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ +--values 'https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v{{version.edot_collector}}/deploy/helm/edot-collector/kube-stack/values.yaml' \ --version 0.3.3 ``` diff --git a/updatecli/updatecli.d/versions.yml b/updatecli/updatecli.d/versions.yml deleted file mode 100644 index d16d3941..00000000 --- a/updatecli/updatecli.d/versions.yml +++ /dev/null @@ -1,213 +0,0 @@ ---- -name: Bump release versions in the docs/docset.yml - -scms: - githubConfig: - kind: github - spec: - user: '{{ requiredEnv "GITHUB_ACTOR" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - owner: '{{ .scm.owner }}' - repository: '{{ .scm.repository }}' - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - commitusingapi: true - branch: '{{ .scm.branch }}' - force: false - -actions: - elastic-agent: - kind: github/pullrequest - scmid: githubConfig - spec: - automerge: false - labels: - - dependencies - title: '[Automation] Bump EDOT versions' - -sources: - latest-edot-android-version: - name: Get latest release version for the apm-agent-android - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: apm-agent-android - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - - latest-edot-collector-version: - name: Get latest major release version for the elastic-agent - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-agent - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionFilter: - kind: regex - pattern: "v9.(\\d*).(\\d*)$" - - latest-edot-dotnet-version: - name: Get latest release version for the elastic-otel-dotnet - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-otel-dotnet - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - - latest-edot-ios-version: - name: Get latest release version for the apm-agent-ios - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: apm-agent-ios - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - - latest-edot-java-version: - name: Get latest release version for the elastic-otel-java - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-otel-java - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - - latest-edot-node-version: - name: Get latest release version for the elastic-otel-node - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-otel-node - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionFilter: - kind: regex - pattern: "^v(\\d*).(\\d*).(\\d*)$" - - latest-edot-php-version: - name: Get latest release version for the elastic-otel-php - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-otel-php - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - - latest-edot-python-version: - name: Get latest release version for the elastic-otel-python - kind: githubrelease - transformers: - - trimprefix: v - spec: - owner: elastic - repository: elastic-otel-python - token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GITHUB_ACTOR" }}' - versionfilter: - kind: latest - -targets: - update-docs-docset-android: - name: 'Update docs/docset.yml edot-android {{ source "latest-edot-android-version" }}' - scmid: githubConfig - sourceid: latest-edot-android-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-android-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-android-version" }}' - - update-docs-docset-collector: - name: 'Update docs/docset.yml edot-collector {{ source "latest-edot-collector-version" }}' - scmid: githubConfig - sourceid: latest-edot-collector-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-collector-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-collector-version" }}' - - update-docs-docset-dotnet: - name: 'Update docs/docset.yml edot-dotnet {{ source "latest-edot-dotnet-version" }}' - scmid: githubConfig - sourceid: latest-edot-dotnet-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-dotnet-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-dotnet-version" }}' - - update-docs-docset-ios: - name: 'Update docs/docset.yml edot-android {{ source "latest-edot-ios-version" }}' - scmid: githubConfig - sourceid: latest-edot-ios-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-ios-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-ios-version" }}' - - update-docs-docset-java: - name: 'Update docs/docset.yml edot-java {{ source "latest-edot-java-version" }}' - scmid: githubConfig - sourceid: latest-edot-java-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-java-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-java-version" }}' - - update-docs-docset-node: - name: 'Update docs/docset.yml edot-node {{ source "latest-edot-node-version" }}' - scmid: githubConfig - sourceid: latest-edot-node-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-nodejs-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-node-version" }}' - - update-docs-docset-php: - name: 'Update docs/docset.yml edot-php {{ source "latest-edot-php-version" }}' - scmid: githubConfig - sourceid: latest-edot-php-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-php-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-php-version" }}' - - update-docs-docset-python: - name: 'Update docs/docset.yml edot-python {{ source "latest-edot-python-version" }}' - scmid: githubConfig - sourceid: latest-edot-python-version - kind: file - spec: - file: docs/docset.yml - matchpattern: '(edot-python-version): (.+)' - replacepattern: '$1: {{ source "latest-edot-python-version" }}' diff --git a/updatecli/values.d/scm.yml b/updatecli/values.d/scm.yml deleted file mode 100644 index 28d40a3e..00000000 --- a/updatecli/values.d/scm.yml +++ /dev/null @@ -1,5 +0,0 @@ -scm: - enabled: true - owner: elastic - repository: opentelemetry - branch: main \ No newline at end of file From af0fc02d9d3960f37348d5216862e9cb30fc14eb Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Tue, 29 Jul 2025 11:15:31 +0200 Subject: [PATCH 2/2] Add subs --- docs/reference/use-cases/kubernetes/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/use-cases/kubernetes/upgrade.md b/docs/reference/use-cases/kubernetes/upgrade.md index b5b5ddea..4cc854f4 100644 --- a/docs/reference/use-cases/kubernetes/upgrade.md +++ b/docs/reference/use-cases/kubernetes/upgrade.md @@ -21,7 +21,7 @@ Before upgrading or updating the release configuration, refer to [compatibility To upgrade an installed release, run a `helm upgrade` command providing the desired chart version and using the correct `values.yaml` for your environment. For example: -```bash +```bash subs=true helm repo update open-telemetry # update information of available charts locally helm search repo open-telemetry/opentelemetry-kube-stack --versions # list available versions of the chart