Merge branch '4.19' into 4.20 with 'ours' strategy

Author: Pearl1594

.readthedocs.yaml

@@ -9,5 +9,8 @@ build:
     python: "3.11"
 
 python:
-   install:
-   - requirements: requirements.txt
+  install:
+  - requirements: requirements.txt
+
+sphinx:
+  configuration: source/conf.py

source/adminguide/events.rst

@@ -59,6 +59,14 @@ machine on the event bus. All the CloudStack events (alerts, action
 events, usage events) and the additional category of resource state
 change events, are published on to the events bus.
 
+.. note::
+   Alerts for some more important events will be sent multiple
+   times. This is due to the nature of guarding
+   certain resources from multiple threads in the code, to make sure
+   that events are not missed. Examples are "Host down" or
+   "HA starting VM". These are considered too important to not send
+   immediately and hence a check if they are already queued can not be done.
+
 Implementations
 ~~~~~~~~~~~~~~~
 An event bus is introduced in the

source/adminguide/networking/advanced_zone_config.rst

@@ -82,6 +82,7 @@ configure the base guest Network:
 .. note:: 
    * In security groups-enabled Advanced zones and Basic zones, creation of VPC and isolated Networks are not supported.
    * MTU options will be shown in the UI and considered only when zone configuration - `allow.end.users.to.specify.vr.mtu` is set to true. Maximum allowed values for public and private MTU can be controlled by zone-level configurations, `vr.public.interface.max.mtu` and `vr.private.interface.max.mtu` respectively.
+   * We can configure a zone with multiple Physical Networks having guest traffic type. In such zones, we need to tag the additional Physical networks. We must have one Physical Network that is not tagged for isolated/L2 network offerings not configured with any tags. For example the default network offerings. 
 
 Configure Public Traffic in an Advanced Zone
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/adminguide/storage.rst

@@ -164,8 +164,9 @@ In order to use multiple local storage pools, you need to
 
 #. Edit /etc/cloudstack/agent/agent.properties
 
-    - Add extra directories to "local.storage.path"
-    - Add UUID of directories to "local.storage.uuid" (UUID can be generated by `uuidgen`)
+    - Add extra directories to "local.storage.path".
+    - Add UUID of directories to "local.storage.uuid" (UUID can be generated by `uuidgen`).
+      "local.storage.uuid" must be present in the agent.properties file and should not be deleted.
 
     .. parsed-literal::
 

source/adminguide/usage.rst

@@ -697,8 +697,6 @@ Load Balancer Policy or Port Forwarding Rule Usage Record Format
 
 -  usageid - ID of the load balancer policy or port forwarding rule
 
--  usagetype - A number representing the usage type (see Usage Types)
-
 -  startdate, enddate - The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
@@ -723,15 +721,11 @@ Network Offering Usage Record Format
 
 -  rawusage – A number representing the actual usage in hours
 
--  usageid – ID of the Network offering
+-  offeringid – ID of the Network offering
 
--  usagetype – A number representing the usage type (see Usage Types)
+-  virtualmachineid – The ID of the Instance
 
--  offeringid – Network offering ID
-
--  virtualMachineId – The ID of the Instance
-
--  virtualMachineId – The ID of the Instance
+-  isdefault – The default nic of the Instance
 
 -  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
@@ -759,8 +753,6 @@ VPN User Usage Record Format
 
 -  usageid – VPN User ID
 
--  usagetype – A number representing the usage type (see Usage Types)
-
 -  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 

source/installguide/configuration.rst

@@ -264,7 +264,13 @@ and secondary storage.
 
 #. Click Add Zone. The zone creation wizard will appear.
 
-#. Choose one of the following network types:
+#. Choose one of the following zone types:
+
+   - **Core.** Core Zones are intended for Datacenter based deployments and allow the full range of Networking and other functionality in Apache CloudStack. Core zones have a number of prerequisites and rely on the presence of shared storage and helper Instances. For more information see :ref:`core-zone`.
+
+   - **Edge.** Edge Zones are lightweight zones, designed for deploying in edge computing scenarios. They are limited in functionality but have far fewer prerequisites than core zones. Please refer to :ref:`edge-zone`.
+
+#. If Core Zone is selected, choose one of the following network types:
 
    -  **Basic.** For AWS-style networking. Provides a single network
       where each instance is assigned an IP directly from the
@@ -529,6 +535,8 @@ Advanced Zone Configuration
 
 For Advanced zone, you may chose to select Edge which will allow creating an Edge Zone. If Edge is not selected then wizard will continue creating a Core zone.
 
+.. _core-zone:
+
 Core Zone
 *********
 
@@ -779,6 +787,8 @@ Core Zone
 #. Click Launch.
 
 
+.. _edge-zone:
+
 Edge Zone
 *********
 

source/plugins/cloudstack-kubernetes-service.rst

@@ -214,7 +214,6 @@ createKubernetesCluster API can be used to create new Kubernetes cluster. It tak
 - **dockerregistryusername** (username for the docker image private registry; Experimental)
 - **dockerregistrypassword** (password for the docker image private registry; Experimental)
 - **dockerregistryurl** (URL for the docker image private registry; Experimental)
-- **dockerregistryemail** (email of the docker image private registry user; Experimental)
 
 For example:
 
@@ -253,7 +252,7 @@ On successful creation, the new cluster will automatically be started and will s
 
 .. note::
    - A minimum of 2 cores of CPU and 2GB of RAM is needed for deployment. Therefore, the serviceofferingid parameter of createKubernetesCluster API must be provided with the ID of such compute offerings that conform to these requirements.
-   - Private docker registry related parameters of createKubenetesCluster API (dockerregistryusername, dockerregistryusername, dockerregistryurl, dockerregistryemail) provides experimental functionality. To use them during cluster deployment value for global setting, cloud.kubernetes.cluster.experimental.features.enabled, must be set to true by admin beforehand.
+   - Private docker registry related parameters of createKubenetesCluster API (dockerregistryusername, dockerregistrypassword, dockerregistryurl) provides experimental functionality. To use them during cluster deployment value for global setting, cloud.kubernetes.cluster.experimental.features.enabled, must be set to true by admin beforehand.
 
 Listing Kubernetes clusters
 ############################