Merge branch 'openshift:main' into include-by-tag-suggestion

Author: libander

.s2i/httpd-cfg/01-commercial.conf

@@ -147,13 +147,15 @@ AddType text/vtt                            vtt
     RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70|3\.71|3\.72|3\.73|3\.74|4\.0|4\.1|4\.2|4\.3)/?$ /acs/$1/welcome/index.html [L,R=301]
     #redirect for 4.0 Manage vulneribility page
     RewriteRule ^(acs/(?:4\.0/)?)?operating/manage-vulnerabilities\.html$ /acs/4.0/operating/manage-vulnerabilities/vulnerability-management.html [NE,R=301]
+    #redirect for missing 4.3 page
+    RewriteRule ^(acs/(?:4\.3/)?)?installing/acs-installation-platforms\.html$ /acs/4.3/installing/acs-high-level-overview.html [NE,R=301]
 
       # remove aro docs to just the welcome page
     RewriteRule aro/4/(?!welcome)(.*)?$ /container-platform/latest/$1 [L,R=301]
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
-    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.14/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.15/$2 [NE,R=301]
     RewriteRule ^(online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|latest)/?(.*)$ /$1/pro/$3 [NE,R=301]
 
     # Release notes redirects
@@ -176,6 +178,9 @@ AddType text/vtt                            vtt
     RewriteRule ^(rosa|dedicated)/logging/config/cluster-logging-moving-nodes.html /$1/logging/scheduling_resources/logging-node-selectors.html [NE,R=302]
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/logging/config/cluster-logging-log-store.html /container-platform/$1/logging/log_storage/logging-config-es-store.html [NE,R=302]
 
+    # Redirects for observability rework per https://github.com/openshift/openshift-docs/pull/71248
+    RewriteRule ^container-platform/4.14/power_monitoring/(.*)$ /container-platform/4.14/observability/power_monitoring/$1 [NE,R=302,L]
+
     # Redirect for log collection forwarding per https://github.com/openshift/openshift-docs/pull/64406
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/config/cluster-logging-collector.html /container-platform/$1/logging/log_collection_forwarding/cluster-logging-collector.html [NE,R=302]
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/cluster-logging-eventrouter.html /container-platform/$1/logging/log_collection_forwarding/cluster-logging-eventrouter.html [NE,R=302]
@@ -224,22 +229,22 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12)/serverless/develop/serverless-traffic-management.html /container-platform/$1/serverless/knative-serving/traffic-splitting/traffic-splitting-overview.html [NE,R=302]
 
 
-    # redirect latest to 1.31
+    # redirect latest to 1.32
     RewriteRule ^serverless/?$ /serverless/latest [R=302]
-    RewriteRule ^serverless/latest/?(.*)$ /serverless/1\.31/$1 [NE,R=302]
+    RewriteRule ^serverless/latest/?(.*)$ /serverless/1\.32/$1 [NE,R=302]
 
     # redirect top-level without filespec to the about file
-    RewriteRule ^serverless/(1\.28|1\.29|1\.30|1\.31)/?$ /serverless/$1/about/about-serverless.html [L,R=302]
+    RewriteRule ^serverless/(1\.28|1\.29|1\.30|1\.31|1\.32)/?$ /serverless/$1/about/about-serverless.html [L,R=302]
 
     # redirect rel notes
-    RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/serverless/serverless-release-notes.html$ /serverless/1.31/about/serverless-release-notes.html [L,R=302]
-    RewriteRule ^(rosa|dedicated)/serverless/serverless-release-notes.html$ /serverless/1.31/about/serverless-release-notes.html [L,R=302]
+    RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/serverless/serverless-release-notes.html$ /serverless/1.32/about/serverless-release-notes.html [L,R=302]
+    RewriteRule ^(rosa|dedicated)/serverless/serverless-release-notes.html$ /serverless/1.32/about/serverless-release-notes.html [L,R=302]
 
     # redirect any links to existing OCP embedded content to standalone equivalent
-    RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/serverless/?(.*)$ /serverless/1.31/$2  [L,R=302]
+    RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/serverless/?(.*)$ /serverless/1.32/$2  [L,R=302]
 
     # redirect any links to existing ROSA/Dedicated embedded content to standalone equivalent
-    RewriteRule ^(rosa|dedicated)/serverless/?(.*)$ /serverless/1.31/$2  [L,R=302]
+    RewriteRule ^(rosa|dedicated)/serverless/?(.*)$ /serverless/1.32/$2  [L,R=302]
 
     # redirect builds latest to 1.0
     RewriteRule ^builds/?$ /builds/latest [R=302]
