From ea492c5d1472062c560875157cc30cea9690c83c Mon Sep 17 00:00:00 2001 From: Yugang Wang Date: Sun, 25 Jun 2023 16:37:49 -0700 Subject: [PATCH 1/2] add examples for Prometheus --- src/amg/azext_amg/_help.py | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/amg/azext_amg/_help.py b/src/amg/azext_amg/_help.py index 050304bd915..d34641018d5 100644 --- a/src/amg/azext_amg/_help.py +++ b/src/amg/azext_amg/_help.py @@ -67,7 +67,6 @@ - name: create a data source of Azure Monitor using Managed Identity text: | az grafana data-source create -n MyGrafana --definition '{ - "uid": "5SjzhUu4n", "access": "proxy", "jsonData": { "azureAuthType": "msi", @@ -79,7 +78,6 @@ - name: create a data source of Azure Monitor using App Registration text: | az grafana data-source create -n MyGrafana --definition '{ - "uid": "5SjzhUu4z", "name": "Azure Monitor-2", "type": "grafana-azure-monitor-datasource", "access": "proxy", @@ -95,7 +93,6 @@ - name: create a data source of Azure Data Explorer using Managed Identity text: | az grafana data-source create -n MyGrafana --definition '{ - "uid": "3JTnaUuVz", "name": "Azure Data Explorer Datasource-2", "type": "grafana-azure-data-explorer-datasource", "access": "proxy", @@ -107,7 +104,6 @@ - name: create a data source of Azure Data Explorer using App Registration text: | az grafana data-source create -n MyGrafana --definition '{ - "uid": "uEi-b8X4k", "name": "Azure Data Explorer Datasource-1", "type": "grafana-azure-data-explorer-datasource", "access": "proxy", @@ -122,6 +118,37 @@ }, "secureJsonData": { "azureClientSecret": "verySecret" } }' + - name: create a data source of Azure Managed Prometheus using App Registration + text: | + az grafana data-source create -n MyGrafana --definition '{ + "name": "Azure Managed Prometheus-1", + "type": "prometheus", + "access": "proxy", + "url": "https://myprom-abcd.westcentralus.prometheus.monitor.azure.com", + "jsonData": { + "httpMethod": "POST", + "azureCredentials": { + "authType": "clientsecret", + "azureCloud": "AzureCloud", + "tenantId": "72f988bf-86f1-41af-91ab-111111111111", + "clientId": "fb31a2f5-9122-4be9-9705-111111111111" + }, + "timeInterval": "30s" + }, + "secureJsonData": { "azureClientSecret": "verySecret" } + }' + - name: create a data source of Azure Managed Prometheus using managed identity + text: | + az grafana data-source create -n MyGrafana --definition '{ + "name": "Azure Managed Prometheus-1", + "type": "prometheus", + "access": "proxy", + "url": "https://myprom-jryu.westcentralus.prometheus.monitor.azure.com", + "jsonData": { + "httpMethod": "POST", + "azureCredentials": { "authType": "msi" } + } + }' - name: create a data source of Azure SQL text: | az grafana data-source create -n MyGrafana --definition '{ From 1c7c0ef24f1004c961e6fc14f3d5ce03116b810f Mon Sep 17 00:00:00 2001 From: Yugang Wang Date: Sun, 25 Jun 2023 17:26:46 -0700 Subject: [PATCH 2/2] update version --- src/amg/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amg/setup.py b/src/amg/setup.py index 4ea1b59bc08..08ba2101a05 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 = '1.2.5' +VERSION = '1.2.6' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers