Skip to content

Commit

Permalink
Merge branch 'main' into patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
marco-porru authored Dec 19, 2024
2 parents 2cb91a3 + cdd15a6 commit f063d96
Show file tree
Hide file tree
Showing 41 changed files with 515 additions and 405 deletions.
20 changes: 4 additions & 16 deletions docs/10-concepts/cloud-foundry-environment-9c7092c.md
Original file line number Diff line number Diff line change
Expand Up @@ -444,19 +444,7 @@ The diagram below shows how the service plans listed in the [SAP Discovery Cente

This image is interactive. Hover over rectangles in the diagram to see the description. Choose the highlighted areas for more information.

![A diagram depicting the relationship between service plans in the SAP Discovery Center, service plans in the SAP BTP
cockpit, environment plans in the SAP BTP
cockpit, and the metric GB Memory.
Consumption-based
commercial model, line 1 of 2: Service Plan (SAP Discovery Center) - Standard; Service Plan (SAP BTP Cockpit) - not applicable; Environment Plan (SAP BTP Cockpit) - standard; Metrics - GB
Memory; SKU - 8008837. Consumption-based commercial model, line 2 of 2: Service Plan
(SAP Discovery Center) - Free; Service Plan (SAP BTP Cockpit) - free (Environment); Environment Plan (SAP
BTP Cockpit) - free; Metrics - GB Memory; SKU - 8011138. Subscription-based commercial model, line 1 of 1: Service Plan (SAP
Discovery Center) - Standard; Service Plan (SAP BTP Cockpit)
- MEMORY, the plan is associated with a standalone service Cloud
Foundry Runtime (technical name: APPLICATION_RUNTIME); Environment
Plan (SAP BTP Cockpit) - standard; Metrics - GB
Memory; SKU - 8008837.](images/SAP_BTP_Cloud_Foundry_Runtime_Commercial_Information_Plans_-_2024_V2_67db7c4.png)
![A diagram depicting the relationship between service plans in the SAP Discovery Center, service plans in the SAP BTP cockpit, environment plans in the SAP BTP cockpit, and the metric GB Memory. Consumption-based commercial model, line 1 of 2: Service Plan (SAP Discovery Center) - Standard; Service Plan (SAP BTP Cockpit) - not applicable; Environment Plan (SAP BTP Cockpit) - standard; Metrics - GB Memory; SKU - 8008837. Consumption-based commercial model, line 2 of 2: Service Plan (SAP Discovery Center) - Free; Service Plan (SAP BTP Cockpit) - free (Environment); Environment Plan (SAP BTP Cockpit) - free; Metrics - GB Memory; SKU - 8011138. Subscription-based commercial model, line 1 of 1: Service Plan (SAP Discovery Center) - Standard; Service Plan (SAP BTP Cockpit) - MEMORY, the plan is associated with a standalone service Cloud Foundry Runtime (technical name: APPLICATION_RUNTIME); Environment Plan (SAP BTP Cockpit) - standard; Metrics - GB Memory; SKU - 8008837.](images/SAP_BTP_Cloud_Foundry_Runtime_Commercial_Information_Plans_-_2024_V2_67db7c4.png)



Expand Down Expand Up @@ -579,7 +567,7 @@ This is a **paid** plan for productive use. In the consumption-based commercial
> ### Caution:
> With this plan, you get a technical quota of 200 GB of runtime memory per Cloud Foundry org. This doesn't mean that you can use the runtime memory for free. The technical quota represents a **limit** on how much runtime memory all the spaces in the org can use at any given time. To increase this limit, create a case on the [SAP Support Portal](https://support.sap.com) using the component `BC-NEO-CIS`.
The plan is available for all subaccounts by default and can be enabled by a subaccount administrator. For more information about the procedure, see <?sap-ot O2O class="- topic/xref " href="b7f3dc869147454b871cdc5e4720abc5.xml" text="" desc="" xtrc="xref:22" xtrf="file:/home/builder/src/dita-all/jjq1673438782153/loio2080d0faf9d84ce6aa14caa4caa32935_en-US/src/content/localization/en-us/8d41fa40e47b45bf90d38e393a989c4c.xml" output-class="" outputTopicFile="file:/home/builder/tp.net.sf.dita-ot/2.3/plugins/com.elovirta.dita.markdown_1.3.0/xsl/dita2markdownImpl.xsl" ?> .
The plan is available for all subaccounts by default and can be enabled by a subaccount administrator.

</td>
</tr>
Expand Down Expand Up @@ -610,7 +598,7 @@ This is a **free tier** plan that allows you to try out and evaluate the service

With this plan, you get a free quota of runtime memory for your Cloud Foundry org. The amount of such free quotas per global enterprise account is limited.

The plan must be assigned to the subaccount by a global account administrator \(or a directory administrator\), before it can be enabled by a subaccount administrator. For more information about the procedure, see <?sap-ot O2O class="- topic/xref " href="5f4a816f349f46a9b792df000be32117.xml" text="" desc="" xtrc="xref:24" xtrf="file:/home/builder/src/dita-all/jjq1673438782153/loio2080d0faf9d84ce6aa14caa4caa32935_en-US/src/content/localization/en-us/8d41fa40e47b45bf90d38e393a989c4c.xml" output-class="" outputTopicFile="file:/home/builder/tp.net.sf.dita-ot/2.3/plugins/com.elovirta.dita.markdown_1.3.0/xsl/dita2markdownImpl.xsl" ?> .
The plan must be assigned to the subaccount by a global account administrator \(or a directory administrator\), before it can be enabled by a subaccount administrator.

> ### Note:
> Only community support is available for free tier service plans and these are not subject to SLAs. Use of free tier service plans is subject to additional terms and conditions as provided in the [Business Technology Platform Supplemental Terms and Conditions](https://www.sap.com/about/trust-center/agreements/cloud/cloud-services.html?sort=latest_desc&search=Supplement%20Business%20Technology%20Platform&tag=language%3Aenglish&pdf-asset=c8e624f5-bc7e-0010-bca6-c68f7e60039b&page=1).
Expand Down Expand Up @@ -711,7 +699,7 @@ This is a **paid** plan for productive use. In the subscription-based commercial

The runtime memory quota purchased with your subscription must be entitled to subaccounts through the service plan MEMORY. This service plan is associated with the service Cloud Foundry Runtime \(`APPLICATION_RUNTIME`\), which is specific to the subscription-based commercial model.

The plan **standard** is available for all subaccounts by default and can be enabled by a subaccount administrator. The runtime memory quota can be entitled to the subaccount only by a global account administrator \(or a directory administrator\). These steps are independent, but both of them are required to run applications in the Cloud Foundry environment. For more information about the procedure, see <?sap-ot O2O class="- topic/xref " href="819612cd7410411f850227c7669383c3.xml" text="" desc="" xtrc="xref:28" xtrf="file:/home/builder/src/dita-all/jjq1673438782153/loio2080d0faf9d84ce6aa14caa4caa32935_en-US/src/content/localization/en-us/8d41fa40e47b45bf90d38e393a989c4c.xml" output-class="" outputTopicFile="file:/home/builder/tp.net.sf.dita-ot/2.3/plugins/com.elovirta.dita.markdown_1.3.0/xsl/dita2markdownImpl.xsl" ?> .
The plan **standard** is available for all subaccounts by default and can be enabled by a subaccount administrator. The runtime memory quota can be entitled to the subaccount only by a global account administrator \(or a directory administrator\). These steps are independent, but both of them are required to run applications in the Cloud Foundry environment.

</td>
</tr>
Expand Down
Binary file modified docs/10-concepts/images/user-accounts_27c8463.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ eu-central-1

3.69.195.103, 3.64.170.167, 3.68.176.248, 3.121.49.211, 18.197.219.60, 3.70.38.84

**cf-eu10-005:**

35.159.192.144/28

</td>
<td valign="top">

Expand All @@ -875,6 +879,10 @@ eu-central-1

3.70.38.218, 18.196.206.8, 3.65.185.47, 3.73.109.100, 3.73.8.210, 52.59.18.183

**cf-eu10-005:**

3.78.172.245, 3.78.172.245, 3.122.31.132, 3.122.31.132, 18.193.56.244, 18.193.56.244

</td>
<td valign="top">

Expand All @@ -894,6 +902,10 @@ api.cf.eu10-003.hana.ondemand.com

api.cf.eu10-004.hana.ondemand.com

**cf-eu10-005:**

api.cf.eu10-005.hana.ondemand.com

</td>
<td valign="top">

Expand All @@ -913,6 +925,10 @@ eu10-003.hana.ondemand.com

eu10-004.hana.ondemand.com

**cf-eu10-005:**

eu10-005.hana.ondemand.com

</td>
<td valign="top">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,9 @@ Read-only access for authorizations, trusted identity providers, and users.
</tr>
</table>

> ### Note:
> To obtain permissions to view the service binding credentials, ask an administrator to create a new role collection that includes the `Subaccount Viewer` role collection and the `Service Credentials Viewer` role \(see [Define a Role Collection](../50-administration-and-ops/define-a-role-collection-4b20383.md)\).


<a name="loio0039cf082d3d43eba9200fe15647922a__section_vmx_l2s_cpb"/>
Expand Down Expand Up @@ -904,6 +907,28 @@ uas!*<suffix\>*
<tr>
<td valign="top">

Service Credentials Viewer

</td>
<td valign="top">

Subaccount

</td>
<td valign="top">

Service\_Credentials\_Viewer

</td>
<td valign="top">

service-manager!*<suffix\>*

</td>
</tr>
<tr>
<td valign="top">

System Landscape Administrator

</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

# Creating a Service Key \(Optional\)

In the SAP BTP cockpit, you can create a service key for the ABAP system. You can later use this service key, for example, to log on to the ABAP system from ABAP development tools \(ADT\) for test purposes.
In the SAP BTP cockpit, you can create a service key for the ABAP system. You can later use this service key, for example, to log on to the ABAP system from ABAP development tools for Eclipse for test purposes.



## Context

You can use service keys to generate credentials to communicate directly with a service instance. After you have configured the service keys for your service, local clients, apps in other spaces, or entities outside your deployment can access your service with these keys. Using a service key is one option how you can access the service instance of the ABAP environment, for example, as administrator for test purposes. Note, however, that there's also another option for users of ABAP development tools \(ADT\): instead of using an existing service key, developers and other users with a user and password for the ABAP system can also use the project creation wizard in ADT to log on to the ABAP service instance and use the service key that is automatically provided by the service instance. For more information about service keys, see [Using a Service Key Provided by the Service Instance](https://help.sap.com/viewer/5371047f1273405bb46725a417f95433/Cloud/en-US/b7983cfadaa840ddbb44b146fc9b2db0.html). You can also create service keys for other use cases, such as: [Create a Communication Arrangement for Inbound Communication with Service Key Type Basic](../30-development/create-a-communication-arrangement-for-inbound-communication-with-service-key-type-basic-1cc5a1d.md) and [Configure Timeout of @sap/approuter Component of a Communication Arrangement for Inbound Communication with Service Key OAuth](../30-development/configure-timeout-of-sap-approuter-component-of-a-communication-arrangement-for-inbound-c-48bcc77.md).
You can use service keys to generate credentials to communicate directly with a service instance. After you have configured the service keys for your service, local clients, apps in other spaces, or entities outside your deployment can access your service with these keys. Using a service key is one option how you can access the service instance of the ABAP environment, for example, as administrator for test purposes. Note, however, that there's also another option for users of ABAP development tools for Eclipse: instead of using an existing service key, developers and other users with a user and password for the ABAP system can also use the project creation wizard in ABAP development tools for Eclipse to log on to the ABAP service instance and use the service key that is automatically provided by the service instance. You can also create service keys for other use cases, such as: [Creating an Inbound Communication Arrangement with Service Key Type Basic](https://help.sap.com/docs/abap-cloud/abap-integration-connectivity/create-communication-arrangement-for-inbound-communication-with-service-key-type-basic) and [Configuring the Timeout of the @sap/approuter Component](https://help.sap.com/docs/abap-cloud/abap-integration-connectivity/configure-timeout-of-sap-approuter-component-of-communication-arrangement-for-inbound-communication-with-service-key-oauth).

> ### Note:
> The process for connecting to an ABAP service instance URL when creating a new ABAP Cloud project in ABAP development tools for Eclipse has changed. For more information, see [ABAP Service Instance URL](../30-development/abap-service-instance-url-41ec2d3.md).
Expand Down
8 changes: 6 additions & 2 deletions docs/20-getting-started/getting-started-144e173.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ Once you're familiar with the basic concepts of SAP BTP, you can start your firs

<a name="loio144e1733d0d64d58a7176e817fa6aeb3__section_o1n_3rw_slb"/>

## Onboarding Guide
## Onboarding Guides

The guide [Best Practices for SAP BTP](https://help.sap.com/viewer/df50977d8bfa4c9a8a063ddb37113c43/Cloud/en-US) helps you plan your development projects on SAP BTP from setting up the correct organizational structure to creating an account and security model, to developing and operating applications.
The guide [SAP BTP Administrator's Guide](https://help.sap.com/viewer/df50977d8bfa4c9a8a063ddb37113c43/Cloud/en-US) helps you plan your development projects on SAP BTP from onboarding to SAP Cloud Identity Services, through setting up the correct organizational structure, to creating an account and security model, to developing and operating applications.

The guide [SAP BTP Developer’s Guide](https://help.sap.com/docs/BTP/0c8c1db388f645159e134a005aaabbcf/ba26ec41130d4835aef2265ad3d3704e.html?locale=en-US&state=PRODUCTION&version=Cloud) helps you define the correct methodologies and tools for your development project.



Expand Down Expand Up @@ -51,5 +53,7 @@ The SAP Developer Center provides further resources to get you started:

[SAP BTP Administrator's Guide](https://help.sap.com/viewer/df50977d8bfa4c9a8a063ddb37113c43/Cloud/en-US/9f2bb927464e4d1ba3d13b2d79ca9bd1.html "Learn about the SAP BTP Administrator's Guide and how you can use it to plan and set up your landscape and your lifecycle management for running applications on SAP Business Technology Platform (SAP BTP).") :arrow_upper_right:

[SAP BTP Developer's Guide](https://help.sap.com/docs/BTP/0c8c1db388f645159e134a005aaabbcf/ba26ec41130d4835aef2265ad3d3704e.html?locale=en-US&state=PRODUCTION&version=Cloud)

[Access the Cockpit](../50-administration-and-ops/access-the-cockpit-4e75066.md "Learn how to access the SAP BTP cockpit.")

8 changes: 4 additions & 4 deletions docs/30-development/application-connector-module-4dadebe.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Besides proxying any ingress and egress requests to external systems and dealing

The Application Connector module provides the following features:

- Easy installation of Kyma's Application Connectivity capabilities by enabling the Application Connector module on your Kyma cluster.
- Easy installation of Kyma's Application Connectivity capabilities by enabling the Application Connector module in your SAP BTP, Kyma runtime.

- Simple configuration using Kubernetes CRs and easy management with Kyma dashboard.

Expand Down Expand Up @@ -74,11 +74,11 @@ When you add the Application Connector module, Application Connector Manager tak

The API of the Applicaton Connector module is based on Kubernetes Custom Resource Definitions \(CRD\), which extend the Kubernetes API with custom additions. To inspect the specification of the Application Connector module API, see:

- [Application CRD](https://kyma-project.io/#/application-connector-manager/user/resources/06-10-application)
- [Application CRD](https://kyma-project.io/#/application-connector-manager/user/resources/04-10-application)

- [CompassConnection CRD](https://kyma-project.io/#/application-connector-manager/user/resources/06-20-compassconnection)
- [CompassConnection CRD](https://kyma-project.io/#/application-connector-manager/user/resources/04-20-compassconnection)

- [ApplicationConnector CRD](https://kyma-project.io/#/application-connector-manager/user/resources/06-30-application-connector)
- [ApplicationConnector CRD](https://kyma-project.io/#/application-connector-manager/user/resources/04-30-application-connector)



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Creating Service Instances and Service Bindings

Create service instances and service bindings using Kyma dashboard or kubectl.
To use an SAP BTP service in your Kyma cluster, create its service instance and service binding using Kyma dashboard or kubectl.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The Multitarget Application \(МТА\) extension descriptor is a YAML file that contains data complementary to the deployment descriptor \(from MTA archive\). It has a structure similar to the one of the deployment descriptor, and you will normally find it placed outside of the MTA archive.

The data can be environment or deployment specific, for example, application scaling setup or credentials depending on the user who performs the deployment. This allows you to use the one and the same unmodifiable MTA archive and deploy it with different extension descriptors, resulting in different setups.
The data can be environment-specific or deployment-specific, for example, application scaling setup or credentials depending on the user who performs the deployment. This allows you to use the one and the same unmodifiable MTA archive and deploy it with different extension descriptors, resulting in different setups.

When you are deploying an MTA, you can provide several extension descriptors. The descriptors in the chain are considered in order, with each descriptor having a higher priority than the one it extends.

Expand Down Expand Up @@ -171,9 +171,9 @@ In some cases, there are operation-level parameters \(command-line arguments\) t
You can do the following using an extension descriptor:
- Add new data in properties and parameters on module level, resource level, provided section level and required section level
- Add new data in properties and parameters on module level, resource level, `provides` and `requires` section level
- Overwrite an existing data \(in depth\) in modules, resources, parameters, properties, provides, requires sections. This depends on the parameter or property metadata overwritable. See [Metadata for Properties and Parameters](metadata-for-properties-and-parameters-fca2ced.md).
- Overwrite existing data \(in depth\) in modules, resources, parameters, properties, `provides` and `requires` sections. This depends on the parameter or property metadata `overwritable`. See [Metadata for Properties and Parameters](metadata-for-properties-and-parameters-fca2ced.md).
- As of schema version 3.xx, by default parameters and properties are overwritable and optional. If you want to make a certain parameter or property non-overwritable or required, you need to add specific metadata. See [Metadata for Properties and Parameters](metadata-for-properties-and-parameters-fca2ced.md).
Expand All @@ -194,7 +194,7 @@ You cannot use an extension descriptor to:
[MTA Module Types, Resource Types, and Parameters for Applications in the Neo Environment](https://help.sap.com/viewer/ea72206b834e4ace9cd834feed6c0e09/Cloud/en-US/f1caa871360c40e7be7ce4264ab9c336.html "") :arrow_upper_right:
[The Multitarget Application Model v.2](http://go.sap.com/documents/2016/06/e2f618e4-757c-0010-82c7-eda71af511fa.html)
[The Multitarget Application Model v.2](https://help.sap.com/doc/multitarget-application-modelv2/Cloud/en-US/The%20Multitarget%20Application%20Model.pdf)
[The Multitarget Application Model v.3](https://www.sap.com/documents/2021/09/66d96898-fa7d-0010-bca6-c68f7e60039b.html)
[The Multitarget Application Model v.3](https://help.sap.com/doc/multitarget-application-modelv3/Cloud/en-US/The%20Multitarget%20Application%20M%D0%BEdel.pdf)
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ The example above instructs the SAP BTP to:
[Cloud MTA Build Tool](https://sap.github.io/cloud-mta-build-tool/)
[The Multitarget Application Model v.2](http://go.sap.com/documents/2016/06/e2f618e4-757c-0010-82c7-eda71af511fa.html)
[The Multitarget Application Model v.2](https://help.sap.com/doc/multitarget-application-modelv2/Cloud/en-US/The%20Multitarget%20Application%20Model.pdf)
[The Multitarget Application Model v.3](https://www.sap.com/documents/2021/09/66d96898-fa7d-0010-bca6-c68f7e60039b.html)
[The Multitarget Application Model v.3](https://help.sap.com/doc/multitarget-application-modelv3/Cloud/en-US/The%20Multitarget%20Application%20M%D0%BEdel.pdf)
[JAR File Specification](http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html)
Expand Down
Loading

0 comments on commit f063d96

Please sign in to comment.