diff --git a/src/amg/HISTORY.rst b/src/amg/HISTORY.rst index beaa9c0e81a..2f05258acc7 100644 --- a/src/amg/HISTORY.rst +++ b/src/amg/HISTORY.rst @@ -138,7 +138,10 @@ Release History * `az grafana integrations monitor delete`: support optional subscription id argument for multi-subscription scenarios * `az grafana notification-channel`: deprecate command group as part of Grafana legacy alerting deprecation - 2.6.1 ++++++ -* Remove msrestazure dependency \ No newline at end of file +* Remove msrestazure dependency + +2.7.0 +++++++ +* `az grafana api-key`: deprecate command group as Grafana Labs is sunsetting API keys \ No newline at end of file diff --git a/src/amg/azext_amg/_help.py b/src/amg/azext_amg/_help.py index 2ae30bd4659..c45cf113d8c 100644 --- a/src/amg/azext_amg/_help.py +++ b/src/amg/azext_amg/_help.py @@ -368,7 +368,8 @@ helps['grafana api-key'] = """ type: group - short-summary: Commands to manage api keys. + short-summary: Commands to manage API keys. + long-summary: API keys are deprecated by Grafana Labs and will not be supported in Grafana 12 and above. Please use service accounts instead. """ helps['grafana api-key create'] = """ diff --git a/src/amg/azext_amg/commands.py b/src/amg/azext_amg/commands.py index edc0909d227..c1894dce93a 100644 --- a/src/amg/azext_amg/commands.py +++ b/src/amg/azext_amg/commands.py @@ -54,7 +54,7 @@ def load_command_table(self, _): g.custom_show_command('show', 'show_user') g.custom_command('actual-user', 'get_actual_user') - with self.command_group('grafana api-key') as g: + with self.command_group('grafana api-key', deprecate_info=self.deprecate()) as g: g.custom_command('create', 'create_api_key') g.custom_command('list', 'list_api_keys') g.custom_command('delete', 'delete_api_key') diff --git a/src/amg/setup.py b/src/amg/setup.py index 9c185aa2bb3..de5284b9969 100644 --- a/src/amg/setup.py +++ b/src/amg/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '2.6.1' +VERSION = '2.7.0' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers