Skip to content

Commit bcb8801

Browse files
Merge branch 'main' into atp-operator-nodejs-repo-create
2 parents 6f8a1e9 + b300ea7 commit bcb8801

File tree

5 files changed

+48
-25
lines changed

5 files changed

+48
-25
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Copyright (c) 2024 Oracle and/or its affiliates.
2+
3+
The Universal Permissive License (UPL), Version 1.0
4+
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
12+
13+
(a) the Software, and
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
17+
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
23+
24+
This license is subject to the following condition:
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
28+
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.

ai-and-app-modernisation/ai-services/generative-ai-service/vision-genai/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ This integrated approach combines the strength of OCI AI Vision and OCI Generati
88

99
Reviewed: 21.02.2024
1010

11-
<img src="./files/AIVisionApp.jpg>"</img>
11+
<img src="./files/AIVisionApp.jpg"></img>
12+
1213

1314
# Prerequisites
1415

@@ -37,7 +38,7 @@ Before getting started, make sure you have access to these services:
3738
5. Summarization Process:
3839
- OCI Generative AI Service generates text using the keywords received from OCI Vision service, to create a concise summary of the image.
3940

40-
<img src="./files/AIVisionAppArch.svg></img>
41+
<img src="./files/AIVisionAppArch.svg"></img>
4142

4243
# Application Flow in Detail (VBCS, OIC, OCI Vision, OCI Generative AI Service)
4344

cloud-architecture/oracle-apps-erp/peoplesoft-migration/migration-template/files/PeopleSoftMigrationTemplate.md

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ External users access PeopleSoft using the URL https://`<External LB URL:port>`.
303303

304304
*Reference:*
305305

306-
\[SSL in OCI\] (https://www.ateam-oracle.com/post/load-balancing-ssl-traffic-in-oci)
306+
[SSL in OCI](https://www.ateam-oracle.com/post/load-balancing-ssl-traffic-in-oci)
307307

308308
### Workload Monitoring
309309

@@ -477,29 +477,19 @@ In the **following sections** we are describing the **Solution Design Diagrams f
477477

478478
*[The Oracle Cloud Notation, OCI Architecture Diagram Toolkits](https://docs.oracle.com/en-us/iaas/Content/General/Reference/graphicsfordiagrams.htm)*
479479

480-
```{=tex}
481-
\pagebreak
482-
```
480+
483481
![Future State Deployment Diagram - PeopleSoft Workload Multi-AD, DR Design Diagram](images/MultiADDR-DeploymentDiagram-V3.pdf)
484482

485-
```{=tex}
486-
\pagebreak
487-
```
483+
488484
![Future State Deployment Diagram - PeopleSoft Workload Multi-AD, Non-Production Design Diagram](images/SingleADProd-DeploymentDiagram-V3.pdf)
489485

490-
```{=tex}
491-
\pagebreak
492-
```
486+
493487
![Future State Deployment Diagram - PeopleSoft Workload Single AD, Customer Use case Example -1](images/SingleADCustUseCase1-V3.pdf)
494488

495-
```{=tex}
496-
\pagebreak
497-
```
489+
498490
![Future State Deployment Diagram - PeopleSoft Workload Single AD, Customer Use case Example -2](images/SingleADCustUseCase2-V3.pdf)
499491

500-
```{=tex}
501-
\pagebreak
502-
```
492+
503493
## Solutions Considerations
504494

505495
*Guide:*
@@ -530,18 +520,13 @@ Please refer to the following high level MAA diagrams for PepleSoft workload.
530520

531521
![PeopleSoft Workload MAA High Level Design Diagram (With WAF for Internet connection)](images/PeopleSoftHighLevelMAA-WithWAF-V3.pdf)
532522

533-
```{=tex}
534-
\pagebreak
535-
```
523+
536524
![PeopleSoft Workload MAA High Level Design Diagram](images/PeopleSoftHighLevelMAA-V3.pdf)
537525

538526
*Reference:*
539527

540528
[HA Reference for PeopleSoft](https://www.oracle.com/a/tech/docs/psft-maa-exacs-tech-brief.pdf)
541529

542-
```{=tex}
543-
\pagebreak
544-
```
545530
#### Backup and Recovery
546531

547532
*Guide:*
@@ -697,9 +682,11 @@ OCI networking and connectivity products and services enable customers to manage
697682

698683
*Example:*
699684

685+
Please note this example is indicative only.
686+
700687
A sample sizing of the PeopleSoft workload is reflected in the diagram below for reference purposes:
701688

702-
![OCI - Bill of Materials](images/PeopleSoft-Sizing-Template-V3.pdf)
689+
![OCI - Bill of Materials](images/PeopleSoft-Sizing-Template-External.pdf)
703690

704691
# Annex
705692

0 commit comments

Comments
 (0)