Skip to content

Commit d960e26

Browse files
authored
Merge pull request #96741 from theashiot/OBSDOCS-2209-4.17
OBSDOCS-2209: [4.17] Place a redirect notice on OCP logging docs
2 parents 3056f63 + 953a0b6 commit d960e26

File tree

7 files changed

+110
-50
lines changed

7 files changed

+110
-50
lines changed

_topic_maps/_topic_map.yml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,68 +3012,68 @@ Topics:
30123012
- Name: Logging 6.2
30133013
Dir: logging-6.2
30143014
Topics:
3015-
- Name: Support
3016-
File: log62-cluster-logging-support
3017-
- Name: Release notes
3018-
File: log6x-release-notes-6.2
3015+
# - Name: Support
3016+
# File: log62-cluster-logging-support
3017+
# - Name: Release notes
3018+
# File: log6x-release-notes-6.2
30193019
- Name: About logging 6.2
3020-
File: log6x-about-6.2
3021-
- Name: Installing Logging
3022-
File: 6x-cluster-logging-deploying-6.2
3023-
- Name: Configuring log forwarding
3024-
File: log6x-clf-6.2
3020+
File: log6x-about-logging
3021+
# - Name: Installing Logging
3022+
# File: 6x-cluster-logging-deploying-6.2
3023+
# - Name: Configuring log forwarding
3024+
# File: log6x-clf-6.2
30253025
# - Name: Configuring the logging collector
30263026
# File: 6x-cluster-logging-collector-6.2
3027-
- Name: Configuring LokiStack storage
3028-
File: log6x-loki-6.2
3029-
- Name: Configuring LokiStack for OTLP
3030-
File: log6x-configuring-lokistack-otlp-6.2
3031-
- Name: Visualization for logging
3032-
File: log6x-visual-6.2
3027+
# - Name: Configuring LokiStack storage
3028+
# File: log6x-loki-6.2
3029+
# - Name: Configuring LokiStack for OTLP
3030+
# File: log6x-configuring-lokistack-otlp-6.2
3031+
# - Name: Visualization for logging
3032+
# File: log6x-visual-6.2
30333033
- Name: Logging 6.1
30343034
Dir: logging-6.1
30353035
Topics:
3036-
- Name: Support
3037-
File: log61-cluster-logging-support
3038-
- Name: Release notes
3039-
File: log6x-release-notes-6.1
3036+
# - Name: Support
3037+
# File: log61-cluster-logging-support
3038+
# - Name: Release notes
3039+
# File: log6x-release-notes-6.1
30403040
- Name: About logging 6.1
3041-
File: log6x-about-6.1
3042-
- Name: Installing Logging
3043-
File: 6x-cluster-logging-deploying-6.1
3044-
- Name: Configuring log forwarding
3045-
File: log6x-clf-6.1
3041+
File: log6x-about-logging
3042+
# - Name: Installing Logging
3043+
# File: 6x-cluster-logging-deploying-6.1
3044+
# - Name: Configuring log forwarding
3045+
# File: log6x-clf-6.1
30463046
# - Name: Configuring the logging collector
30473047
# File: 6x-cluster-logging-collector-6.1
3048-
- Name: Configuring LokiStack storage
3049-
File: log6x-loki-6.1
3050-
- Name: Configuring LokiStack for OTLP
3051-
File: log6x-configuring-lokistack-otlp-6.1
3052-
- Name: OpenTelemetry data model
3053-
File: log6x-opentelemetry-data-model-6.1
3054-
- Name: Visualization for logging
3055-
File: log6x-visual-6.1
3048+
# - Name: Configuring LokiStack storage
3049+
# File: log6x-loki-6.1
3050+
# - Name: Configuring LokiStack for OTLP
3051+
# File: log6x-configuring-lokistack-otlp-6.1
3052+
# - Name: OpenTelemetry data model
3053+
# File: log6x-opentelemetry-data-model-6.1
3054+
# - Name: Visualization for logging
3055+
# File: log6x-visual-6.1
30563056
- Name: Logging 6.0
30573057
Dir: logging-6.0
30583058
Topics:
3059-
- Name: Support
3060-
File: log60-cluster-logging-support
3061-
- Name: Release notes
3062-
File: log6x-release-notes
3059+
# - Name: Support
3060+
# File: log60-cluster-logging-support
3061+
# - Name: Release notes
3062+
# File: log6x-release-notes
30633063
- Name: About logging 6.0
3064-
File: log6x-about
3065-
- Name: Installing Logging
3066-
File: 6x-cluster-logging-deploying-6.0
3067-
- Name: Upgrading to Logging 6.0
3068-
File: log6x-upgrading-to-6
3069-
- Name: Configuring log forwarding
3070-
File: log6x-clf
3064+
File: log6x-about-logging
3065+
# - Name: Installing Logging
3066+
# File: 6x-cluster-logging-deploying-6.0
3067+
# - Name: Upgrading to Logging 6.0
3068+
# File: log6x-upgrading-to-6
3069+
# - Name: Configuring log forwarding
3070+
# File: log6x-clf
30713071
# - Name: Configuring the logging collector
30723072
# File: 6x-cluster-logging-collector-6.0
3073-
- Name: Configuring LokiStack storage
3074-
File: log6x-loki
3075-
- Name: Visualization for logging
3076-
File: log6x-visual
3073+
# - Name: Configuring LokiStack storage
3074+
# File: log6x-loki
3075+
# - Name: Visualization for logging
3076+
# File: log6x-visual
30773077
# - Name: API reference 6.0
30783078
# File: log6x-api-reference
30793079
- Name: Logging 5.8
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
3+
include::_attributes/attributes-openshift-dedicated.adoc[]
4+
[id="about-logging-6"]
5+
= About Logging
6+
:context: about-logging-6
7+
8+
toc::[]
9+
10+
As a cluster administrator, you can deploy {logging} on an {product-title} cluster, and use it to collect and aggregate node system audit logs, application container logs, and infrastructure logs.
11+
12+
You can use {logging} to perform the following tasks:
13+
14+
* Forward logs to your chosen log outputs, including on-cluster, Red{nbsp}Hat managed log storage.
15+
* Visualize your log data in the {product-title} web console.
16+
17+
[NOTE]
18+
====
19+
Because {logging} releases on a different cadence from {product-title}, the {logging} 6 documentation is available as a separate documentation set at link:https://docs.redhat.com/en/documentation/red_hat_openshift_logging/[Red{nbsp}Hat OpenShift {logging-uc}].
20+
====
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
3+
include::_attributes/attributes-openshift-dedicated.adoc[]
4+
[id="about-logging-6-1"]
5+
= About Logging
6+
:context: about-logging-6-1
7+
8+
toc::[]
9+
10+
As a cluster administrator, you can deploy {logging} on an {product-title} cluster, and use it to collect and aggregate node system audit logs, application container logs, and infrastructure logs.
11+
12+
You can use {logging} to perform the following tasks:
13+
14+
* Forward logs to your chosen log outputs, including on-cluster, Red{nbsp}Hat managed log storage.
15+
* Visualize your log data in the {product-title} web console.
16+
17+
[NOTE]
18+
====
19+
Because {logging} releases on a different cadence from {product-title}, the {logging} 6 documentation is available as a separate documentation set at link:https://docs.redhat.com/en/documentation/red_hat_openshift_logging/[Red{nbsp}Hat OpenShift {logging-uc}].
20+
====
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
3+
include::_attributes/attributes-openshift-dedicated.adoc[]
4+
[id="about-logging-6-2"]
5+
= About Logging
6+
:context: about-logging-6-2
7+
8+
toc::[]
9+
10+
As a cluster administrator, you can deploy {logging} on an {product-title} cluster, and use it to collect and aggregate node system audit logs, application container logs, and infrastructure logs.
11+
12+
You can use {logging} to perform the following tasks:
13+
14+
* Forward logs to your chosen log outputs, including on-cluster, Red{nbsp}Hat managed log storage.
15+
* Visualize your log data in the {product-title} web console.
16+
17+
[NOTE]
18+
====
19+
Because {logging} releases on a different cadence from {product-title}, the {logging} 6 documentation is available as a separate documentation set at link:https://docs.redhat.com/en/documentation/red_hat_openshift_logging/[Red{nbsp}Hat OpenShift {logging-uc}].
20+
====

