Skip to content

Commit ca873b1

Browse files
Merge pull request #79780 from max-cx/OBSDOCS-744
OBSDOCS-744: Document taint and toleration usage for Tempo/Jaeger/OTEL
2 parents 2906c7f + 0bca7ed commit ca873b1

File tree

3 files changed

+31
-18
lines changed

3 files changed

+31
-18
lines changed

observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
----
2828
<1> Deployment strategy.
2929

30-
[id="supported-deployment-strategies"]
30+
[id="supported-deployment-strategies_{context}"]
3131
== Supported deployment strategies
3232

3333
The {JaegerName} Operator currently supports the following deployment strategies:
@@ -58,12 +58,12 @@ include::modules/distr-tracing-deploy-production-es.adoc[leveloffset=+1]
5858

5959
include::modules/distr-tracing-deploy-streaming.adoc[leveloffset=+1]
6060

61-
[id="validating-your-jaeger-deployment"]
61+
[id="validating-your-jaeger-deployment_{context}"]
6262
== Validating your deployment
6363

6464
include::modules/distr-tracing-accessing-jaeger-console.adoc[leveloffset=+2]
6565

66-
[id="customizing-your-deployment"]
66+
[id="customizing-your-deployment_{context}"]
6767
== Customizing your deployment
6868

6969
include::modules/distr-tracing-deployment-best-practices.adoc[leveloffset=+2]
@@ -74,6 +74,11 @@ endif::[]
7474

7575
include::modules/distr-tracing-config-default.adoc[leveloffset=+2]
7676

77+
[id="taints-and-tolerations_{context}"]
78+
=== Using taints and tolerations
79+
80+
To schedule the Jaeger and Elasticsearch pods on dedicated nodes, see link:https://access.redhat.com/solutions/7040769[How to deploy the different Jaeger components on infra nodes using nodeSelector and tolerations in OpenShift 4].
81+
7782
include::modules/distr-tracing-config-jaeger-collector.adoc[leveloffset=+2]
7883

7984
include::modules/distr-tracing-config-sampling.adoc[leveloffset=+2]
@@ -84,7 +89,7 @@ include::modules/distr-tracing-config-query.adoc[leveloffset=+2]
8489

8590
include::modules/distr-tracing-config-ingester.adoc[leveloffset=+2]
8691

87-
[id="injecting-sidecars"]
92+
[id="injecting-sidecars_{context}"]
8893
== Injecting sidecars
8994

9095
The {JaegerName} relies on a proxy sidecar within the application's pod to provide the Agent. The {JaegerName} Operator can inject Agent sidecars into deployment workloads. You can enable automatic sidecar injection or manage it manually.

observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,44 @@ toc::[]
88

99
The {TempoOperator} uses a custom resource definition (CRD) file that defines the architecture and configuration settings for creating and deploying the {TempoShortName} resources. You can install the default configuration or modify the file.
1010

11-
[id="customizing-your-tempo-deployment"]
12-
== Customizing your deployment
13-
1411
ifdef::openshift-enterprise,openshift-dedicated[]
15-
For information about configuring the back-end storage, see xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] and the appropriate configuration topic for your chosen storage option.
12+
[id="configuring-storages_{context}"]
13+
== Configuring back-end storage
14+
15+
For information about configuring the back-end storage, see xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] and the relevant configuration section for your chosen storage option.
1616
endif::[]
1717

18-
include::modules/distr-tracing-tempo-config-default.adoc[leveloffset=+2]
18+
include::modules/distr-tracing-tempo-config-default.adoc[leveloffset=+1]
1919

2020
[role="_additional-resources"]
2121
.Additional resources
2222
* xref:../../../observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc#installing-a-tempostack-instance[Installing a TempoStack instance]
2323
* xref:../../../observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc#installing-a-tempomonolithic-instance[Installing a TempoMonolithic instance]
2424
25-
include::modules/distr-tracing-tempo-config-query-frontend.adoc[leveloffset=+2]
25+
include::modules/distr-tracing-tempo-config-query-frontend.adoc[leveloffset=+1]
2626

2727
[role="_additional-resources"]
28-
[id="additional-resources_distr-tracing-tempo-configuring-query-frontend"]
29-
==== Additional resources
28+
.Additional resources
3029
* xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about_nodes-scheduler-taints-tolerations[Understanding taints and tolerations]
3130
32-
include::modules/distr-tracing-tempo-config-spanmetrics.adoc[leveloffset=+2]
31+
include::modules/distr-tracing-tempo-config-spanmetrics.adoc[leveloffset=+1]
3332

34-
include::modules/distr-tracing-tempo-config-multitenancy.adoc[leveloffset=+2]
33+
include::modules/distr-tracing-tempo-config-multitenancy.adoc[leveloffset=+1]
3534

36-
[id="setting-up-monitoring-for-tempo"]
35+
[id="taints-and-tolerations_{context}"]
36+
== Using taints and tolerations
37+
38+
To schedule the TempoStack pods on dedicated nodes, see link:https://access.redhat.com/solutions/7040685[How to deploy the different TempoStack components on infra nodes using nodeSelector and tolerations in OpenShift 4].
39+
40+
[id="setting-up-monitoring-for-tempo_{context}"]
3741
== Configuring monitoring and alerts
3842

3943
The {TempoOperator} supports monitoring and alerts about each TempoStack component such as distributor, ingester, and so on, and exposes upgrade and operational metrics about the Operator itself.
4044

4145
include::modules/distr-tracing-tempo-configuring-tempostack-metrics-and-alerts.adoc[leveloffset=+2]
4246

4347
[role="_additional-resources"]
44-
[id="additional-resources_distr-tracing-tempo-configuring-tempostack-metrics-and-alerts"]
45-
==== Additional resources
48+
.Additional resources
4649
* xref:../../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects]
4750

4851
include::modules/distr-tracing-tempo-configuring-tempooperator-metrics-and-alerts.adoc[leveloffset=+2]

observability/otel/otel-installing.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ include::modules/otel-install-web-console.adoc[leveloffset=+1]
1616

1717
include::modules/otel-install-cli.adoc[leveloffset=+1]
1818

19+
[id="taints-and-tolerations_{context}"]
20+
== Using taints and tolerations
21+
22+
To schedule the OpenTelemetry pods on dedicated nodes, see link:https://access.redhat.com/solutions/7040771[How to deploy the different OpenTelemetry components on infra nodes using nodeSelector and tolerations in OpenShift 4]
23+
1924
[role="_additional-resources"]
20-
[id="additional-resources_otel-installing"]
25+
[id="additional-resources_otel-installing_{context}"]
2126
== Additional resources
2227
* xref:../../post_installation_configuration/preparing-for-users.adoc#creating-cluster-admin_post-install-preparing-for-users[Creating a cluster admin]
2328
* link:https://operatorhub.io/[OperatorHub.io]

0 commit comments

Comments
 (0)