Skip to content

Commit d36142f

Browse files
committed
fix topicmap no1
1 parent d631c0d commit d36142f

31 files changed

+25
-168
lines changed

_topic_maps/_topic_map.yml

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,38 +3081,26 @@ Topics:
30813081
Topics:
30823082
- Name: Release notes
30833083
File: logging-5-8-release-notes
3084-
- Name: About OpenShift logging
3085-
Dir: about
3086-
Topics:
3087-
- Name: Logging overview
3088-
File: about-logging
3089-
- Name: Cluster logging support
3090-
File: cluster-logging-support
3091-
- Name: Visualization for logging
3092-
File: logging-visualization
3093-
- Name: Quick start
3094-
File: quick-start
3084+
- Name: Logging overview
3085+
File: about-logging
3086+
- Name: Cluster logging support
3087+
File: cluster-logging-support
3088+
- Name: Visualization for logging
3089+
File: logging-visualization
3090+
- Name: Quick start
3091+
File: quick-start
30953092
- Name: Installing logging
3096-
Dir: installing
3097-
Topics:
3098-
- Name: Installing logging
3099-
File: installing-logging
3100-
- Name: Configuring logging
3101-
Dir: configuring
3102-
Topics:
3103-
- Name: Configuring log forwarding
3104-
File: configuring-log-forwarding
3105-
- Name: Configuring LokiStack storage
3106-
File: configuring-lokistack-storage
3107-
- Name: Configuring LokiStack for OTLP
3108-
File: configuring-lokistack-otlp
3109-
- Name: OpenTelemetry data model
3110-
File: opentelemetry-data-model
3111-
- Name: Upgrading logging
3112-
Dir: upgrading
3113-
Topics:
3114-
- Name: Upgrading to Logging 6.0
3115-
File: upgrading-to-logging-60
3093+
File: installing-logging
3094+
- Name: Configuring log forwarding
3095+
File: configuring-log-forwarding
3096+
- Name: Configuring LokiStack storage
3097+
File: configuring-lokistack-storage
3098+
- Name: Configuring LokiStack for OTLP
3099+
File: configuring-lokistack-otlp
3100+
- Name: OpenTelemetry data model
3101+
File: opentelemetry-data-model
3102+
- Name: Upgrading to Logging 6.0
3103+
File: upgrading-to-logging-60
31163104
# - Name: Configuring the logging collector
31173105
# File: cluster-logging-collector
31183106
# - Name: Support
File renamed without changes.

observability/logging/logging_release_notes/about/_attributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

observability/logging/logging_release_notes/about/cluster-logging-support.adoc

Lines changed: 0 additions & 44 deletions
This file was deleted.

observability/logging/logging_release_notes/about/docinfo.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

observability/logging/logging_release_notes/about/images

Lines changed: 0 additions & 1 deletion
This file was deleted.

observability/logging/logging_release_notes/about/modules

Lines changed: 0 additions & 1 deletion
This file was deleted.

observability/logging/logging_release_notes/about/snippets

Lines changed: 0 additions & 1 deletion
This file was deleted.

observability/logging/logging_release_notes/cluster-logging-support.adoc

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="cluster-logging-support"]
3+
= Cluster logging support
34
include::_attributes/common-attributes.adoc[]
4-
= Support
55
:context: cluster-logging-support
66

77
toc::[]
88

99
include::snippets/logging-supported-config-snip.adoc[]
1010
include::snippets/logging-compatibility-snip.adoc[]
11-
include::snippets/log6x-loki-statement-snip.adoc[]
11+
include::snippets/logging-loki-statement-snip.adoc[]
1212

1313
{logging-uc} {for} is an opinionated collector and normalizer of application, infrastructure, and audit logs. It is intended to be used for forwarding logs to various supported systems.
1414

@@ -26,52 +26,18 @@ include::snippets/log6x-loki-statement-snip.adoc[]
2626

2727
The following table describes the supported {logging-uc} APIs.
2828

29-
.Loki API support states
30-
[cols="3",options="header"]
31-
|===
32-
|CustomResourceDefinition (CRD)
33-
|ApiVersion
34-
|Support state
29+
include::snippets/logging-api-support-states-snip.adoc[]
3530

36-
|LokiStack
37-
|lokistack.loki.grafana.com/v1
38-
|Supported from 5.5
39-
40-
|RulerConfig
41-
|rulerconfig.loki.grafana/v1
42-
|Supported from 5.7
43-
44-
|AlertingRule
45-
|alertingrule.loki.grafana/v1
46-
|Supported from 5.7
47-
48-
|RecordingRule
49-
|recordingrule.loki.grafana/v1
50-
|Supported from 5.7
51-
52-
|LogFileMetricExporter
53-
|LogFileMetricExporter.logging.openshift.io/v1alpha1
54-
|Supported from 5.8
55-
56-
|ClusterLogForwarder
57-
|clusterlogforwarder.logging.openshift.io/v1
58-
|Supported from 4.5.
59-
|===
60-
61-
include::modules/cluster-logging-maintenance-support-list.adoc[leveloffset=+1]
31+
include::modules/cluster-logging-maintenance-support-list-6x.adoc[leveloffset=+1]
6232
include::modules/unmanaged-operators.adoc[leveloffset=+1]
6333

64-
[id="support-exception-for-coo-logging-ui-plugin_{context}"]
65-
== Support exception for the Logging UI Plugin
66-
67-
Until the approaching General Availability (GA) release of the Cluster Observability Operator (COO), which is currently in link:https://access.redhat.com/support/offerings/techpreview/[Technology Preview] (TP), Red{nbsp}Hat provides support to customers who are using Logging 6.0 or later with the COO for its Logging UI Plugin on {product-title} 4.14 or later. This support exception is temporary as the COO includes several independent features, some of which are still TP features, but the Logging UI Plugin is ready for GA.
6834

6935
[id="cluster-logging-support-must-gather_{context}"]
70-
== Collecting logging data for Red Hat Support
36+
== Collecting {logging} data for Red Hat Support
7137

7238
When opening a support case, it is helpful to provide debugging information about your cluster to Red{nbsp}Hat Support.
7339

74-
You can use the xref:../../../support/gathering-cluster-data.adoc#gathering-cluster-data[must-gather tool] to collect diagnostic information for project-level resources, cluster-level resources, and each of the {logging} components.
40+
You can use the link:https://docs.openshift.com/container-platform/latest/support/gathering-cluster-data.html#gathering-cluster-data[must-gather tool] to collect diagnostic information for project-level resources, cluster-level resources, and each of the {logging} components.
7541
For prompt support, supply diagnostic information for both {product-title} and {logging}.
7642

7743
include::modules/cluster-logging-must-gather-about.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)