Skip to content

Commit a14c3c3

Browse files
authored
[AKS] az aks create/update: Use main cli for prometheus addon (#8983)
1 parent 40ef8c9 commit a14c3c3

25 files changed

+7341
-6177
lines changed

src/aks-preview/azext_aks_preview/azuremonitormetrics/addonput.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amg/__init__.py

Whitespace-only changes.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amg/link.py

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amw/__init__.py

Whitespace-only changes.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amw/create.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amw/defaults.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/aks-preview/azext_aks_preview/azuremonitormetrics/amw/helper.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/aks-preview/azext_aks_preview/azuremonitormetrics/azuremonitorprofile.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,25 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
5-
from azext_aks_preview.azuremonitormetrics.addonput import addon_put
6-
from azext_aks_preview.azuremonitormetrics.amg.link import link_grafana_instance
7-
from azext_aks_preview.azuremonitormetrics.amw.helper import get_azure_monitor_workspace_resource
8-
from azext_aks_preview.azuremonitormetrics.dc.dce_api import create_dce
9-
from azext_aks_preview.azuremonitormetrics.dc.dcr_api import create_dcr
10-
from azext_aks_preview.azuremonitormetrics.dc.dcra_api import create_dcra
11-
from azext_aks_preview.azuremonitormetrics.dc.delete import delete_dc_objects_if_prometheus_enabled, get_dc_objects_list
12-
from azext_aks_preview.azuremonitormetrics.helper import check_azuremonitormetrics_profile, rp_registrations
13-
from azext_aks_preview.azuremonitormetrics.recordingrules.create import create_rules
14-
from azext_aks_preview.azuremonitormetrics.recordingrules.delete import delete_rules
5+
from azure.cli.command_modules.acs.azuremonitormetrics.addonput import addon_put
6+
from azure.cli.command_modules.acs.azuremonitormetrics.amg.link import link_grafana_instance
7+
from azure.cli.command_modules.acs.azuremonitormetrics.amw.helper import get_azure_monitor_workspace_resource
8+
from azure.cli.command_modules.acs.azuremonitormetrics.dc.dce_api import create_dce
9+
from azure.cli.command_modules.acs.azuremonitormetrics.dc.dcr_api import create_dcr
10+
from azure.cli.command_modules.acs.azuremonitormetrics.dc.dcra_api import create_dcra
11+
from azure.cli.command_modules.acs.azuremonitormetrics.dc.delete import (
12+
delete_dc_objects_if_prometheus_enabled,
13+
get_dc_objects_list
14+
)
15+
from azure.cli.command_modules.acs.azuremonitormetrics.recordingrules.create import create_rules
16+
from azure.cli.command_modules.acs.azuremonitormetrics.recordingrules.delete import delete_rules
17+
from azure.cli.command_modules.acs.azuremonitormetrics.helper import (
18+
check_azuremonitormetrics_profile,
19+
rp_registrations
20+
)
21+
from azure.cli.core.azclierror import InvalidArgumentValueError
1522
from knack.util import CLIError
1623
from knack.log import get_logger
17-
from azure.cli.core.azclierror import InvalidArgumentValueError
1824

1925
logger = get_logger(__name__)
2026

@@ -93,7 +99,7 @@ def ensure_azure_monitor_profile_prerequisites(
9399
# Do RP registrations and artifact creation (DC*, rules, grafana link etc.) if not enabled already
94100
# Otherwise move forward so that the addon can be enabled with new KSM parameters
95101
if is_prometheus_enabled is False:
96-
rp_registrations(cmd, cluster_subscription)
102+
rp_registrations(cmd, cluster_subscription, raw_parameters)
97103
link_azure_monitor_profile_artifacts(
98104
cmd,
99105
cluster_subscription,

src/aks-preview/azext_aks_preview/azuremonitormetrics/dc/__init__.py

Whitespace-only changes.

src/aks-preview/azext_aks_preview/azuremonitormetrics/dc/dce_api.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)