Merge pull request #47 from PakDLiu/donaliu/sapmonitortags

Added tags field to SAP Monitor create
Azure · Jun 3, 2020 · 26e6509 · 26e6509
2 parents 4a19056 + ed4339d
commit 26e6509
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+0.6.3 (2020-06-02)
+++++++++++++++++++
+
+- Added tags field to SAP Monitor create
+
 0.6.2 (2020-05-18)
 ++++++++++++++++++
 

diff --git a/azext_hanaonazure/_params.py b/azext_hanaonazure/_params.py
@@ -6,7 +6,8 @@
 # pylint: disable=line-too-long
 
 from azure.cli.core.commands.parameters import (resource_group_name_type,
-                                                get_location_type)
+                                                get_location_type,
+                                                tags_type)
 
 
 def load_arguments(self, _):
@@ -51,6 +52,7 @@ def load_arguments(self, _):
             '--disable_customer_analytics', '--dca'], help="Disable sending analytics to Microsoft")
         c.argument('log_analytics_workspace_arm_id', options_list=[
             '--log-analytics-workspace-arm-id', '--lawsid'], help="Existing log analytics workspace id to use for log monitoring")
+        c.argument('tags', tags_type)
     with self.argument_context('sapmonitor provider-instance') as c:
         c.argument('provider_instance_name', options_list=[
             '--provider-instance-name'], help="The name of the provider instance.")

diff --git a/azext_hanaonazure/custom.py b/azext_hanaonazure/custom.py
@@ -112,7 +112,8 @@ def create_sapmonitor(
         hana_db_password_key_vault_url=None,
         key_vault_id=None,
         disable_customer_analytics=False,
-        log_analytics_workspace_arm_id=None):
+        log_analytics_workspace_arm_id=None,
+        tags=None):
 
     monitoring_details = {}
 
@@ -142,7 +143,8 @@ def create_sapmonitor(
     monitoring_details.update({
         "location": region,
         "monitorSubnet": hana_subnet,
-        "enableCustomerAnalytics": not disable_customer_analytics
+        "enableCustomerAnalytics": not disable_customer_analytics,
+        "tags": tags
     })
 
     # Try creating using new API version

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "0.6.2"
+VERSION = "0.6.3"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',