Skip to content

Conversation

@max-cx
Copy link
Contributor

@max-cx max-cx commented Feb 26, 2024

Cherry-pick of #72079

⚠️ This PR aggregates cherry-picked commits from the following peer-reviewed PRs:

#70943
#71565
#69962
#71074

Version(s):

4.12, 4.13, 4.14, 4.15, 4.16

Issue:

https://issues.redhat.com/browse/OBSDOCS-764
https://issues.redhat.com/browse/OBSDOCS-790
https://issues.redhat.com/browse/OBSDOCS-811
https://issues.redhat.com/browse/TRACING-3574
https://issues.redhat.com/browse/TRACING-3802

Link to docs preview:

New content:
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/distr_tracing/distr_tracing_rn/distr-tracing-rn-3-1
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel_rn/otel-rn-3.1
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring#span-red-metrics-and-alerting-rules
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-configuration-of-otel-collector#otel-config-target-allocator_otel-configuration-of-otel-collector

Reorganized content:
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel_rn/otel-rn-past-releases
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-configuration-of-otel-collector
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-configuration-of-instrumentation
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-sending-traces-and-metrics-to-otel-collector
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-config-send-metrics-monitoring-stack
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-forwarding
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-configuring-otelcol-metrics
https://72079--ocpdocs-pr.netlify.app/openshift-enterprise/latest/otel/otel-config-multicluster

QE review:

  • QE has approved this change.

Additional information:

Conflicts:
	_attributes/common-attributes.adoc
	modules/distr-tracing-product-overview.adoc
	observability/index.adoc
	welcome/index.adoc

You are currently cherry-picking commit cc3ed91.

 Changes to be committed:
	modified:   _attributes/common-attributes.adoc
	modified:   _topic_maps/_topic_map.yml
	modified:   distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-removing.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-0.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-1.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-2.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-3.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-4.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-5.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-6.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-7.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-8.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9-1.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9-2.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-3-0.adoc
	new file:   distr_tracing/distr_tracing_rn/distr-tracing-rn-3-1.adoc
	new file:   distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.adoc
	modified:   modules/distr-tracing-architecture.adoc
	modified:   modules/distr-tracing-product-overview.adoc
	modified:   modules/distr-tracing-tempo-config-query-frontend.adoc
	modified:   modules/distr-tracing-tempo-config-spanmetrics.adoc
	renamed:    modules/otel-config-collector.adoc -> modules/otel-collector-components.adoc
	new file:   modules/otel-collector-config-options.adoc
	modified:   modules/otel-config-instrumentation.adoc
	new file:   modules/otel-config-target-allocator.adoc
	new file:   modules/otel-product-overview.adoc
	modified:   modules/otel-send-traces-and-metrics-to-otel-collector-with-sidecar.adoc
	modified:   modules/otel-send-traces-and-metrics-to-otel-collector-without-sidecar.adoc
	renamed:    modules/otel-config-multicluster.adoc -> otel/otel-config-multicluster.adoc
	renamed:    modules/otel-config-send-metrics-monitoring-stack.adoc -> otel/otel-config-send-metrics-monitoring-stack.adoc
	renamed:    otel/otel-instrumentation.adoc -> otel/otel-configuration-of-instrumentation.adoc
	new file:   otel/otel-configuration-of-otel-collector.adoc
	renamed:    modules/otel-configuring-otelcol-metrics.adoc -> otel/otel-configuring-otelcol-metrics.adoc
	deleted:    otel/otel-configuring.adoc
	renamed:    modules/otel-forwarding.adoc -> otel/otel-forwarding.adoc
	modified:   otel/otel-migrating.adoc
	deleted:    otel/otel-release-notes.adoc
	renamed:    otel/otel-using.adoc -> otel/otel-sending-traces-and-metrics-to-otel-collector.adoc
	new file:   otel/otel_rn/_attributes
	new file:   otel/otel_rn/images
	new file:   otel/otel_rn/modules
	new file:   otel/otel_rn/otel-rn-3.1.adoc
	new file:   otel/otel_rn/otel-rn-past-releases.adoc
	new file:   otel/otel_rn/snippets
	modified:   welcome/index.adoc
@openshift-ci
Copy link

openshift-ci bot commented Feb 26, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 26, 2024
@max-cx max-cx marked this pull request as ready for review February 26, 2024 18:12
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 26, 2024
@ocpdocs-previewbot
Copy link

🤖 Mon Feb 26 18:19:29 - Prow CI generated the docs preview: https://72123--ocpdocs-pr.netlify.app

@openshift-ci
Copy link

openshift-ci bot commented Feb 26, 2024

@max-cx: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@kcarmichael08 kcarmichael08 merged commit 7c7a9a0 into openshift:enterprise-4.12 Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants