Skip to content

Commit

Permalink
Convert Monitor module. (Azure#5125)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjprescott authored Dec 18, 2017
1 parent 201faf9 commit 0ce3106
Show file tree
Hide file tree
Showing 26 changed files with 1,161 additions and 1,347 deletions.
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ exclude =
scripts
doc
build_scripts
src/command_modules/azure-cli-monitor

15 changes: 15 additions & 0 deletions azure-cli.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,23 @@
<Compile Include="command_modules\azure-cli-lab\azure_bdist_wheel.py" />
<Compile Include="command_modules\azure-cli-lab\setup.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\commands.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\actions.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\action_groups.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\activity_log.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\activity_log_alerts.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\autoscale_settings.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\diagnostics_settings.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\metric_alert.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\__init__.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_activity_log_components.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_activity_log_scenario.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_custom.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor_action_groups.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor_activity_log_alert.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor_metrics.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor_metric_alert_scenarios.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\test_monitor_unittest.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\transformers.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\util.py" />
<Compile Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\_exception_handler.py">
Expand Down Expand Up @@ -862,6 +875,7 @@
<Folder Include="command_modules\azure-cli-monitor\azure\cli\" />
<Folder Include="command_modules\azure-cli-monitor\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\" />
<Folder Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\" />
<Folder Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\tests\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\" />
Expand Down Expand Up @@ -1056,6 +1070,7 @@
<Content Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\tests\docdbenv_paramters.json" />
<Content Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\tests\lab_template.json" />
<Content Include="command_modules\azure-cli-lab\HISTORY.rst" />
<Content Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\operations\autoscale-parameters-template.json" />
<Content Include="command_modules\azure-cli-monitor\HISTORY.rst" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail1.txt" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail2.txt" />
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/test_static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ run_style azure.cli.core
run_style azure.cli.command_modules.acr
run_style azure.cli.command_modules.acs
run_style azure.cli.command_modules.advisor
#run_style azure.cli.command_modules.appservice
run_style azure.cli.command_modules.appservice
run_style azure.cli.command_modules.backup
run_style azure.cli.command_modules.batch
run_style azure.cli.command_modules.batchai
Expand All @@ -59,7 +59,7 @@ run_style azure.cli.command_modules.interactive
run_style azure.cli.command_modules.iot
run_style azure.cli.command_modules.keyvault
run_style azure.cli.command_modules.lab
#run_style azure.cli.command_modules.monitor
run_style azure.cli.command_modules.monitor
run_style azure.cli.command_modules.network
run_style azure.cli.command_modules.profile
run_style azure.cli.command_modules.rdbms
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,47 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import azure.cli.command_modules.monitor._help # pylint: disable=unused-import
from azure.cli.core import AzCommandsLoader
from azure.cli.core.commands import AzArgumentContext

from azure.cli.command_modules.monitor._help import helps # pylint: disable=unused-import

def load_params(_):
import azure.cli.command_modules.monitor._params # pylint: disable=redefined-outer-name, unused-variable

# pylint: disable=line-too-long
class MonitorArgumentContext(AzArgumentContext):

def load_commands():
import azure.cli.command_modules.monitor.commands # pylint: disable=redefined-outer-name, unused-variable
def resource_parameter_context(self, dest, arg_group=None, required=True):
from azure.cli.command_modules.monitor.validators import get_target_resource_validator
self.argument(dest, options_list='--resource', arg_group=arg_group, required=required, validator=get_target_resource_validator(dest, required), help="Name or ID of the target resource.")
self.extra('namespace', options_list='--resource-namespace', arg_group=arg_group, help="Target resource provider namespace.")
self.extra('parent', options_list='--resource-parent', arg_group=arg_group, help="Target resource parent path, if applicable.")
self.extra('resource_type', options_list='--resource-type', arg_group=arg_group, help="Target resource type. Can also accept namespace/type format (Ex: 'Microsoft.Compute/virtualMachines)')")
self.extra('resource_group_name', options_list=('--resource-group', '-g'), arg_group='Target Resource')

def resource_parameter(self, dest, arg_group=None, required=True):
""" Helper method to add the extra parameters needed to support specifying name or ID for target resources. """
from azure.cli.command_modules.monitor.validators import get_target_resource_validator
self.argument(dest, options_list=['--{}'.format(dest)], arg_group=arg_group, required=required, validator=get_target_resource_validator(dest, required, preserve_resource_group_parameter=True), help="Name or ID of the target resource.")
self.extra('namespace', options_list=['--{}-namespace'.format(dest)], arg_group=arg_group, help="Target resource provider namespace.")
self.extra('parent', options_list=['--{}-parent'.format(dest)], arg_group=arg_group, help="Target resource parent path, if applicable.")
self.extra('resource_type', options_list=['--{}-type'.format(dest)], arg_group=arg_group, help="Target resource type. Can also accept namespace/type format (Ex: 'Microsoft.Compute/virtualMachines)')")


class MonitorCommandsLoader(AzCommandsLoader):

def __init__(self, cli_ctx=None):
super(MonitorCommandsLoader, self).__init__(cli_ctx=cli_ctx,
min_profile='2017-03-10-profile',
argument_context_cls=MonitorArgumentContext)

def load_command_table(self, args):
from azure.cli.command_modules.monitor.commands import load_command_table
load_command_table(self, args)
return self.command_table

def load_arguments(self, command):
from azure.cli.command_modules.monitor._params import load_arguments
load_arguments(self, command)


COMMAND_LOADER_CLS = MonitorCommandsLoader
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,51 @@


# MANAGEMENT CLIENT FACTORIES
def cf_monitor(_):
def cf_monitor(cli_ctx, _):
from azure.mgmt.monitor import MonitorManagementClient
from azure.cli.core.commands.client_factory import get_mgmt_service_client
return get_mgmt_service_client(MonitorManagementClient)
return get_mgmt_service_client(cli_ctx, MonitorManagementClient)


def cf_alert_rules(kwargs):
return cf_monitor(kwargs).alert_rules
def cf_alert_rules(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).alert_rules


def cf_alert_rule_incidents(kwargs):
return cf_monitor(kwargs).alert_rule_incidents
def cf_alert_rule_incidents(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).alert_rule_incidents


def cf_autoscale(kwargs):
return cf_monitor(kwargs).autoscale_settings
def cf_autoscale(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).autoscale_settings


def cf_diagnostics(kwargs):
return cf_monitor(kwargs).diagnostic_settings
def cf_diagnostics(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).diagnostic_settings


def cf_log_profiles(kwargs):
return cf_monitor(kwargs).log_profiles
def cf_log_profiles(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).log_profiles


def cf_action_groups(kwargs):
return cf_monitor(kwargs).action_groups
def cf_action_groups(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).action_groups


def cf_activity_log_alerts(kwargs):
return cf_monitor(kwargs).activity_log_alerts
def cf_activity_log_alerts(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).activity_log_alerts


def cf_metrics(kwargs):
return cf_monitor(kwargs).metrics
def cf_metrics(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).metrics


def cf_metric_def(kwargs):
return cf_monitor(kwargs).metric_definitions
def cf_metric_def(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).metric_definitions


def cf_activity_log(kwargs):
return cf_monitor(kwargs).activity_logs
def cf_activity_log(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).activity_logs


def cf_event_categories(kwargs):
return cf_monitor(kwargs).event_categories
def cf_event_categories(cli_ctx, kwargs):
return cf_monitor(cli_ctx, kwargs).event_categories
Loading

0 comments on commit 0ce3106

Please sign in to comment.