@@ -249,7 +254,7 @@ AddType text/vtt                            vtt
     RewriteRule ^builds/(1\.0)/?$ /builds/$1/about/overview-openshift-builds.html  [L,R=302]
 
     # Builds using Shipwright landing page
-    RewriteRule ^container-platform/(4\.14|4\.15)/cicd/builds_using_shipwright/overview-openshift-builds.html /builds/latest/about/overview-openshift-builds.html  [L,R=302]
+    RewriteRule ^container-platform/(4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/builds_using_shipwright/overview-openshift-builds.html /builds/latest/about/overview-openshift-builds.html  [L,R=302]
 
     # redirect gitops latest to 1.11
     RewriteRule ^gitops/?$ /gitops/latest [R=302]
@@ -259,7 +264,7 @@ AddType text/vtt                            vtt
     RewriteRule ^gitops/(1\.8|1\.9|1\.10|1\.11)/?$ /gitops/$1/understanding_openshift_gitops/about-redhat-openshift-gitops.html  [L,R=302]
 
     # GitOps landing page
-    RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/about-redhat-openshift-gitops.html /gitops/latest/understanding_openshift_gitops/about-redhat-openshift-gitops.html  [L,R=302]
+    RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/about-redhat-openshift-gitops.html /gitops/latest/understanding_openshift_gitops/about-redhat-openshift-gitops.html  [L,R=302]
 
     # redirect any links to existing OCP embedded content to standalone equivalent for each assembly
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/gitops-release-notes.html/ /gitops/latest/release_notes/gitops-release-notes.html  [L,R=302]
@@ -287,11 +292,11 @@ AddType text/vtt                            vtt
 
     # Pipelines handling unversioned and latest links
     RewriteRule ^pipelines/?$ /pipelines/latest [R=302]
-    RewriteRule ^pipelines/latest/?(.*)$ /pipelines/1\.13/$1 [NE,R=302]
+    RewriteRule ^pipelines/latest/?(.*)$ /pipelines/1\.14/$1 [NE,R=302]
 
     # Pipelines landing page
 
-    RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14)/cicd/pipelines/about-pipelines.html /pipelines/latest/about/about-pipelines.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/pipelines/about-pipelines.html /pipelines/latest/about/about-pipelines.html [NE,R=302]
 
     # redirect links to existing OCP embedded Pipelines content to standalone equivalent for each assembly
     # except the one recently renamed for now
@@ -315,7 +320,7 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/cicd/pipelines/securing-webhooks-with-event-listeners.html /pipelines/latest/secure/securing-webhooks-with-event-listeners.html [L,R=302]
 
     # redirect top-level without filespec to the about file
-    RewriteRule ^pipelines/(1\.10|1\.11|1\.12|1\.13)/?$ /pipelines/$1/about/understanding-openshift-pipelines.html [L,R=302]
+    RewriteRule ^pipelines/(1\.10|1\.11|1\.12|1\.13|1\.14)/?$ /pipelines/$1/about/understanding-openshift-pipelines.html [L,R=302]
 
 
     # OSD redirects for new content
@@ -431,22 +436,22 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(4\.4|4\.5)/authentication/(allowing-javascript-access-api-server|encrypting-etcd|certificate-types-descriptions)\.html$ /container-platform/$1/security/$2\.html [NE,R=301]
 
 
-    # The following rule prevents an infinite redirect loop when browsing to /container-platform/4.14/virt/about_virt/about-virt.html
-    # RewriteRule ^container-platform/4\.14/virt/about_virt/about-virt.html$ - [L]
+    # The following rule prevents an infinite redirect loop when browsing to /container-platform/4.15/virt/about_virt/about-virt.html
+    # RewriteRule ^container-platform/4\.15/virt/about_virt/about-virt.html$ - [L]
 
     # OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301.
     # When uncommented, this redirects all `virt` directory traffic to the about-virt page.
     # Pay mind to the redirect directly above this which prevents redirect loops.
     # To activate the redirects, uncomment the next and previous lines and update the version number to the pending release.
 
-    # RewriteRule container-platform/4\.14/virt/(?!about-virt\.html)(.+)$ /container-platform/4.14/virt/about_virt/about-virt.html [NE,R=302]
+    # RewriteRule container-platform/4\.15/virt/(?!about-virt\.html)(.+)$ /container-platform/4.15/virt/about_virt/about-virt.html [NE,R=302]
 
 
     # Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301.
     # When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page.
     # To activate the redirects, uncomment the next line and update the version number to the pending release.
