From d6ac3fc37af011b48ecf993efe79ccf29d2df4ca Mon Sep 17 00:00:00 2001 From: Julie Stickler Date: Thu, 15 Sep 2022 15:01:58 -0400 Subject: [PATCH] OSSMDOC-666: Add link to persistent storage docs. --- .../distr-tracing-deploying-jaeger.adoc | 4 ++++ modules/jaeger-deployment-best-practices.adoc | 2 +- modules/jaeger-features.adoc | 2 +- modules/jaeger-install-overview.adoc | 2 +- modules/jaeger-removing-instance-cli.adoc | 2 +- modules/jaeger-removing-instance.adoc | 2 +- modules/jaeger-sidecar-automatic.adoc | 2 +- modules/jaeger-sidecar-manual.adoc | 2 +- modules/jaeger-upgrading-es.adoc | 2 +- service_mesh/v2x/ossm-reference-jaeger.adoc | 6 +++++- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc b/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc index 0624b85b2c..e46b77c318 100644 --- a/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc +++ b/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc @@ -66,6 +66,10 @@ include::modules/distr-tracing-accessing-jaeger-console.adoc[leveloffset=+2] include::modules/distr-tracing-deployment-best-practices.adoc[leveloffset=+2] +ifdef::openshift-enterprise,openshift-dedicated[] +For information about configuring persistent storage, see xref:../../storage/understanding-persistent-storage.adoc[Understanding persistent storage] and the appropriate configuration topic for your chosen storage option. +endif::[] + include::modules/distr-tracing-config-default.adoc[leveloffset=+2] include::modules/distr-tracing-config-jaeger-collector.adoc[leveloffset=+2] diff --git a/modules/jaeger-deployment-best-practices.adoc b/modules/jaeger-deployment-best-practices.adoc index b617fe9f3b..686239d817 100644 --- a/modules/jaeger-deployment-best-practices.adoc +++ b/modules/jaeger-deployment-best-practices.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: * /jaeger/jaeger_install/rhbjaeger-deploying.adoc //// -:pantheon-module-type: CONCEPT +:_content-type: CONCEPT [id="jager-deployment-best-practices_{context}"] = Deployment best practices diff --git a/modules/jaeger-features.adoc b/modules/jaeger-features.adoc index 5923d571a6..82d952bb1f 100644 --- a/modules/jaeger-features.adoc +++ b/modules/jaeger-features.adoc @@ -4,7 +4,7 @@ This module included in the following assemblies: -service_mesh/v2x/ossm-architecture.adoc -rhbjaeger-architecture.adoc //// -:pantheon-module-type: CONCEPT +:_content-type: CONCEPT [id="jaeger-features_{context}"] = Jaeger features diff --git a/modules/jaeger-install-overview.adoc b/modules/jaeger-install-overview.adoc index 98122fb40f..aeefae198b 100644 --- a/modules/jaeger-install-overview.adoc +++ b/modules/jaeger-install-overview.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - rhbjaeger-installation.adoc //// -:pantheon-module-type: CONCEPT +:_content-type: CONCEPT [id="jaeger-install-overview_{context}"] = Jaeger installation overview diff --git a/modules/jaeger-removing-instance-cli.adoc b/modules/jaeger-removing-instance-cli.adoc index d4d4691d34..870044218f 100644 --- a/modules/jaeger-removing-instance-cli.adoc +++ b/modules/jaeger-removing-instance-cli.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - rhbjaeger-installation.adoc //// -:pantheon-module-type: PROCEDURE +:_content-type: PROCEDURE [id="jaeger-removing-cli_{context}"] = Removing a Jaeger instance using the CLI diff --git a/modules/jaeger-removing-instance.adoc b/modules/jaeger-removing-instance.adoc index a72646377b..cb18b21862 100644 --- a/modules/jaeger-removing-instance.adoc +++ b/modules/jaeger-removing-instance.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - rhbjaeger-removing.adoc //// -:pantheon-module-type: PROCEDURE +:_content-type: PROCEDURE [id="jaeger-removing_{context}"] = Removing a Jaeger instance using the web console diff --git a/modules/jaeger-sidecar-automatic.adoc b/modules/jaeger-sidecar-automatic.adoc index 3587cf3ac7..7bb1f62967 100644 --- a/modules/jaeger-sidecar-automatic.adoc +++ b/modules/jaeger-sidecar-automatic.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - rhbjaeger-deploying.adoc //// -:pantheon-module-type: PROCEDURE +:_content-type: PROCEDURE [id="jaeger-sidecar-automatic_{context}"] = Automatically injecting sidecars diff --git a/modules/jaeger-sidecar-manual.adoc b/modules/jaeger-sidecar-manual.adoc index db675350af..0f4770ab25 100644 --- a/modules/jaeger-sidecar-manual.adoc +++ b/modules/jaeger-sidecar-manual.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - rhbjaeger-deploying.adoc //// -:pantheon-module-type: PROCEDURE +:_content-type: PROCEDURE [id="jaeger-sidecar-manual_{context}"] = Manually injecting sidecars diff --git a/modules/jaeger-upgrading-es.adoc b/modules/jaeger-upgrading-es.adoc index 6cdf2ac49e..bab264d52f 100644 --- a/modules/jaeger-upgrading-es.adoc +++ b/modules/jaeger-upgrading-es.adoc @@ -2,7 +2,7 @@ This module included in the following assemblies: - jaeger_install/rhbjaeger-updating //// -:pantheon-module-type: PROCEDURE +:_content-type: PROCEDURE [id="upgrading_es5_es6_{context}"] = Upgrading from Elasticsearch 5 to Elasticsearch 6 diff --git a/service_mesh/v2x/ossm-reference-jaeger.adoc b/service_mesh/v2x/ossm-reference-jaeger.adoc index 36ef7e442a..d49aefa046 100644 --- a/service_mesh/v2x/ossm-reference-jaeger.adoc +++ b/service_mesh/v2x/ossm-reference-jaeger.adoc @@ -18,6 +18,10 @@ include::modules/ossm-configuring-external-jaeger.adoc[leveloffset=+1] include::modules/distr-tracing-deployment-best-practices.adoc[leveloffset=+2] +ifdef::openshift-enterprise,openshift-dedicated[] +For information about configuring persistent storage, see xref:../../storage/understanding-persistent-storage.adoc[Understanding persistent storage] and the appropriate configuration topic for your chosen storage option. +endif::[] + include::modules/distr-tracing-config-security-ossm.adoc[leveloffset=+2] include::modules/distr-tracing-config-security-ossm-web.adoc[leveloffset=+3] @@ -32,7 +36,7 @@ include::modules/distr-tracing-config-sampling.adoc[leveloffset=+2] include::modules/distr-tracing-config-storage.adoc[leveloffset=+2] -ifdef::openshift-enterprise[] +ifdef::openshift-enterprise,openshift-dedicated[] For more information about configuring Elasticsearch with {product-title}, see xref:../../logging/config/cluster-logging-log-store.adoc[Configuring the log store] or xref:../../distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc[Configuring and deploying distributed tracing]. //TO DO For information about connecting to an external Elasticsearch instance, see xref:../../distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc#jaeger-config-external-es_jaeger-deploying[Connecting to an existing Elasticsearch instance].