Skip to content

Commit 27ce004

Browse files
mletaliemletalie
authored
Merge pull request #99482 from openshift-cherrypick-robot/cherry-pick-99399-to-enterprise-4.20
[enterprise-4.20] [OSDOCS-16327] Reorg of Logging in OSD and ROSA docs
2 parents addb708 + ad19aae commit 27ce004

File tree

3 files changed

+108
-105
lines changed

3 files changed

+108
-105
lines changed

‎_topic_maps/_topic_map_osd.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,9 +1183,12 @@ Topics:
11831183
File: troubleshooting-monitoring-issues
11841184
- Name: Config map reference for the Cluster Monitoring Operator
11851185
File: config-map-reference-for-the-cluster-monitoring-operator
1186-
#- Name: Logging
1187-
# Dir: logging
1188-
# Distros: openshift-dedicated
1186+
- Name: Logging
1187+
Dir: logging
1188+
Distros: openshift-dedicated
1189+
Topics:
1190+
- Name: About Logging
1191+
File: about-logging
11891192
# Topics:
11901193
# - Name: Release notes
11911194
# Dir: logging_release_notes

‎_topic_maps/_topic_map_rosa.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,57 +1518,57 @@ Topics:
15181518
Topics:
15191519
- Name: About Logging
15201520
File: about-logging
1521-
- Name: Logging 6.2
1522-
Dir: logging-6.2
1523-
Topics:
1524-
- Name: Support
1525-
File: log62-cluster-logging-support
1526-
- Name: Release notes
1527-
File: log6x-release-notes-6.2
1528-
- Name: About logging 6.2
1529-
File: log6x-about-6.2
1530-
- Name: Configuring log forwarding
1531-
File: log6x-clf-6.2
1532-
- Name: Configuring the logging collector
1533-
File: 6x-cluster-logging-collector-6.2
1534-
- Name: Configuring LokiStack storage
1535-
File: log6x-loki-6.2
1536-
- Name: Configuring LokiStack for OTLP
1537-
File: log6x-configuring-lokistack-otlp-6.2
1538-
- Name: Visualization for logging
1539-
File: log6x-visual-6.2
1540-
- Name: Logging 6.1
1541-
Dir: logging-6.1
1542-
Topics:
1543-
- Name: Release notes
1544-
File: log6x-release-notes-6.1
1545-
- Name: About logging 6.1
1546-
File: log6x-about-6.1
1547-
- Name: Configuring log forwarding
1548-
File: log6x-clf-6.1
1549-
- Name: Configuring LokiStack storage
1550-
File: log6x-loki-6.1
1551-
- Name: Configuring LokiStack for OTLP
1552-
File: log6x-configuring-lokistack-otlp-6.1
1553-
- Name: OpenTelemetry data model
1554-
File: log6x-opentelemetry-data-model-6.1
1555-
- Name: Visualization for logging
1556-
File: log6x-visual-6.1
1557-
- Name: Logging 6.0
1558-
Dir: logging-6.0
1559-
Topics:
1560-
- Name: Release notes
1561-
File: log6x-release-notes
1562-
- Name: About logging 6.0
1563-
File: log6x-about
1564-
- Name: Upgrading to Logging 6.0
1565-
File: log6x-upgrading-to-6
1566-
- Name: Configuring log forwarding
1567-
File: log6x-clf
1568-
- Name: Configuring LokiStack storage
1569-
File: log6x-loki
1570-
- Name: Visualization for logging
1571-
File: log6x-visual
1521+
# - Name: Logging 6.2
1522+
# Dir: logging-6.2
1523+
# Topics:
1524+
# - Name: Support
1525+
# File: log62-cluster-logging-support
1526+
# - Name: Release notes
1527+
# File: log6x-release-notes-6.2
1528+
# - Name: About logging 6.2
1529+
# File: log6x-about-6.2
1530+
# - Name: Configuring log forwarding
1531+
# File: log6x-clf-6.2
1532+
# - Name: Configuring the logging collector
1533+
# File: 6x-cluster-logging-collector-6.2
1534+
# - Name: Configuring LokiStack storage
1535+
# File: log6x-loki-6.2
1536+
# - Name: Configuring LokiStack for OTLP
1537+
# File: log6x-configuring-lokistack-otlp-6.2
1538+
# - Name: Visualization for logging
1539+
# File: log6x-visual-6.2
1540+
# - Name: Logging 6.1
1541+
# Dir: logging-6.1
1542+
# Topics:
1543+
# - Name: Release notes
1544+
# File: log6x-release-notes-6.1
1545+
# - Name: About logging 6.1
1546+
# File: log6x-about-6.1
1547+
# - Name: Configuring log forwarding
1548+
# File: log6x-clf-6.1
1549+
# - Name: Configuring LokiStack storage
1550+
# File: log6x-loki-6.1
1551+
# - Name: Configuring LokiStack for OTLP
1552+
# File: log6x-configuring-lokistack-otlp-6.1
1553+
# - Name: OpenTelemetry data model
1554+
# File: log6x-opentelemetry-data-model-6.1
1555+
# - Name: Visualization for logging
1556+
# File: log6x-visual-6.1
1557+
# - Name: Logging 6.0
1558+
# Dir: logging-6.0
1559+
# Topics:
1560+
# - Name: Release notes
1561+
# File: log6x-release-notes
1562+
# - Name: About logging 6.0
1563+
# File: log6x-about
1564+
# - Name: Upgrading to Logging 6.0
1565+
# File: log6x-upgrading-to-6
1566+
# - Name: Configuring log forwarding
1567+
# File: log6x-clf
1568+
# - Name: Configuring LokiStack storage
1569+
# File: log6x-loki
1570+
# - Name: Visualization for logging
1571+
# File: log6x-visual
15721572
---
15731573
Name: Service Mesh
15741574
Dir: service_mesh