-    # RewriteRule container-platform/4\.14/windows_containers/(?!index\.html)(.+)$ /container-platform/4.14/windows_containers/index.html [NE,R=302]
-    # RewriteRule ^container-platform/4\.14/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /container-platform/4.14/windows_containers/index.html [NE,R=302]
+    # RewriteRule container-platform/4\.15/windows_containers/(?!index\.html)(.+)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
+    # RewriteRule ^container-platform/4\.15/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
 
     # Serverless Redirects
     RewriteRule container-platform/(4\.5|4\.6)/serverless/knative_eventing/(serverless-subscriptions\.html|serverless-channels\.html|serverless-subscriptions\.html) /container-platform/$1/serverless/event_workflows/serverless-channels.html [NE,R=301]
@@ -588,7 +593,7 @@ AddType text/vtt                            vtt
     RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
-    RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14)/?$ /container-platform/$1/welcome/index.html [L,R=301]
+    RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15)/?$ /container-platform/$1/welcome/index.html [L,R=301]
     RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
 
 

.s2i/httpd-cfg/01-community.conf

@@ -159,20 +159,20 @@ AddType text/vtt                            vtt
     RewriteRule ^latest/install_config/upgrades\.html(.*)$ /latest/install_config/upgrading/index.html$1 [NE,R=301]
     RewriteRule ^latest/install_config/upgrading/(.*)$ /latest/upgrading/$1 [NE,R=301]
 
-    # The following rule prevents an infinite redirect loop when browsing to /(latest|4\.14)/virt/about_virt/about-virt.html
-    # RewriteRule ^(latest|4\.14)/virt/about_virt/about-virt.html$ - [L]
+    # The following rule prevents an infinite redirect loop when browsing to /(latest|4\.15)/virt/about_virt/about-virt.html
+    # RewriteRule ^(latest|4\.15)/virt/about_virt/about-virt.html$ - [L]
 
     # OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301.
     # When uncommented, this redirects all `virt` directory traffic to the about-virt page.
     # Pay mind to the redirect directly above this which prevents redirect loops.
     # To activate the redirects, uncomment the next and previous lines and update the version number to the pending release.
-    # RewriteRule ^(latest|4\.14)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302]
+    # RewriteRule ^(latest|4\.15)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302]
 
     # Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301.
     # When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page.
     # To activate the redirects, uncomment the next line and update the version number to the pending release.
-    # RewriteRule ^(latest|4\.14)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
-    # RewriteRule ^(latest|4\.14)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
+    # RewriteRule ^(latest|4\.15)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
+    # RewriteRule ^(latest|4\.15)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
 
   </Directory>
 </IfModule>

.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt

@@ -2,7 +2,6 @@
 # Add terms that have a corresponding incorrectly capitalized form to reject.txt.
 # URL slugs
 (.*/)+
-(?<!.*-)operator
 [Ff]ronthaul
 [Mm]idhaul
 [Pp]assthrough
@@ -25,7 +24,6 @@ MBps
 Mellanox
 MetalLB
 NICs?
-Operators?
 pmc
 ubxtool
 VFs?

.vale/styles/config/vocabularies/OpenShiftDocs/reject.txt

@@ -1,7 +1,6 @@
 # Regex terms added to reject.txt are highlighted as errors by the Vale linter and override RedHat Vale rules.
 # Add terms that have a corresponding correctly capitalized form to accept.txt.
 
-(?<!.*-)operators
 [Dd]eployment [Cc]onfigs?
 [Dd]eployment [Cc]onfigurations?
 [Oo]peratorize

.vale/templates/bot-comment-output.tmpl

@@ -0,0 +1,49 @@
+{{- /* Modify Vale's output https://docs.errata.ai/vale/cli#--output */ -}}
+
+{{- /* Keep track of our various counts */ -}}
+
+{{- $e := 0 -}}
+{{- $w := 0 -}}
+{{- $s := 0 -}}
+
+{{- /* Range over the linted files */ -}}
+
+[
+{{- range $jdx, $file := .Files -}}
+
+{{- $path := .Path -}}
+
+{{- /* Range over the file's alerts */ -}}
+
+{{- if $jdx -}},{{- end -}}
+{{- range $idx, $a := .Alerts -}}
+
+{{- $error := "" -}}
+{{- if eq .Severity "error" -}}
+    {{- $error = "error" -}}
+    {{- $e = add1 $e  -}}
+{{- else if eq .Severity "warning" -}}
+    {{- $error = "warning" -}}
+    {{- $w = add1 $w -}}
+{{- else -}}
+    {{- $error = "suggestion" -}}
+    {{- $s = add1 $s -}}
+{{- end}}
+
+{{- /* Variables setup */ -}}
+
+{{- $loc := printf "%d" .Line -}}
+{{- $check := printf "%s" .Check -}}
+{{- $message := printf "%s" .Message -}}
+{{- if $idx -}},{{- end -}}
+
+{{- /* Output */ -}}
+
+  {
+    "body": "🤖 **[{{ $error }}] {{$check}}**: {{ $message }}",
+    "path": "{{ $path }}",
+    "line": {{ $loc }}
+  }
+{{end -}}
+{{end -}}
+]

