Merge remote-tracking branch 'origin/main' into cbutz/aks-preview-otlp-grpc

# Conflicts:
#	src/aks-preview/HISTORY.rst

Author: Christoph Butz

.azure-pipelines/templates/azdev_setup.yml

@@ -11,14 +11,9 @@ steps:
       python -m venv env
       chmod +x env/bin/activate
       source ./env/bin/activate
-      # clone azure-cli
       git clone -q --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
       python -m pip install -U pip
-      # azdev 0.2.11b1 (decouples extension metadata from wheel==0.30.0) tho it is not on PyPI yet.
-      # Pinned to a specific azure-cli-dev-tools commit (not @dev) for reproducible builds
-      # until the pre-release is published; then switch this back to:
-      # pip install --upgrade "azdev==0.2.11b1"
-      pip install --upgrade "git+https://github.com/Azure/azure-cli-dev-tools.git@49390f30c6a822620d2fbdf88889c4445d22666f#egg=azdev"
+      pip install --upgrade "azdev==0.2.12"
       azdev --version
       azdev setup -c $CLI_REPO_PATH -r $CLI_EXT_REPO_PATH --debug
       pip list -v

.github/pull_request_template.md

@@ -9,7 +9,7 @@ This checklist is used to make sure that common guidelines for a pull request ar
 ### General Guidelines
 
 - [ ] Have you run `azdev style <YOUR_EXT>` locally? (`pip install azdev` required)
-- [ ] Have you run `python scripts/ci/test_index.py -q` locally? (`azdev` required; see `.azure-pipelines/templates/azdev_setup.yml` for the install command until `azdev==0.2.11b1` is on PyPI)
+- [ ] Have you run `python scripts/ci/test_index.py -q` locally? (`pip install azdev` required)
 - [ ] My extension version conforms to the [Extension version schema](https://github.com/Azure/azure-cli/blob/release/doc/extensions/versioning_guidelines.md)
 
 For new extensions:

azure-pipelines.yml

@@ -80,10 +80,8 @@ jobs:
       #!/usr/bin/env bash
       set -ev
       # test_index.py imports scripts/ci/util.py, which reads wheel metadata via azdev's
-      # pkginfo-based metadata module (decoupled from wheel==0.30.0), so azdev must be
-      # installed here. Install from the merged azure-cli-dev-tools source until azdev
-      # 0.2.11b1 is published to PyPI, then switch this to: pip install --upgrade "azdev==0.2.11b1"
-      pip install --upgrade "git+https://github.com/Azure/azure-cli-dev-tools.git@49390f30c6a822620d2fbdf88889c4445d22666f#egg=azdev"
+      # pkginfo-based metadata module (decoupled from wheel==0.30.0), so azdev must be installed here.
+      pip install --upgrade "azdev==0.2.12"
       pip install requests packaging setuptools
       export CI="ADO"
       python ./scripts/ci/test_index.py -v

linter_exclusions.yml

@@ -3670,3 +3670,11 @@ relationship dependency-of create:
 relationship service-group-member create:
   rule_exclusions:
     - missing_command_example
+
+cosmosdb sql softdeleted-database list:
+  rule_exclusions:
+    - no_ids_for_list_commands
+
+cosmosdb sql softdeleted-container list:
+  rule_exclusions:
+    - no_ids_for_list_commands

scripts/ci/update_index.py

@@ -43,7 +43,11 @@ def main():
     ext_dir = tempfile.mkdtemp(dir=extensions_dir)
     whl_cache_dir = tempfile.mkdtemp()
     whl_cache = {}
-    ext_file = get_whl_from_url(whl_path, extension_name, whl_cache_dir, whl_cache)
+    # Download to the real wheel filename (ending in .whl): get_ext_metadata now
+    # reads metadata via pkginfo, which requires a .whl-named file. Passing the
+    # extension name (e.g. "ssh") produced an extension-less temp file that
+    # pkginfo rejects with "Not a known wheel archive format".
+    ext_file = get_whl_from_url(whl_path, whl_path.split('/')[-1], whl_cache_dir, whl_cache)
 
     with open('./src/index.json', 'r') as infile:
         curr_index = json.loads(infile.read())

src/aks-preview/HISTORY.rst

@@ -16,6 +16,8 @@ Pending
 ++++++++
 * `az aks create` and `az aks update`: Add `--opentelemetry-metrics-port-grpc` and `--opentelemetry-logs-traces-port-grpc` (preview) to configure the gRPC ports for OpenTelemetry metrics and logs/traces collection, in addition to the existing HTTP/protobuf ports.
 * `az aks create` and `az aks update`: Rename the OpenTelemetry parameters, keeping the previous names as deprecated aliases: `--opentelemetry-metrics-port` -> `--opentelemetry-metrics-port-http`, `--opentelemetry-logs-port` -> `--opentelemetry-logs-traces-port-http`, `--enable-opentelemetry-logs` -> `--enable-opentelemetry-logs-traces`, `--disable-opentelemetry-logs` -> `--disable-opentelemetry-logs-traces`.
+* `az aks create`: Add `--enable-on-demand-monitor` to enable on-demand monitor for the cluster.
+* `az aks update`: Add `--enable-on-demand-monitor` and `--disable-on-demand-monitor` to manage on-demand monitor for the cluster.
 
 21.0.0b7
 ++++++++

src/aks-preview/azext_aks_preview/_params.py

@@ -1401,6 +1401,12 @@ def load_arguments(self, _):
                  "backupVaultId, backupPolicyId, tags. backupVaultId and backupPolicyId are required "
                  "for Custom strategy. Only valid with --enable-backup.",
         )