release_notes/addtl-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ K::
4646
xref:../nodes/scheduling/descheduler/nodes-descheduler-release-notes.adoc#nodes-descheduler-release-notes[{descheduler-operator}]
4747

4848
L::
49-
xref:../observability/logging/logging-6.0/log6x-release-notes.adoc#log6x-release-notes[{logging-uc}]
49+
link:https://docs.redhat.com/en/documentation/red_hat_openshift_logging[{logging-uc}]
5050

5151
M::
5252
xref:../migration_toolkit_for_containers/release_notes/mtc-release-notes.adoc#mtc-release-notes[{mtc-full} ({mtc-short})]

scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-design-components.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ include::modules/telco-core-logging.adoc[leveloffset=+1]
6969
[role="_additional-resources"]
7070
.Additional resources
7171

72-
* xref:../../../observability/logging/logging-6.0/log6x-about.adoc#log6x-about[About logging]
72+
* xref:../../../observability/logging/logging-6.0/log6x-about-logging.adoc#about-logging-6-0[About logging]
7373
7474
* xref:../../../edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.adoc#talm-cluster-logging-6x-update-policygentemplate_ztp-talm[Removing Cluster Logging Operator artifacts from deployed clusters with PolicyGenTemplate CRs]
7575

scalability_and_performance/telco_ref_design_specs/ran/telco-ran-ref-du-components.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ include::modules/telco-ran-logging.adoc[leveloffset=+1]
4848
[role="_additional-resources"]
4949
.Additional resources
5050

51-
* xref:../../../observability/logging/logging-6.0/log6x-about.adoc#log6x-about[About logging]
51+
* xref:../../../observability/logging/logging-6.0/log6x-about-logging.adoc#about-logging-6[About logging]
5252
5353
* xref:../../../edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.adoc#talm-cluster-logging-6x-update-policygentemplate_ztp-talm[Removing Cluster Logging Operator artifacts from deployed clusters with PolicyGenTemplate CRs]
5454

0 commit comments

Comments
 (0)