From ef553a000455c9f951bc517a931336a77f89b5f0 Mon Sep 17 00:00:00 2001 From: EMaksy Date: Fri, 7 Nov 2025 17:16:07 +0100 Subject: [PATCH 1/7] Remove docker from user facing docks --- .../trento-container-install.adoc | 18 +-- .../modules/developer/nav_developer.adoc | 1 + trento/adoc/trento-install-server.adoc | 1 - trento/adoc/trento-report-issue.adoc | 7 +- trento/adoc/trento-sso-integration.adoc | 135 +----------------- trento/adoc/trento-systemd-install.adoc | 8 -- trento/adoc/trento-update-trento-checks.adoc | 15 +- trento/adoc/trento-update-trento-server.adoc | 8 -- 8 files changed, 11 insertions(+), 182 deletions(-) rename {trento/adoc => content/internal-notes}/trento-container-install.adoc (93%) diff --git a/trento/adoc/trento-container-install.adoc b/content/internal-notes/trento-container-install.adoc similarity index 93% rename from trento/adoc/trento-container-install.adoc rename to content/internal-notes/trento-container-install.adoc index 08c2b1fc..3b6ad452 100644 --- a/trento/adoc/trento-container-install.adoc +++ b/content/internal-notes/trento-container-install.adoc @@ -1,19 +1,15 @@ -include::product-attributes.adoc[] +== Containerized deployment -=== Containerized deployment -:revdate: 2025-08-05 - - -A containerized deployment of {trserver} is identical to the systemd +A containerized deployment of trento is identical to the systemd deployment. However, the web and check engine components are deployed as Docker containers. -Follow the steps in <>, but skip the *Install +Follow the steps in link:https://www.trento-project.io/docs/user-guide/trento-install-server.html#sec-systemd-deployment[systemd installation], but skip the *Install Trento using RPM packages* step and follow the procedures as described below. -==== Install Trento using Docker +=== Install Trento using Docker -===== Install Docker container runtime +==== Install Docker container runtime . Enable the containers module (replace `15.x` with the correct Service Pack version): + @@ -35,7 +31,7 @@ zypper install docker systemctl enable --now docker ---- -===== Create a dedicated Docker network for Trento +==== Create a dedicated Docker network for Trento . Create the Trento Docker network: + @@ -61,7 +57,7 @@ The output should be similar to this (the exact address may vary): . Open the _/var/lib/pgsql/data/pg_hba.conf_ file for editing and replace `0.0.0.0/0` with the address returned by the command in the previous step. . Restart the PostgreSQL server using the `systemctl restart postgresql` command. -===== Install Trento on Docker +==== Install Trento on Docker . Create secret environment variables: + diff --git a/trento-docs-site/modules/developer/nav_developer.adoc b/trento-docs-site/modules/developer/nav_developer.adoc index 601154ec..93335507 100644 --- a/trento-docs-site/modules/developer/nav_developer.adoc +++ b/trento-docs-site/modules/developer/nav_developer.adoc @@ -36,6 +36,7 @@ ** Internal Notes *** xref:internal-notes/pr-env-ssl-certificate-setup.adoc[SSL Certificate creation and setup Guide for Pull Request Environments] *** xref:internal-notes/release.adoc[Release Process] +*** xref:internal-notes/trento-container-install.adoc[Containerized deployment] ** Trento Documentation Page *** xref:trento-docs-site/README.adoc[Documentation Page] diff --git a/trento/adoc/trento-install-server.adoc b/trento/adoc/trento-install-server.adoc index b96c4a7f..c95ec8e6 100644 --- a/trento/adoc/trento-install-server.adoc +++ b/trento/adoc/trento-install-server.adoc @@ -6,5 +6,4 @@ include::product-attributes.adoc[] include::trento-kubernetes-install.adoc[] include::trento-systemd-install.adoc[] -include::trento-container-install.adoc[] include::trento-ansible-install.adoc[] \ No newline at end of file diff --git a/trento/adoc/trento-report-issue.adoc b/trento/adoc/trento-report-issue.adoc index eb266ed4..47c61e31 100644 --- a/trento/adoc/trento-report-issue.adoc +++ b/trento/adoc/trento-report-issue.adoc @@ -12,7 +12,7 @@ Problems must be reported under {sles4sap}{nbsp}15 and component trento. When opening a support case for {trento}, provide the relevant -deployment option for {trserver}: {k8s}, systemd or containerized ({docker}-based). +deployment option for {trserver}: {k8s}, or systemd rpm installation. In case of a {k8s} deployment, provide the output of the {trento} support script as explained in section @@ -20,11 +20,6 @@ support script as explained in section In case of a systemd deployment, provide the output of the {trento} support plugin, as explained in section <>. -In case of a containerized deployment, provide the logs of the -trento-web and trento-wanda containers. Use `+docker ps+` to retrieve -the IDs of both containers, then `+docker logs CONTAINER_ID+` to -retrieve the corresponding logs. - For issues with a particular {tragent}, or a component discovered by a particular {tragent}, also provide the following: diff --git a/trento/adoc/trento-sso-integration.adoc b/trento/adoc/trento-sso-integration.adoc index 06255cca..4f50a349 100644 --- a/trento/adoc/trento-sso-integration.adoc +++ b/trento/adoc/trento-sso-integration.adoc @@ -93,44 +93,6 @@ OIDC_CALLBACK_URL= + . Restart the application. -==== Enabling OpenID Connect when using Docker images - -To enable OIDC when using Docker images, proceed as follows: - -[arabic] -. If `+trento-web+` container is already running stop and delete the -container before continuing. For that run: -+ -[source,bash] ----- -docker stop trento-web -docker rm trento-web ----- -. Provide the following environment variables to the Docker container -via the `+-e+` option: -+ -[source,bash] ----- -docker run -d \ --p 4000:4000 \ ---name trento-web \ ---network trento-net \ ---add-host "host.docker.internal:host-gateway" \ - -...[other settings]... - -# Required: --e ENABLE_OIDC=true \ --e OIDC_CLIENT_ID= \ --e OIDC_CLIENT_SECRET= \ --e OIDC_BASE_URL= \ - -# Optional: --e OIDC_CALLBACK_URL= \ - -...[other settings]... ----- - ==== Available variables for OpenID Connect OIDC_CLIENT_ID:: @@ -145,6 +107,7 @@ OIDC_CALLBACK_URL:: `+https://#{TRENTO_WEB_ORIGIN}/auth/oidc_callback+`) [[using-oauth-20]] + === Using OAuth 2.0 {trento} integrates with an IDP that uses the OAuth 2 protocol to @@ -216,48 +179,6 @@ OAUTH2_CALLBACK_URL= + . Restart the application. -[[enabling-oauth-20-when-using-docker-images]] -==== Enabling OAuth 2.0 when using Docker images - -To enable OAuth 2.0 when using Docker images, proceed as follows: - -[arabic] -. If `+trento-web+` container is already running stop and delete the -container before continuing. For that run: -+ -[source,bash] ----- -docker stop trento-web -docker rm trento-web ----- -. Use the following environment variables to the Docker container via -the `+-e+` option: -+ -[source,bash] ----- -docker run -d \ --p 4000:4000 \ ---name trento-web \ ---network trento-net \ ---add-host "host.docker.internal:host-gateway" \ - -...[other settings]... - --e ENABLE_OAUTH2=true \ --e OAUTH2_CLIENT_ID= \ --e OAUTH2_CLIENT_SECRET= \ --e OAUTH2_BASE_URL= \ --e OAUTH2_AUTHORIZE_URL= \ --e OAUTH2_TOKEN_URL= \ --e OAUTH2_USER_URL= \ - -# Optional: --e OAUTH2_SCOPES= \ --e OAUTH2_CALLBACK_URL= \ - -...[other settings]... ----- - [[available-variables-for-oauth-20]] ==== Available variables for OAuth 2.0 @@ -496,60 +417,6 @@ SAML_SIGNED_ENVELOPES= + . Restart the application. -==== Enabling SAML when using Docker images - -To enable SAML when using Docker images, proceed as follows: - -[arabic] -. If `+trento-web+` container is already running stop and delete the -container before continuing. For that run: -+ -[source,bash] ----- -docker stop trento-web -docker rm trento-web ----- -. Use the following environment variables to the Docker container via -the `+-e+` option: -+ -[source,bash] ----- -docker run -d \ --p 4000:4000 \ ---name trento-web \ ---network trento-net \ ---add-host "host.docker.internal:host-gateway" \ - -...[other settings]... - --e ENABLE_SAML=true --e SAML_IDP_ID= \ --e SAML_SP_ID= \ -# Only SAML_METADATA_URL or SAML_METADATA_CONTENT must by provided --e SAML_METADATA_URL= \ --e SAML_METADATA_CONTENT= \ - -# Optional: --e SAML_IDP_NAMEID_FORMAT= \ --e SAML_SP_DIR= \ --e SAML_SP_ENTITY_ID= \ --e SAML_SP_CONTACT_NAME= \ --e SAML_SP_CONTACT_EMAIL= \ --e SAML_SP_ORG_NAME= \ --e SAML_SP_ORG_DISPLAYNAME= \ --e SAML_SP_ORG_URL= \ --e SAML_USERNAME_ATTR_NAME= \ --e SAML_EMAIL_ATTR_NAME= \ --e SAML_FIRSTNAME_ATTR_NAME= \ --e SAML_LASTNAME_ATTR_NAME= \ --e SAML_SIGN_REQUESTS= \ --e SAML_SIGN_METADATA= \ --e SAML_SIGNED_ASSERTION= \ --e SAML_SIGNED_ENVELOPES= \ - -...[other settings]... ----- - ==== Available variables for SAML SAML_IDP_ID:: diff --git a/trento/adoc/trento-systemd-install.adoc b/trento/adoc/trento-systemd-install.adoc index 4463f539..18a3c3fd 100644 --- a/trento/adoc/trento-systemd-install.adoc +++ b/trento/adoc/trento-systemd-install.adoc @@ -48,14 +48,6 @@ container. To use an existing Prometheus installation, set `+CHARTS_ENABLED+` to Minimal required Prometheus version is *2.28.0*. -If you have a -https://prometheus.io/docs/prometheus/latest/installation/[existing -Prometheus server], ensure to set the PROMETHEUS_URL environment -variable to your Prometheus server's URL as part of the Docker command -when creating the `+trento-web+` container or configuring the RPM -packages. Use <> as a reference to -adjust the Prometheus configuration. - [[prometheus-packagehub, Install Prometheus using the *unsupported* PackageHub repository]] ====== Install Prometheus using the *unsupported* PackageHub repository diff --git a/trento/adoc/trento-update-trento-checks.adoc b/trento/adoc/trento-update-trento-checks.adoc index e079a855..1d185ac5 100644 --- a/trento/adoc/trento-update-trento-checks.adoc +++ b/trento/adoc/trento-update-trento-checks.adoc @@ -33,17 +33,4 @@ can use Zypper to update your checks catalog: {prompt_sudo}zypper ref {prompt_sudo}zypper update trento-checks ---- -==== - -In a containerized deployment, checks are delivered as a container -image, and you can user Docker to pull the latest version into the -trento-checks volume created during the installation process: - -==== -[source,bash,subs="attributes"] ----- -{prompt_user}docker run \ --v trento-checks:/usr/share/trento/checks \ -registry.suse.com/trento/trento-checks:latest ----- -==== +==== \ No newline at end of file diff --git a/trento/adoc/trento-update-trento-server.adoc b/trento/adoc/trento-update-trento-server.adoc index 16a510b3..fb8469c0 100644 --- a/trento/adoc/trento-update-trento-server.adoc +++ b/trento/adoc/trento-update-trento-server.adoc @@ -66,11 +66,3 @@ In a system deployment, you can use zypper to update {trserver}: systemctl restart trento-wanda ---- ==== - -In a containerized deployment, you can use the same Docker commands as -for the installation. Keep in mind that the volume for the {trento} -checks already exists, so there is no need to create it. Also, the web -and wanda containers must be stopped and removed before they can be -redeployed with the latest version. Also make sure to include in the -Docker commands any other options that you have enabled after the -original installation. From 36fb5684cfdc8424b8cf7d5657612f654ea9df03 Mon Sep 17 00:00:00 2001 From: EMaksy Date: Fri, 7 Nov 2025 17:26:46 +0100 Subject: [PATCH 2/7] Remove container and docker mentions --- trento/adoc/trento-install-agents.adoc | 2 +- trento/adoc/trento-lifecycle.adoc | 2 +- trento/adoc/trento-requirements.adoc | 4 ++-- trento/adoc/trento-systemd-install.adoc | 3 +-- trento/adoc/trento-uninstall-trento-server.adoc | 2 +- trento/adoc/trento-update-trento-checks.adoc | 2 +- trento/adoc/trento-update-trento-server.adoc | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/trento/adoc/trento-install-agents.adoc b/trento/adoc/trento-install-agents.adoc index 0623131b..83b52435 100644 --- a/trento/adoc/trento-install-agents.adoc +++ b/trento/adoc/trento-install-agents.adoc @@ -45,7 +45,7 @@ amqp://trento:trento@TRENTO_SERVER_HOSTNAME:5672/. If the default RabbitMQ username and password (`+trento:trento+`) were updated using Helm, the parameter must use a user-defined value. + -In a systemd or containerized deployment, the correct value is +In a systemd deployment, the correct value is `+amqp://TRENTO_USER:TRENTO_USER_PASSWORD@TRENTO_SERVER_HOSTNAME:5672/vhost+`. If `+TRENTO_USER+` and `+TRENTO_USER_PASSWORD+` have been replaced with custom values, you must use them. diff --git a/trento/adoc/trento-lifecycle.adoc b/trento/adoc/trento-lifecycle.adoc index 2ec0e4af..8d4bd0b7 100644 --- a/trento/adoc/trento-lifecycle.adoc +++ b/trento/adoc/trento-lifecycle.adoc @@ -25,4 +25,4 @@ Delivery mechanisms::: A set of container images from the {suse} public registry * If you don't have a {k8s} cluster, and need enterprise support, {suse} recommends {suse} {rke} (RKE) version 1 or 2. * If you do not have a {k8s} enterprise solution but you want to try {trento}, {suse} Rancher's K3s provides you with an easy way to get started. But keep in mind that K3s default installation process deploys a single node {k8s} cluster, which is not a recommended setup for a stable Trento production instance. -systemd and containerized deployments::: Supported in {sles4sap} 15 SP3 and newer. +systemd deployments::: Supported in {sles4sap} 15 SP3 and newer. diff --git a/trento/adoc/trento-requirements.adoc b/trento/adoc/trento-requirements.adoc index dd3e2bfb..3202eb7a 100644 --- a/trento/adoc/trento-requirements.adoc +++ b/trento/adoc/trento-requirements.adoc @@ -14,7 +14,7 @@ Running all the {trserver} components requires a minimum of 4 GB of RAM, two CPU {trento} is based on event-driven technology. Registered events are stored in a {postgresql} database with a default retention period of 10 days. For each host registered with {trento}, you need to allocate at least 1.5GB of space in the {postgresql} database. -{trserver} supports different deployment scenarios: {k8s}, systemd, and containers. A {k8s}-based deployment of {trserver} is cloud-native and OS-agnostic. It can be performed on the following services: +{trserver} supports different deployment scenarios: {k8s} and systemd. A {k8s}-based deployment of {trserver} is cloud-native and OS-agnostic. It can be performed on the following services: * RKE1 ({rancher_k8s_engine} version 1) * RKE2 @@ -56,5 +56,5 @@ Similarly, the clusters must have unique authkeys in order to be registered in { [[sec-trento-installation-prerequisites]] === Installation prerequisites -* *{trserver}* For a {k8s}-based deployment, you must have access to {suse} public registry for the deployment of {trserver} containers. For a systemd deployment, you must have a registered {sles4sap} 15 (SP3 or higher) distribution. The same applies to a containerized deployment. +* *{trserver}* For a {k8s}-based deployment, you must have access to {suse} public registry for the deployment of {trserver} containers. For a systemd deployment, you must have a registered {sles4sap} 15 (SP3 or higher) distribution. * *{tragent}s* A registered {sles4sap} 15 (SP3 or higher) distribution. diff --git a/trento/adoc/trento-systemd-install.adoc b/trento/adoc/trento-systemd-install.adoc index 18a3c3fd..fe46031e 100644 --- a/trento/adoc/trento-systemd-install.adoc +++ b/trento/adoc/trento-systemd-install.adoc @@ -38,8 +38,7 @@ useful information about the CPU load and memory. ==== If you choose not to install Prometheus, set `+CHARTS_ENABLED+` to `+false+` in the {trento} web RPM configuration file stored in -`+/etc/trento/trento-web+`, or when it is provided to the {trento} web -container. To use an existing Prometheus installation, set `+CHARTS_ENABLED+` to +`+/etc/trento/trento-web+`. To use an existing Prometheus installation, set `+CHARTS_ENABLED+` to `+true+` ==== diff --git a/trento/adoc/trento-uninstall-trento-server.adoc b/trento/adoc/trento-uninstall-trento-server.adoc index 08b94928..db7a5971 100644 --- a/trento/adoc/trento-uninstall-trento-server.adoc +++ b/trento/adoc/trento-uninstall-trento-server.adoc @@ -6,7 +6,7 @@ include::product-attributes.adoc[] The procedure to uninstall the {trserver} depends on the deployment -type: {k8s}, systemd or containerized. The section covers {k8s} +type: {k8s} or systemd. The section covers {k8s} deployments. If {trserver} was deployed manually, you need to uninstall it manually. diff --git a/trento/adoc/trento-update-trento-checks.adoc b/trento/adoc/trento-update-trento-checks.adoc index 1d185ac5..f220eb02 100644 --- a/trento/adoc/trento-update-trento-checks.adoc +++ b/trento/adoc/trento-update-trento-checks.adoc @@ -11,7 +11,7 @@ catalog in their setup whenever updates to existing checks and new checks are released, without waiting for a new version release cycle. The procedure of updating the configuration checks depends on the -{trserver} deployment type: {k8s}, systemd or containerized. +{trserver} deployment type: {k8s} or systemd. In a {k8s} deployment, checks are delivered as a container image, and you can use Helm with the following options to pull the latest image: diff --git a/trento/adoc/trento-update-trento-server.adoc b/trento/adoc/trento-update-trento-server.adoc index fb8469c0..05ca1c3b 100644 --- a/trento/adoc/trento-update-trento-server.adoc +++ b/trento/adoc/trento-update-trento-server.adoc @@ -6,7 +6,7 @@ include::product-attributes.adoc[] The procedure to update {trserver} depends on the chosen deployment -option: {k8s}, systemd, or containerized. +option: {k8s} or systemd. Consider the following when performing an update: From 24662e47d6fa1ad2eb090eacb37eff83d40e2438 Mon Sep 17 00:00:00 2001 From: EMaksy Date: Fri, 7 Nov 2025 17:31:13 +0100 Subject: [PATCH 3/7] Remove SP3 --- trento/adoc/trento-lifecycle.adoc | 4 ++-- trento/adoc/trento-report-issue.adoc | 2 +- trento/adoc/trento-requirements.adoc | 2 +- trento/adoc/trento-sso-integration.adoc | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/trento/adoc/trento-lifecycle.adoc b/trento/adoc/trento-lifecycle.adoc index 8d4bd0b7..f7b24cbe 100644 --- a/trento/adoc/trento-lifecycle.adoc +++ b/trento/adoc/trento-lifecycle.adoc @@ -12,7 +12,7 @@ include::product-attributes.adoc[] + Delivery mechanism::: RPM package for {sles4sap} 15 SP3 and newer. -Supported runtime::: Supported in {sles4sap} 15 SP3 and newer on x86_64 and ppc64le architectures. +Supported runtime::: Supported in {sles4sap} 15 SP4 and newer on x86_64 and ppc64le architectures. // Variable List for trserver {trserver}:: @@ -25,4 +25,4 @@ Delivery mechanisms::: A set of container images from the {suse} public registry * If you don't have a {k8s} cluster, and need enterprise support, {suse} recommends {suse} {rke} (RKE) version 1 or 2. * If you do not have a {k8s} enterprise solution but you want to try {trento}, {suse} Rancher's K3s provides you with an easy way to get started. But keep in mind that K3s default installation process deploys a single node {k8s} cluster, which is not a recommended setup for a stable Trento production instance. -systemd deployments::: Supported in {sles4sap} 15 SP3 and newer. +systemd deployments::: Supported in {sles4sap} 15 SP4 and newer. diff --git a/trento/adoc/trento-report-issue.adoc b/trento/adoc/trento-report-issue.adoc index 47c61e31..8c592eee 100644 --- a/trento/adoc/trento-report-issue.adoc +++ b/trento/adoc/trento-report-issue.adoc @@ -5,7 +5,7 @@ include::product-attributes.adoc[] :revdate: 2025-10-27 -{suse} customers with registered {sles4sap}{nbsp}15 (SP3 or higher) +{suse} customers with registered {sles4sap}{nbsp}15 (SP4 or higher) distributions can report {trento} issues either directly in the {scc} or through the corresponding vendor, depending on their licensing model. Problems must be reported under {sles4sap}{nbsp}15 and component diff --git a/trento/adoc/trento-requirements.adoc b/trento/adoc/trento-requirements.adoc index 3202eb7a..5271cb84 100644 --- a/trento/adoc/trento-requirements.adoc +++ b/trento/adoc/trento-requirements.adoc @@ -56,5 +56,5 @@ Similarly, the clusters must have unique authkeys in order to be registered in { [[sec-trento-installation-prerequisites]] === Installation prerequisites -* *{trserver}* For a {k8s}-based deployment, you must have access to {suse} public registry for the deployment of {trserver} containers. For a systemd deployment, you must have a registered {sles4sap} 15 (SP3 or higher) distribution. +* *{trserver}* For a {k8s}-based deployment, you must have access to {suse} public registry for the deployment of {trserver} containers. For a systemd deployment, you must have a registered {sles4sap} 15 (SP4 or higher) or {sles4sap} 16.0 distribution. * *{tragent}s* A registered {sles4sap} 15 (SP3 or higher) distribution. diff --git a/trento/adoc/trento-sso-integration.adoc b/trento/adoc/trento-sso-integration.adoc index 4f50a349..3892837b 100644 --- a/trento/adoc/trento-sso-integration.adoc +++ b/trento/adoc/trento-sso-integration.adoc @@ -107,7 +107,6 @@ OIDC_CALLBACK_URL:: `+https://#{TRENTO_WEB_ORIGIN}/auth/oidc_callback+`) [[using-oauth-20]] - === Using OAuth 2.0 {trento} integrates with an IDP that uses the OAuth 2 protocol to From fef94da672a6075faac4821e07d4e06206acf81f Mon Sep 17 00:00:00 2001 From: EMaksy Date: Mon, 10 Nov 2025 10:53:12 +0100 Subject: [PATCH 4/7] Add env for wanda --- content/internal-notes/trento-container-install.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/content/internal-notes/trento-container-install.adoc b/content/internal-notes/trento-container-install.adoc index 3b6ad452..298d60d0 100644 --- a/content/internal-notes/trento-container-install.adoc +++ b/content/internal-notes/trento-container-install.adoc @@ -100,6 +100,7 @@ docker run -d --name wanda \ -e AMQP_URL=amqp://trento_user:trento_user_password@host.docker.internal/vhost \ -e DATABASE_URL=ecto://wanda_user:wanda_password@host.docker.internal/wanda \ -e OAS_SERVER_URL=https://trento.example.com/wanda \ + -e AUTH_SERVER_URL=http://localhost:4000 \ --restart always \ --entrypoint /bin/sh \ registry.suse.com/trento/trento-wanda:latest \ From 2edecf3c3e372d3b6067f674bf6c3c25db7e5085 Mon Sep 17 00:00:00 2001 From: EMaksy Date: Tue, 11 Nov 2025 10:36:53 +0100 Subject: [PATCH 5/7] explicit name sle 16 --- trento/adoc/trento-lifecycle.adoc | 2 +- trento/adoc/trento-report-issue.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trento/adoc/trento-lifecycle.adoc b/trento/adoc/trento-lifecycle.adoc index f7b24cbe..e33079ed 100644 --- a/trento/adoc/trento-lifecycle.adoc +++ b/trento/adoc/trento-lifecycle.adoc @@ -12,7 +12,7 @@ include::product-attributes.adoc[] + Delivery mechanism::: RPM package for {sles4sap} 15 SP3 and newer. -Supported runtime::: Supported in {sles4sap} 15 SP4 and newer on x86_64 and ppc64le architectures. +Supported runtime::: Supported in {sles4sap} 15 SP4 and newer, and {sles4sap} 16.0, on x86_64 and ppc64le architectures. // Variable List for trserver {trserver}:: diff --git a/trento/adoc/trento-report-issue.adoc b/trento/adoc/trento-report-issue.adoc index 8c592eee..310a48b3 100644 --- a/trento/adoc/trento-report-issue.adoc +++ b/trento/adoc/trento-report-issue.adoc @@ -5,7 +5,7 @@ include::product-attributes.adoc[] :revdate: 2025-10-27 -{suse} customers with registered {sles4sap}{nbsp}15 (SP4 or higher) +{suse} customers with registered {sles4sap}{nbsp}15 (SP4 or higher) or {sles4sap} 16.0 distributions can report {trento} issues either directly in the {scc} or through the corresponding vendor, depending on their licensing model. Problems must be reported under {sles4sap}{nbsp}15 and component From 94f8bb82e0381eee7b38f73c875ac6aaaa6eb576 Mon Sep 17 00:00:00 2001 From: EMaksy Date: Tue, 11 Nov 2025 15:35:50 +0100 Subject: [PATCH 6/7] Use vars and upcast rpm --- .../internal-notes/trento-container-install.adoc | 14 ++++++++------ trento/adoc/trento-report-issue.adoc | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content/internal-notes/trento-container-install.adoc b/content/internal-notes/trento-container-install.adoc index 298d60d0..c7964639 100644 --- a/content/internal-notes/trento-container-install.adoc +++ b/content/internal-notes/trento-container-install.adoc @@ -1,11 +1,13 @@ +:trento: Trento + == Containerized deployment -A containerized deployment of trento is identical to the systemd +A containerized deployment of {trento} is identical to the systemd deployment. However, the web and check engine components are deployed as Docker containers. Follow the steps in link:https://www.trento-project.io/docs/user-guide/trento-install-server.html#sec-systemd-deployment[systemd installation], but skip the *Install -Trento using RPM packages* step and follow the procedures as described below. +{trento} using RPM packages* step and follow the procedures as described below. === Install Trento using Docker @@ -31,9 +33,9 @@ zypper install docker systemctl enable --now docker ---- -==== Create a dedicated Docker network for Trento +==== Create a dedicated Docker network for {trento} -. Create the Trento Docker network: +. Create the {trento} Docker network: + [source,bash] ---- @@ -57,7 +59,7 @@ The output should be similar to this (the exact address may vary): . Open the _/var/lib/pgsql/data/pg_hba.conf_ file for editing and replace `0.0.0.0/0` with the address returned by the command in the previous step. . Restart the PostgreSQL server using the `systemctl restart postgresql` command. -==== Install Trento on Docker +==== Install {trento} on Docker . Create secret environment variables: + @@ -118,7 +120,7 @@ the UI. [NOTE] ==== Add `+CHARTS_ENABLED=false+` if Prometheus is not installed, or you do -not want to use Trento's charts functionality. +not want to use {trento}'s charts functionality. ==== + [source,bash] diff --git a/trento/adoc/trento-report-issue.adoc b/trento/adoc/trento-report-issue.adoc index 310a48b3..c94d7ea0 100644 --- a/trento/adoc/trento-report-issue.adoc +++ b/trento/adoc/trento-report-issue.adoc @@ -12,7 +12,7 @@ Problems must be reported under {sles4sap}{nbsp}15 and component trento. When opening a support case for {trento}, provide the relevant -deployment option for {trserver}: {k8s}, or systemd rpm installation. +deployment option for {trserver}: {k8s}, or systemd RPM installation. In case of a {k8s} deployment, provide the output of the {trento} support script as explained in section From f40eaa693b3d248dab466d4a264ec475c5e55b1a Mon Sep 17 00:00:00 2001 From: EMaksy Date: Wed, 12 Nov 2025 10:05:53 +0100 Subject: [PATCH 7/7] Add explicit sle 16.0 --- trento/adoc/trento-lifecycle.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trento/adoc/trento-lifecycle.adoc b/trento/adoc/trento-lifecycle.adoc index e33079ed..aa5263af 100644 --- a/trento/adoc/trento-lifecycle.adoc +++ b/trento/adoc/trento-lifecycle.adoc @@ -25,4 +25,4 @@ Delivery mechanisms::: A set of container images from the {suse} public registry * If you don't have a {k8s} cluster, and need enterprise support, {suse} recommends {suse} {rke} (RKE) version 1 or 2. * If you do not have a {k8s} enterprise solution but you want to try {trento}, {suse} Rancher's K3s provides you with an easy way to get started. But keep in mind that K3s default installation process deploys a single node {k8s} cluster, which is not a recommended setup for a stable Trento production instance. -systemd deployments::: Supported in {sles4sap} 15 SP4 and newer. +systemd deployments::: Supported in {sles4sap} 15 SP4 and newer, and {sles4sap} 16.0.