+        c.argument(
+            "enable_on_demand_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Enable on-demand monitor for the cluster.",
+        )
         # prepared image specification
         c.argument(
             'prepared_image_specification_id',
@@ -2118,6 +2124,18 @@ def load_arguments(self, _):
             is_preview=True,
             help="Enable continuous control plane and addon monitor for the cluster.",
         )
+        c.argument(
+            "enable_on_demand_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Enable on-demand monitor for the cluster.",
+        )
+        c.argument(
+            "disable_on_demand_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Disable on-demand monitor for the cluster.",
+        )
         c.argument(
             "disable_continuous_control_plane_and_addon_monitor",
             action="store_true",

src/aks-preview/azext_aks_preview/custom.py

@@ -1451,6 +1451,7 @@ def aks_create(
     enable_backup=False,
     backup_strategy=None,
     backup_configuration_file=None,
+    enable_on_demand_monitor=False,
     # prepared image specification
     prepared_image_specification_id=None,
 ):
@@ -1719,6 +1720,8 @@ def aks_update(
     disable_application_load_balancer=False,
     # health monitor
     enable_continuous_control_plane_and_addon_monitor=False,
+    enable_on_demand_monitor=False,
+    disable_on_demand_monitor=False,
     disable_continuous_control_plane_and_addon_monitor=False,
     # backup (delegates to the dataprotection extension)
     enable_backup=False,

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -4234,6 +4234,20 @@ def get_enable_continuous_control_plane_and_addon_monitor(self) -> bool:
         """
         return self.raw_param.get("enable_continuous_control_plane_and_addon_monitor")
 
+    def get_enable_on_demand_monitor(self) -> bool:
+        """Obtain the value of enable_on_demand_monitor.
+
+        :return: bool
+        """
+        return self.raw_param.get("enable_on_demand_monitor")
+
+    def get_disable_on_demand_monitor(self) -> bool:
+        """Obtain the value of disable_on_demand_monitor.
+
+        :return: bool
+        """
+        return self.raw_param.get("disable_on_demand_monitor")
+
     def get_disable_continuous_control_plane_and_addon_monitor(self) -> bool:
         """Obtain the value of disable_continuous_control_plane_and_addon_monitor.
 
@@ -5406,12 +5420,18 @@ def set_up_health_monitor_profile(self, mc: ManagedCluster) -> ManagedCluster:
         """
         self._ensure_mc(mc)
 
-        if self.context.get_enable_continuous_control_plane_and_addon_monitor():
+        enable_continuous = self.context.get_enable_continuous_control_plane_and_addon_monitor()
+        enable_on_demand = self.context.get_enable_on_demand_monitor()
+
+        if enable_continuous or enable_on_demand:
             if mc.health_monitor_profile is None:
                 mc.health_monitor_profile = (
                     self.models.ManagedClusterHealthMonitorProfile()  # pylint: disable=no-member
                 )
-            mc.health_monitor_profile.enable_continuous_control_plane_and_addon_monitor = True
+            if enable_continuous:
+                mc.health_monitor_profile.enable_continuous_control_plane_and_addon_monitor = True
+            if enable_on_demand:
+                mc.health_monitor_profile.enable_on_demand_monitor = True
 
         return mc
 
@@ -8143,20 +8163,30 @@ def update_health_monitor_profile(self, mc: ManagedCluster) -> ManagedCluster:
 
         enable = self.context.get_enable_continuous_control_plane_and_addon_monitor()
         disable = self.context.get_disable_continuous_control_plane_and_addon_monitor()
+        enable_on_demand = self.context.get_enable_on_demand_monitor()
+        disable_on_demand = self.context.get_disable_on_demand_monitor()
 
-        if not enable and not disable:
+        if not enable and not disable and not enable_on_demand and not disable_on_demand:
             return mc
         if enable and disable:
             raise MutuallyExclusiveArgumentError(
                 "Cannot specify --enable-continuous-control-plane-and-addon-monitor and "
                 "--disable-continuous-control-plane-and-addon-monitor at the same time."
             )
+        if enable_on_demand and disable_on_demand:
+            raise MutuallyExclusiveArgumentError(
+                "Cannot specify --enable-on-demand-monitor and "
+                "--disable-on-demand-monitor at the same time."
+            )
 
         if mc.health_monitor_profile is None:
             mc.health_monitor_profile = (
                 self.models.ManagedClusterHealthMonitorProfile()  # pylint: disable=no-member
             )
-        mc.health_monitor_profile.enable_continuous_control_plane_and_addon_monitor = bool(enable)
+        if enable or disable:
+            mc.health_monitor_profile.enable_continuous_control_plane_and_addon_monitor = bool(enable)
+        if enable_on_demand or disable_on_demand:
+            mc.health_monitor_profile.enable_on_demand_monitor = bool(enable_on_demand)
 
         return mc