Skip to content

fix: azure monitoring enable for azure red hat openshift clusters #11460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmyyrroonn merged 23 commits into from
Dec 5, 2019
Merged

fix: azure monitoring enable for azure red hat openshift clusters #11460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b633783
add cluster spn with metric publisher role to aks cluster resource
ganga1980 Feb 14, 2019
34b4ff2
refactor the code
ganga1980 Feb 14, 2019
5d5e06f
fix default workspace issue in china cloud
ganga1980 Feb 15, 2019
13b28a1
add metrics publisher role assignment only in public cloud
ganga1980 Feb 15, 2019
20b8de5
fix pr feedback
ganga1980 Feb 15, 2019
459c11e
fix build error
ganga1980 Feb 20, 2019
77582df
fix lint error
ganga1980 Feb 20, 2019
86b7364
Merge remote-tracking branch 'upstream/dev' into dev
ganga1980 May 18, 2019
552d381
update region mapping
ganga1980 May 18, 2019
c345d65
order regions in sortorder
ganga1980 May 18, 2019
72aa35f
fix trailing whitespaces
ganga1980 May 18, 2019
f98956b
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
ganga1980 Jun 3, 2019
c284e2c
fix default log analytics region mapping
ganga1980 Jun 3, 2019
6849944
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
ganga1980 Jun 4, 2019
da318f6
merge upstream changes
ganga1980 Jul 15, 2019
c88769c
fix map index error if key not found
ganga1980 Jul 18, 2019
df2bd1b
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
ganga1980 Jul 19, 2019
20a1e9e
fix lint errors
ganga1980 Jul 19, 2019
36d0726
fix uninitialized error
ganga1980 Jul 20, 2019
5f2f854
get latest changes from upstream
ganga1980 Nov 26, 2019
38eb2f9
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
ganga1980 Dec 1, 2019
6e5e85f
update to new API version for ARO
ganga1980 Dec 2, 2019
6fbbcc6
use latest api version for ARO
ganga1980 Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/acs/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def get_container_service_client(cli_ctx, **_):
def get_osa_container_service_client(cli_ctx, **_):
from azure.mgmt.containerservice import ContainerServiceClient

return get_mgmt_service_client(cli_ctx, ContainerServiceClient, api_version='2019-04-30')
return get_mgmt_service_client(cli_ctx, ContainerServiceClient, api_version='2019-09-30-preview')


def get_graph_rbac_management_client(cli_ctx, **_):
Expand Down
46 changes: 17 additions & 29 deletions src/azure-cli/azure/cli/command_modules/acs/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,14 @@
from azure.mgmt.containerservice.v2019_08_01.models import AgentPool
from azure.mgmt.containerservice.v2019_08_01.models import ResourceReference

from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAgentPoolProfile
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftAgentPoolProfileRole
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterIdentityProvider
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAADIdentityProvider
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedCluster
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftRouterProfile
from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAuthProfile
from azure.mgmt.containerservice.v2019_04_30.models import NetworkProfile
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedCluster as OpenShiftManagedClusterMonitor # pylint: disable=line-too-long
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterAgentPoolProfile
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftAgentPoolProfileRole
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterIdentityProvider
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterAADIdentityProvider
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedCluster
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftRouterProfile
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterAuthProfile
from azure.mgmt.containerservice.v2019_09_30_preview.models import NetworkProfile
from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterMonitorProfile

from ._client_factory import cf_container_services
Expand Down Expand Up @@ -3208,26 +3207,15 @@ def openshift_create(cmd, client, resource_group_name, name, # pylint: disable=
monitor_profile = None

network_profile = NetworkProfile(vnet_cidr=vnet_prefix, peer_vnet_id=vnet_peer)

if monitor_profile is not None:
osamc = OpenShiftManagedClusterMonitor(
location=location, tags=tags,
open_shift_version="v3.11",
network_profile=network_profile,
auth_profile=auth_profile,
agent_pool_profiles=agent_pool_profiles,
master_pool_profile=agent_master_pool_profile,
router_profiles=[default_router_profile],
monitor_profile=monitor_profile)
else:
osamc = OpenShiftManagedCluster(
location=location, tags=tags,
open_shift_version="v3.11",
network_profile=network_profile,
auth_profile=auth_profile,
agent_pool_profiles=agent_pool_profiles,
master_pool_profile=agent_master_pool_profile,
router_profiles=[default_router_profile])
osamc = OpenShiftManagedCluster(
location=location, tags=tags,
open_shift_version="v3.11",
network_profile=network_profile,
auth_profile=auth_profile,
agent_pool_profiles=agent_pool_profiles,
master_pool_profile=agent_master_pool_profile,
router_profiles=[default_router_profile],
monitor_profile=monitor_profile)

try:
# long_running_operation_timeout=300
Expand Down