From 9a0fc72db05d85750577e4dd8abdd5b1873bc985 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Wed, 15 Feb 2023 16:40:42 -0500 Subject: [PATCH 1/7] update support wording --- .../3.4/content/userguide/platforms/environments.md | 7 ++++--- .../4.0/content/introduction/platforms/environments.md | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md index 557ed73192d..0e2b170c1a6 100644 --- a/documentation/3.4/content/userguide/platforms/environments.md +++ b/documentation/3.4/content/userguide/platforms/environments.md @@ -27,9 +27,10 @@ weight: 3 ### Overview -The operator supports a wide range of on-premises and cloud Kubernetes -offerings where Kubernetes is supplied for you or you set up Kubernetes -yourself. These include, but are not limited to: +The operator supports running on production grade Kubernetes environments, including on-premises, +cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. + +These include, but are not limited to: - WebLogic Server and the operator are supported on Oracle Cloud offerings, such as: - Oracle Cloud Infrastructure (OCI) diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index 3ba8babafe5..e3042cbc338 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -9,9 +9,10 @@ weight: 6 ### Overview -The operator supports a wide range of on-premises and cloud Kubernetes -offerings where Kubernetes is supplied for you or you set up Kubernetes -yourself. These include, but are not limited to: +The operator supports running on production grade Kubernetes environments, including on-premises, +cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. + +These include, but are not limited to: - WebLogic Server and the operator are supported on Oracle Cloud offerings, such as: - Oracle Cloud Infrastructure From d9f45f1e9a4bbdbacfc1c04056b389f751f85b8f Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 16 Feb 2023 15:04:55 -0500 Subject: [PATCH 2/7] update 4.0 platform support --- documentation/4.0/content/introduction/get-help.md | 2 +- .../4.0/content/introduction/platforms/environments.md | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/documentation/4.0/content/introduction/get-help.md b/documentation/4.0/content/introduction/get-help.md index 601f960fa2c..4793729a07a 100644 --- a/documentation/4.0/content/introduction/get-help.md +++ b/documentation/4.0/content/introduction/get-help.md @@ -25,4 +25,4 @@ to submit a [GitHub Issue](https://github.com/oracle/weblogic-kubernetes-operato WebLogic Kubernetes Operator project. All issues are public. ### Oracle support -To access Oracle support, see [WebLogic Server Certifications on Kubernetes in My Oracle Support Doc ID 2349228.1](https://support.oracle.com/epmos/faces/DocumentDisplay?_afrLoop=208317433106215&id=2349228.1&_afrWindowMode=0&_adf.ctrl-state=c2nhai8p3_4). +To access Oracle support, see [WebLogic Server Certifications on Kubernetes in My Oracle Support Doc ID 2349228.1](https://support.oracle.com/epmos/faces/DocumentDisplay?_afrLoop=466064245384567&id=2349228.1). diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index e3042cbc338..82d56e04ac5 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -9,12 +9,12 @@ weight: 6 ### Overview -The operator supports running on production grade Kubernetes environments, including on-premises, -cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. +The operator supports running on production-quality Kubernetes environments, including on-premises, +cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. These include, but are not limited to: -- WebLogic Server and the operator are supported on Oracle Cloud offerings, such as: +- WebLogic Server and the operator are certified on Oracle Cloud offerings, such as: - Oracle Cloud Infrastructure - Oracle Container Engine for Kubernetes (OKE) - Oracle Cloud Native Environment @@ -29,6 +29,9 @@ These include, but are not limited to: - VMWare Tanzu - VMware Tanzu Kubernetes Grid (TKG) +WebLogic Server and the operator are supported on production-quality Kubernetes clusters.  +Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1). + WebLogic Server and the operator are also supported on service offerings which deploy the WebLogic Server and the operator for you. These include: From 85718988c47733039be1d105c099bc029857192e Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 16 Feb 2023 15:38:47 -0500 Subject: [PATCH 3/7] edit 3.4 docs --- .../3.4/content/userguide/platforms/environments.md | 5 +++-- documentation/4.0/content/introduction/get-help.md | 2 +- .../4.0/content/introduction/platforms/environments.md | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md index 0e2b170c1a6..0c8ead961be 100644 --- a/documentation/3.4/content/userguide/platforms/environments.md +++ b/documentation/3.4/content/userguide/platforms/environments.md @@ -28,11 +28,12 @@ weight: 3 ### Overview The operator supports running on production grade Kubernetes environments, including on-premises, -cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. +cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. +Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1). These include, but are not limited to: -- WebLogic Server and the operator are supported on Oracle Cloud offerings, such as: +- WebLogic Server and the operator are certified on Oracle Cloud offerings, such as: - Oracle Cloud Infrastructure (OCI) - Oracle Container Engine for Kubernetes (OKE) - Oracle Linux Cloud Native Environment (OLCNE) diff --git a/documentation/4.0/content/introduction/get-help.md b/documentation/4.0/content/introduction/get-help.md index 4793729a07a..601f960fa2c 100644 --- a/documentation/4.0/content/introduction/get-help.md +++ b/documentation/4.0/content/introduction/get-help.md @@ -25,4 +25,4 @@ to submit a [GitHub Issue](https://github.com/oracle/weblogic-kubernetes-operato WebLogic Kubernetes Operator project. All issues are public. ### Oracle support -To access Oracle support, see [WebLogic Server Certifications on Kubernetes in My Oracle Support Doc ID 2349228.1](https://support.oracle.com/epmos/faces/DocumentDisplay?_afrLoop=466064245384567&id=2349228.1). +To access Oracle support, see [WebLogic Server Certifications on Kubernetes in My Oracle Support Doc ID 2349228.1](https://support.oracle.com/epmos/faces/DocumentDisplay?_afrLoop=208317433106215&id=2349228.1&_afrWindowMode=0&_adf.ctrl-state=c2nhai8p3_4). diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index 82d56e04ac5..55f4faaa05f 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -11,6 +11,7 @@ weight: 6 The operator supports running on production-quality Kubernetes environments, including on-premises, cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself. +Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1). These include, but are not limited to: @@ -29,8 +30,6 @@ These include, but are not limited to: - VMWare Tanzu - VMware Tanzu Kubernetes Grid (TKG) -WebLogic Server and the operator are supported on production-quality Kubernetes clusters.  -Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1). WebLogic Server and the operator are also supported on service offerings which deploy the WebLogic Server and the operator for you. These include: From 5ca234a67dd2139e01c3c11867d8200851fb7210 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 16 Feb 2023 16:51:34 -0500 Subject: [PATCH 4/7] update to concise wording --- .../userguide/platforms/environments.md | 16 +++++++--------- .../introduction/platforms/environments.md | 19 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md index 0c8ead961be..ee8ed53799f 100644 --- a/documentation/3.4/content/userguide/platforms/environments.md +++ b/documentation/3.4/content/userguide/platforms/environments.md @@ -33,14 +33,14 @@ Please refer to the support statement [Doc ID 2790123.1](https://support.oracle. These include, but are not limited to: -- WebLogic Server and the operator are certified on Oracle Cloud offerings, such as: +- Oracle Cloud certified offerings, such as: - Oracle Cloud Infrastructure (OCI) - Oracle Container Engine for Kubernetes (OKE) - - Oracle Linux Cloud Native Environment (OLCNE) + - Oracle Cloud Native Environment (OCNE) - Oracle Private Cloud Appliance (PCA) - Oracle Private Cloud at Customer (OPCC) -- WebLogic Server and the operator are certified on offerings, such as: +- Other certified offerings, such as: - Amazon Elastic Compute Cloud (EC2) - Microsoft Azure Platform - Microsoft Azure Kubernetes Service (AKS) @@ -48,13 +48,11 @@ These include, but are not limited to: - VMWare Tanzu - VMware Tanzu Kubernetes Grid (TKG) -WebLogic Server and the operator are also supported on service offerings which -deploy the WebLogic Server and the operator for you. These include: +- Offerings which deploy the WebLogic Server and the operator for you. These include: + - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) + - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) -- [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) -- [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) - -[Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. +- [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. **Notes:** diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index 55f4faaa05f..b7748f448ef 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -15,14 +15,14 @@ Please refer to the support statement [Doc ID 2790123.1](https://support.oracle. These include, but are not limited to: -- WebLogic Server and the operator are certified on Oracle Cloud offerings, such as: - - Oracle Cloud Infrastructure +- Oracle Cloud certified offerings, such as: + - Oracle Cloud Infrastructure (OCI) - Oracle Container Engine for Kubernetes (OKE) - - Oracle Cloud Native Environment + - Oracle Cloud Native Environment (OCNE) - Oracle Private Cloud Appliance (PCA) - Oracle Private Cloud at Customer (OPCC) -- WebLogic Server and the operator are certified on offerings, such as: +- Other certified offerings, such as: - Amazon Elastic Compute Cloud (EC2) - Microsoft Azure Platform - Microsoft Azure Kubernetes Service (AKS) @@ -30,14 +30,11 @@ These include, but are not limited to: - VMWare Tanzu - VMware Tanzu Kubernetes Grid (TKG) +- Offerings which deploy the WebLogic Server and the operator for you. These include: + - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) + - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) -WebLogic Server and the operator are also supported on service offerings which -deploy the WebLogic Server and the operator for you. These include: - -- [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) -- [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) - -[Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. +- [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. **Notes:** From 95d7f9d1c74e4071864eec7f93f71eb2e23f373e Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Fri, 17 Feb 2023 07:43:01 -0500 Subject: [PATCH 5/7] remove refs to Logging Export --- documentation/3.4/content/_index.md | 1 - .../3.4/content/userguide/managing-fmw-domains/_index.md | 4 ---- documentation/4.0/content/_index.md | 1 - .../content/managing-domains/managing-fmw-domains/_index.md | 4 ---- 4 files changed, 10 deletions(-) diff --git a/documentation/3.4/content/_index.md b/documentation/3.4/content/_index.md index ff826c2eb81..0d394a82fa4 100644 --- a/documentation/3.4/content/_index.md +++ b/documentation/3.4/content/_index.md @@ -61,6 +61,5 @@ See [Get help]({{< relref "userguide/introduction/get-help.md" >}}). * [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) * [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/) * [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter) -* [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter) * [WebLogic Remote Console](https://oracle.github.io/weblogic-remote-console/) * [WebLogic Kubernetes Toolkit UI](https://oracle.github.io/weblogic-toolkit-ui/) diff --git a/documentation/3.4/content/userguide/managing-fmw-domains/_index.md b/documentation/3.4/content/userguide/managing-fmw-domains/_index.md index 7caf1952de2..ad35e149356 100644 --- a/documentation/3.4/content/userguide/managing-fmw-domains/_index.md +++ b/documentation/3.4/content/userguide/managing-fmw-domains/_index.md @@ -45,10 +45,6 @@ For more information about the deployment of Oracle Fusion Middleware products o Compared to running a WebLogic Server domain in Kubernetes using the operator, the following limitations currently exist for FMW Infrastructure domains: -* The [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter) - currently supports WebLogic Server logs only. Other logs will not be sent to - Elasticsearch. Note, however, that you can use a sidecar with a log handling tool - like Logstash or Fluentd to get logs. * The [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter) currently supports the WebLogic MBean trees only. Support for JRF MBeans has not been added yet. diff --git a/documentation/4.0/content/_index.md b/documentation/4.0/content/_index.md index 7708e3c32a3..aefce52ea02 100644 --- a/documentation/4.0/content/_index.md +++ b/documentation/4.0/content/_index.md @@ -61,6 +61,5 @@ See [Get help]({{< relref "/introduction/get-help.md" >}}). * [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) * [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/) * [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter) -* [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter) * [WebLogic Remote Console](https://oracle.github.io/weblogic-remote-console/) * [WebLogic Kubernetes Toolkit UI](https://oracle.github.io/weblogic-toolkit-ui/) diff --git a/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md b/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md index 428668d6b9a..79478e86dbb 100644 --- a/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md +++ b/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md @@ -33,10 +33,6 @@ For more information about the deployment of Oracle Fusion Middleware products o Compared to running a WebLogic Server domain in Kubernetes using the operator, the following limitations currently exist for FMW Infrastructure domains: -* The [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter) - currently supports WebLogic Server logs only. Other logs will not be sent to - Elasticsearch. Note, however, that you can use a sidecar with a log handling tool - like Logstash or Fluentd to get logs. * The [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter) currently supports the WebLogic MBean trees only. Support for JRF MBeans has not been added yet. From 09f451ce9959bc80b954bbf4856813578b1b3deb Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Fri, 17 Feb 2023 10:08:28 -0500 Subject: [PATCH 6/7] Remove reference to EC2 --- documentation/3.4/content/userguide/platforms/environments.md | 1 - documentation/4.0/content/introduction/platforms/environments.md | 1 - 2 files changed, 2 deletions(-) diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md index ee8ed53799f..64f39d78afe 100644 --- a/documentation/3.4/content/userguide/platforms/environments.md +++ b/documentation/3.4/content/userguide/platforms/environments.md @@ -41,7 +41,6 @@ These include, but are not limited to: - Oracle Private Cloud at Customer (OPCC) - Other certified offerings, such as: - - Amazon Elastic Compute Cloud (EC2) - Microsoft Azure Platform - Microsoft Azure Kubernetes Service (AKS) - OpenShift Container Platform diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index b7748f448ef..c069947c438 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -23,7 +23,6 @@ These include, but are not limited to: - Oracle Private Cloud at Customer (OPCC) - Other certified offerings, such as: - - Amazon Elastic Compute Cloud (EC2) - Microsoft Azure Platform - Microsoft Azure Kubernetes Service (AKS) - OpenShift Container Platform From ff4445a690dcb47a8249090e0389a6873ca320d6 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Fri, 17 Feb 2023 10:30:52 -0500 Subject: [PATCH 7/7] remove bullet --- documentation/3.4/content/userguide/platforms/environments.md | 2 +- .../4.0/content/introduction/platforms/environments.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md index 64f39d78afe..1cfad4232d9 100644 --- a/documentation/3.4/content/userguide/platforms/environments.md +++ b/documentation/3.4/content/userguide/platforms/environments.md @@ -51,7 +51,7 @@ These include, but are not limited to: - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) -- [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. +[Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. **Notes:** diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md index c069947c438..9f1c2cf23b0 100644 --- a/documentation/4.0/content/introduction/platforms/environments.md +++ b/documentation/4.0/content/introduction/platforms/environments.md @@ -33,7 +33,7 @@ These include, but are not limited to: - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/) - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace) -- [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. +[Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported. **Notes:**