CONTRIBUTING.adoc

@@ -0,0 +1,27 @@
+= Contributing to OpenShift documentation
+// NOTE: This text mirrors the "Contributing to OpenShift documentation" section in ./README.adoc
+// If you update one, update both.
+
+If you are interested in contributing to OpenShift technical documentation, you can view all our link:./contributing_to_docs[resources] that will help you get set up and provide more information.
+
+
+The following table provides quick links to help you get started.
+
+[options="header"]
+|===
+
+|Question |Link
+
+|I'm interested, how do I contribute?
+|See the link:/contributing_to_docs/contributing.adoc[contributing] topic to learn more about this repository and how you can contribute.
+
+|Are there any basic guidelines to help me?
+|The link:/contributing_to_docs/doc_guidelines.adoc[documentation guidelines] topic provides some basic guidelines to help us keep our content consistent, and includes other style information.
+
+|How do I set up my workstation?
+|See the link:/contributing_to_docs/tools_and_setup.adoc[tools and setup] topic to set up your workstation.
+
+|How do I edit an existing topic, or create new content?
+|See the link:/contributing_to_docs/create_or_edit_content.adoc[create or edit content] topic to get started.
+
+|===

OWNERS

@@ -5,4 +5,4 @@
 reviewers:
 - merge-rights
 approvers:
-- merge-rights
+- approve-rights

OWNERS-ALIASES

@@ -26,3 +26,10 @@ aliases:
   - sjhala-ccs
   - snarayan-redhat
   - Srivaralakshmi
+  approve-rights:
+  - adellape
+  - bergerhoffer
+  - JoeAldinger
+  - kalexand-rh
+  - ousleyp
+  - sjhala-ccs

README.adoc

@@ -10,6 +10,9 @@ All OpenShift documentation is sourced in https://asciidoc.org/[AsciiDoc] and tr
 The documentation published from these source files can be viewed at https://docs.openshift.com.
 
 == Contributing to OpenShift documentation
+// NOTE: This text is mirrored in ./CONTRIBUTING.adoc
+// If you update one, update both.
+
 If you are interested in contributing to OpenShift technical documentation, you can view all our link:./contributing_to_docs[resources] that will help you get set up and provide more information.
 
 

_attributes/common-attributes.adoc

@@ -118,18 +118,18 @@ endif::[]
 //distributed tracing
 :DTProductName: Red Hat OpenShift distributed tracing platform
 :DTShortName: distributed tracing platform
-:DTProductVersion: 3.0
+:DTProductVersion: 3.1
 :JaegerName: Red Hat OpenShift distributed tracing platform (Jaeger)
 :JaegerShortName: distributed tracing platform (Jaeger)
-:JaegerVersion: 1.51.0
+:JaegerVersion: 1.53.0
 :OTELName: Red Hat build of OpenTelemetry
 :OTELShortName: Red Hat build of OpenTelemetry
 :OTELOperator: Red Hat build of OpenTelemetry Operator
-:OTELVersion: 0.89.0
+:OTELVersion: 0.93.0
 :TempoName: Red Hat OpenShift distributed tracing platform (Tempo)
 :TempoShortName: distributed tracing platform (Tempo)
 :TempoOperator: Tempo Operator
-:TempoVersion: 2.3.0
+:TempoVersion: 2.3.1
 //telco
 ifdef::telco-ran[]
 :rds: telco RAN DU
@@ -168,8 +168,8 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.4.5
-:MaistraVersion: 2.4
+:SMProductVersion: 2.5
+:MaistraVersion: 2.5
 //Service Mesh v1
 :SMProductVersion1x: 1.1.18.2
 //Windows containers
@@ -180,6 +180,8 @@ endif::[]
 :quay: Red Hat Quay
 :sno: single-node OpenShift
 :sno-caps: Single-node OpenShift
+:sno-okd: single-node OKD
+:sno-caps-okd: Single-node OKD
 //TALO and Redfish events Operators
 :cgu-operator-first: Topology Aware Lifecycle Manager (TALM)
 :cgu-operator-full: Topology Aware Lifecycle Manager
@@ -196,7 +198,7 @@ endif::[]
 //:openshift-networking: OKD Networking
 //endif::[]
 // logical volume manager storage
-:lvms-first: Logical volume manager storage (LVM Storage)
+:lvms-first: Logical Volume Manager (LVM) Storage 
 :lvms: LVM Storage
 //Operator SDK version
 :osdk_ver: 1.31.0