Merge pull request #4013 from zowe/reboot/doc/fix-caching

fix caching service properties, add deprecations

docs/user-guide/api-mediation/api-mediation-caching-service.md

@@ -31,12 +31,14 @@ A precondition to provide for High Availability of all components within Zowe is
 REST APIs make it possible to create, delete, and update key-value pairs in the cache. Other APIs read a specific key-value pair or all key-value pairs in the cache.
 
 Information from cached APIs is stored as a JSON in the following format:
+
 ```yml
 {
   “key”: “keyValue”, 
   “value”: “valueValue”
 }
 ```
+
 ## Storage methods
 
 The Caching Service supports the following storage solutions, which provide the option to add custom implementation.  
@@ -63,8 +65,8 @@ For more information about the Redis storage access method, see [Using Redis as
 
 ### InMemory
 
-The InMemory storage method is a method suitable for testing and integration verification. Be sure not to use InMemory storage in production. 
-The key/value pairs are stored only in the memory of a single instance of the service. As such, the key/value pairs do not persist. 
+The InMemory storage method is a method suitable for testing and integration verification. Be sure not to use InMemory storage in production.
+The key/value pairs are stored only in the memory of a single instance of the service. As such, the key/value pairs do not persist.
 
 ## How to start the Service
 
@@ -122,11 +124,13 @@ This parameter specifies service behavior when the limit of records is reached.
 ## Authentication
 
 ### Direct calls
+
 The Caching Service requires TLS mutual authentication. This verifies authenticity of the client. Calls without a valid client certificate generate a `403` response code: `Forbidden`. This requirement is disabled when `VERIFY_CERTIFICATES=false` in `zowe-certificates.env` configuration file.
 
-The call must have a header `X-Certificate-DistinguishedName` containing information about the certificate's distinguished name. This header is added by the API Gateway. For a direct call, this header needs to be added manually. Calls without this header produce a `401` response code: `Unauthorized`. 
+The call must have a header `X-Certificate-DistinguishedName` containing information about the certificate's distinguished name. This header is added by the API Gateway. For a direct call, this header needs to be added manually. Calls without this header produce a `401` response code: `Unauthorized`.
 
 ### Routed calls through API Gateway
+
 Caching service registers with the following authentication scheme to Discovery service:
 
 ```yaml

docs/user-guide/configure-caching-service-ha.md

@@ -2,54 +2,63 @@
 
 Zowe can work in a high availability (HA) configuration where multiple instances of the Zowe launcher are started, either on the same LPAR, or different LPARs connected through sysplex distributor. If you are only running a single Zowe instance on a single LPAR you do not need to create a caching service so you may skip this step.  
 
-In an HA setup the different Zowe API Mediation Gateway servers share the same northbound port (by default `7554`), and client traffic to this port is distributed between separate gateways that in turn dispatch their work to different services.  When any of the services individually become unavailable the work can be routed to available services, which means that the initial northbound request will be fulfilled.  
+In an HA setup the different Zowe API Mediation Gateway servers share the same northbound port (by default `7554`), and client traffic to this port is distributed between separate gateways that in turn dispatch their work to different services. When any of the services individually become unavailable the work can be routed to available services, which means that the initial northbound request will be fulfilled.  
 
-Zowe uses the Caching Service to centralize the state data persistent in high availability (HA) mode. If you are runnning the caching service on z/OS there are three storage methods: `inMemory`, `infinispan` or `VSAM`.  If you are running the caching service off platform, such as a Linux or Windows container image, it is also possible to specify `redis` or `infinispan`.  
+Zowe uses the Caching Service to centralize the state data persistent in high availability (HA) mode. If you are runnning the caching service on z/OS there are three storage methods: `inMemory`, `infinispan` or `VSAM`. If you are running the caching service off platform, such as a Linux or Windows container image, it is also possible to specify `redis` or `infinispan`.  
 
-To learn more about how the Caching Service can be used, see [Using the Caching Service](../user-guide/api-mediation/api-mediation-caching-service). 
+To learn more about how the Caching Service can be used, see [Using the Caching Service](../user-guide/api-mediation/api-mediation-caching-service).
 
 :::note
 To enable Personal Access Token support when using the Caching Service, **Infinispan** is the required storage solution. Infinispan is part of Zowe installation. No additional software or installation is required when using this storage solution. Infinispan is the recommended storage method to use in production.
 :::
 
 ## inMemory
-   
+
    This storage method is designed for quick start of the service and should be used only for single instance scenario and development or test purpose. Do not use it in production or high availability scenario.
 
-   To use this method, set the `zowe.components.caching-service.storage.mode` value to `inMemory` in the `zowe.yaml` configuration file. When this method is enabled, the Caching Service will not persist any data.  
+   To use this method, set the `components.caching-service.storage.mode` value to `inMemory` in the `zowe.yaml` configuration file. When this method is enabled, the Caching Service will not persist any data.  
 
    ``` yaml
-   zowe
-     components:
-       caching-service:
-         enabled: true
-         port: 7555
-           storage:
-             evictionStrategy: reject
-             mode: imMemory
-             size: 10000
+    components:
+      caching-service:
+        enabled: true
+        port: 7555
+          storage:
+            evictionStrategy: reject
+            mode: imMemory
+            size: 10000
    ```
 
 ## Infinispan
 
-  Infinispan is designed to be run mainly on z/OS since it offers good performance. To enable this method, set the value of `zowe.components.caching-service.storage.mode` to `infinispan` in the `zowe.yaml` configuration file.
+  :::Note
+
+  This is the recommended solution for on-prem z/OS production deployments
+
+  :::
+
+  Infinispan is designed to be run mainly on z/OS since it offers good performance. To enable this method, set the value of `components.caching-service.storage.mode` to `infinispan` in the `zowe.yaml` configuration file.
   Infinispan environment variables are not currently following the v2 naming convention, so they must be defined into `zowe.environments` section.  For more information on these properties and their values see [Infinispan configuration](../extend/extend-apiml/api-mediation-infinispan.md#infinispan-configuration).
 
   ``` yaml
-  zowe
-    components:
-          caching-service:
-            storage:
-              mode: infinispan
-              infinispan: 
-                jgroups:
-                  port: 7098
+  components:
+        caching-service:
+          storage:
+            mode: infinispan
+            infinispan: 
+              jgroups:
+                port: 7098
   ```
 
-## VSAM
-
-  This storage method allows you tu use VSAM dataset as a storage for Caching service. You can use `zwe init vsam` command to generate proper dataset.
+## VSAM (Deprecated)
+
+  :::Note
+
+  VSAM support in Caching Service will be removed in a future release
 
+  :::
+
+  This storage method allows you tu use VSAM dataset as a storage for Caching service. You can use `zwe init vsam` command to generate proper dataset.
 
   The command `zwe init vsam` uses the template JCL in `SZWESAMP(ZWECSVSM)`.  You can edit and submit this yourself, or else if use `zwe init vsam` which will copy the source template member from `zowe.setup.mvs.hlq.SZWESAMP(ZWECVCSM)` and create a target JCL member in `zowe.setup.mvs.jcllib(ZWECVSCM)` with values extracted from the `zowe.yaml` file.  
 
@@ -63,36 +72,34 @@ To enable Personal Access Token support when using the Caching Service, **Infini
         mode: NONRLS
         volume: VOL123
         storageClass:
-    components:
-      caching-service:
-        storage:
-          mode: VSAM
-          vsam:
-            name: IBMUSER.ZWE.CUST.CACHE
+  components:
+    caching-service:
+      storage:
+        mode: VSAM
+        vsam:
+          name: IBMUSER.ZWE.CUST.CACHE
   ```
 
-  - `zowe.components.caching-service.storage.vsam.name`  
+  - `components.caching-service.storage.vsam.name`  
   This specifies the data set name that the `ZWECSVSM` JCL will create. This is used to replace all occurrences of `#dsname` in the `ZWECSVSM` data set.
 
     :::note
     The `ZWECSVSM` JCL defines the key length and record length of the VSAM instance. If the key length and record length of this JCL is changed,
     `zowe.environments.CACHING_STORAGE_VSAM_KEYLENGTH` and `zowe.environments.CACHING_STORAGE_VSAM_RECORDLENGTH` must be set to the new values.
     :::
 
-  - `zowe.components.caching-service.storage.mode`  
+  - `components.caching-service.storage.mode`  
   This specifies whether you would like to use [Record Level Sharing (RLS)](https://www.ibm.com/support/pages/vsam-record-level-sharing-rls-overview) for your VSAM data set. `RLS` is recommended for Sysplex deployment.  `NONRLS` is also an allowed value.  
 
-
-  - `zowe.setup.vsam.storageClass`   
-  If you use the `RLS` mode, a storage class is required. 
+  - `zowe.setup.vsam.storageClass`
+  If you use the `RLS` mode, a storage class is required.
 
   - `zowe.setup.vsam.volume`  
   If you set to use the `NONRLS` mode, a storage volume is required.
 
-
   To preview the member before submitting it, use the value `--security-dry-run`.  Otherwise, the command automatically submits the JCL and waits for its completion.
 
-  ```
+  ```plaintext
   >zwe init vsam -c ./zowe.yaml
   -------------------------------------------------------------------------------
   >> Create VSAM storage for Zowe Caching Service
@@ -104,33 +111,31 @@ To enable Personal Access Token support when using the Caching Service, **Infini
   >
   ```
 
-## redis
+## Redis
 
    Redis is not available if you are running the API Mediation Layer on z/OS under Unix System Services. Usage of redis is intended for when API ML is running off platform, such as in a Linux or Windows container as part of a hybrid cloud deployment.
 
-   To enable this method, set the value of `zowe.components.caching-service.storage.mode` to `redis` in the `zowe.yaml` configuration file.  There are a number of values to control the redis nodes, sentinel and ssl properties that need to be set in the `zowe.yaml` file.  For more information on these properties and their values see [Redis configuration](../extend/extend-apiml/api-mediation-redis.md#redis-configuration).  
-
-
+   To enable this method, set the value of `components.caching-service.storage.mode` to `redis` in the `zowe.yaml` configuration file.  There are a number of values to control the redis nodes, sentinel and ssl properties that need to be set in the `zowe.yaml` file.  For more information on these properties and their values see [Redis configuration](../extend/extend-apiml/api-mediation-redis.md#redis-configuration).  
+
    ```yaml
-   zowe:
-     components:
-       caching-service:
-       enabled: true
-         port: 7555
-           storage:
-             size: 10000
-             evictionStrategy: reject
-             mode: redis
-             redis:
-               masterNodeUri: 
-               timeout: 60
-             sentinel:
-               masterInstance
-               nodes
-             ssl:
-               enabled: true
-               keystore:
-               keystorePassword:
-               trustStore:
-               trustStorePassword
+    components:
+      caching-service:
+      enabled: true
+        port: 7555
+          storage:
+            size: 10000
+            evictionStrategy: reject
+            mode: redis
+            redis:
+              masterNodeUri: 
+              timeout: 60
+            sentinel:
+              masterInstance
+              nodes
+            ssl:
+              enabled: true
+              keystore:
+              keystorePassword:
+              trustStore:
+              trustStorePassword
    ```

versioned_docs/version-v2.18.x/user-guide/api-mediation/api-mediation-caching-service.md

@@ -30,12 +30,14 @@ A precondition to provide for High Availability of all components within Zowe is
 REST APIs make it possible to create, delete, and update key-value pairs in the cache. Other APIs read a specific key-value pair or all key-value pairs in the cache.
 
 Information from cached APIs is stored as a JSON in the following format:
-```yml
+
+```yaml
 {
   “key”: “keyValue”, 
   “value”: “valueValue”
 }
 ```
+
 ## Storage methods
 
 The Caching Service supports the following storage solutions, which provide the option to add custom implementation.