‎_topic_maps/_topic_map_rosa_hcp.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,57 +1349,57 @@ Topics:
13491349
Topics:
13501350
- Name: About Logging
13511351
File: about-logging
1352-
- Name: Logging 6.2
1353-
Dir: logging-6.2
1354-
Topics:
1355-
- Name: Support
1356-
File: log62-cluster-logging-support
1357-
- Name: Release notes
1358-
File: log6x-release-notes-6.2
1359-
- Name: About logging 6.2
1360-
File: log6x-about-6.2
1361-
- Name: Configuring log forwarding
1362-
File: log6x-clf-6.2
1363-
- Name: Configuring the logging collector
1364-
File: 6x-cluster-logging-collector-6.2
1365-
- Name: Configuring LokiStack storage
1366-
File: log6x-loki-6.2
1367-
- Name: Configuring LokiStack for OTLP
1368-
File: log6x-configuring-lokistack-otlp-6.2
1369-
- Name: Visualization for logging
1370-
File: log6x-visual-6.2
1371-
- Name: Logging 6.1
1372-
Dir: logging-6.1
1373-
Topics:
1374-
- Name: Release notes
1375-
File: log6x-release-notes-6.1
1376-
- Name: About logging 6.1
1377-
File: log6x-about-6.1
1378-
- Name: Configuring log forwarding
1379-
File: log6x-clf-6.1
1380-
- Name: Configuring LokiStack storage
1381-
File: log6x-loki-6.1
1382-
- Name: Configuring LokiStack for OTLP
1383-
File: log6x-configuring-lokistack-otlp-6.1
1384-
- Name: OpenTelemetry data model
1385-
File: log6x-opentelemetry-data-model-6.1
1386-
- Name: Visualization for logging
1387-
File: log6x-visual-6.1
1388-
- Name: Logging 6.0
1389-
Dir: logging-6.0
1390-
Topics:
1391-
- Name: Release notes
1392-
File: log6x-release-notes
1393-
- Name: About logging 6.0
1394-
File: log6x-about
1395-
- Name: Upgrading to Logging 6.0
1396-
File: log6x-upgrading-to-6
1397-
- Name: Configuring log forwarding
1398-
File: log6x-clf
1399-
- Name: Configuring LokiStack storage
1400-
File: log6x-loki
1401-
- Name: Visualization for logging
1402-
File: log6x-visual
1352+
# - Name: Logging 6.2
1353+
# Dir: logging-6.2
1354+
# Topics:
1355+
# - Name: Support
1356+
# File: log62-cluster-logging-support
1357+
# - Name: Release notes
1358+
# File: log6x-release-notes-6.2
1359+
# - Name: About logging 6.2
1360+
# File: log6x-about-6.2
1361+
# - Name: Configuring log forwarding
1362+
# File: log6x-clf-6.2
1363+
# - Name: Configuring the logging collector
1364+
# File: 6x-cluster-logging-collector-6.2
1365+
# - Name: Configuring LokiStack storage
1366+
# File: log6x-loki-6.2
1367+
# - Name: Configuring LokiStack for OTLP
1368+
# File: log6x-configuring-lokistack-otlp-6.2
1369+
# - Name: Visualization for logging
1370+
# File: log6x-visual-6.2
1371+
# - Name: Logging 6.1
1372+
# Dir: logging-6.1
1373+
# Topics:
1374+
# - Name: Release notes
1375+
# File: log6x-release-notes-6.1
1376+
# - Name: About logging 6.1
1377+
# File: log6x-about-6.1
1378+
# - Name: Configuring log forwarding
1379+
# File: log6x-clf-6.1
1380+
# - Name: Configuring LokiStack storage
1381+
# File: log6x-loki-6.1
1382+
# - Name: Configuring LokiStack for OTLP
1383+
# File: log6x-configuring-lokistack-otlp-6.1
1384+
# - Name: OpenTelemetry data model
1385+
# File: log6x-opentelemetry-data-model-6.1
1386+
# - Name: Visualization for logging
1387+
# File: log6x-visual-6.1
1388+
# - Name: Logging 6.0
1389+
# Dir: logging-6.0
1390+
# Topics:
1391+
# - Name: Release notes
1392+
# File: log6x-release-notes
1393+
# - Name: About logging 6.0
1394+
# File: log6x-about
1395+
# - Name: Upgrading to Logging 6.0
1396+
# File: log6x-upgrading-to-6
1397+
# - Name: Configuring log forwarding
1398+
# File: log6x-clf
1399+
# - Name: Configuring LokiStack storage
1400+
# File: log6x-loki
1401+
# - Name: Visualization for logging
1402+
# File: log6x-visual
14031403
---
14041404
Name: Service Mesh
14051405
Dir: service_mesh

0 commit comments

Comments
 (0)