Skip to content

N
nexpie-grafana-theme
Commit a6f2ae1f by sam Committed by GitHub
Options

AzureMonitor: Fix Log Analytics and Application Insights for Azure China (#21803) (#22753) 

Something funky going on with GitHub - the build has passed.
parent 59467d3c
Showing with 84 additions and 0 deletions
public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts
...@@ -24,7 +24,23 @@ export default class AppInsightsDatasource { ...@@ -24,7 +24,23 @@ export default class AppInsightsDatasource {
constructor(instanceSettings: DataSourceInstanceSettings<AzureDataSourceJsonData>, private templateSrv: TemplateSrv) { constructor(instanceSettings: DataSourceInstanceSettings<AzureDataSourceJsonData>, private templateSrv: TemplateSrv) {
this.id = instanceSettings.id; this.id = instanceSettings.id;
this.applicationId = instanceSettings.jsonData.appInsightsAppId; this.applicationId = instanceSettings.jsonData.appInsightsAppId;
switch (instanceSettings.jsonData.cloudName) {
// Azure US Government
case 'govazuremonitor':
break;
// Azure Germany
case 'germanyazuremonitor':
break;
// Azue China
case 'chinaazuremonitor':
this.baseUrl = `/chinaappinsights/${this.version}/apps/${this.applicationId}`;
break;
// Azure Global
default:
this.baseUrl = `/appinsights/${this.version}/apps/${this.applicationId}`; this.baseUrl = `/appinsights/${this.version}/apps/${this.applicationId}`;
}
this.url = instanceSettings.url; this.url = instanceSettings.url;
} }
......
public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts
...@@ -21,7 +21,20 @@ export default class AzureLogAnalyticsDatasource { ...@@ -21,7 +21,20 @@ export default class AzureLogAnalyticsDatasource {
private templateSrv: TemplateSrv private templateSrv: TemplateSrv
) { ) {
this.id = instanceSettings.id; this.id = instanceSettings.id;
switch (this.instanceSettings.jsonData.cloudName) {
case 'govazuremonitor': // Azure US Government
break;
case 'germanyazuremonitor': // Azure Germany
break;
case 'chinaazuremonitor': // Azue China
this.baseUrl = '/chinaloganalyticsazure';
break;
default:
// Azure Global
this.baseUrl = '/loganalyticsazure'; this.baseUrl = '/loganalyticsazure';
}
this.url = instanceSettings.url; this.url = instanceSettings.url;
this.defaultOrFirstWorkspace = this.instanceSettings.jsonData.logAnalyticsDefaultWorkspace; this.defaultOrFirstWorkspace = this.instanceSettings.jsonData.logAnalyticsDefaultWorkspace;
...@@ -43,9 +56,21 @@ export default class AzureLogAnalyticsDatasource { ...@@ -43,9 +56,21 @@ export default class AzureLogAnalyticsDatasource {
this.azureMonitorUrl = `/${azureCloud}/subscriptions`; this.azureMonitorUrl = `/${azureCloud}/subscriptions`;
} else { } else {
this.subscriptionId = this.instanceSettings.jsonData.logAnalyticsSubscriptionId; this.subscriptionId = this.instanceSettings.jsonData.logAnalyticsSubscriptionId;
switch (this.instanceSettings.jsonData.cloudName) {
case 'govazuremonitor': // Azure US Government
break;
case 'germanyazuremonitor': // Azure Germany
break;
case 'chinaazuremonitor': // Azue China
this.azureMonitorUrl = `/chinaworkspacesloganalytics/subscriptions`;
break;
default:
// Azure Global
this.azureMonitorUrl = `/workspacesloganalytics/subscriptions`; this.azureMonitorUrl = `/workspacesloganalytics/subscriptions`;
} }
} }
}
getWorkspaces(subscription: string): Promise<AzureLogsVariable[]> { getWorkspaces(subscription: string): Promise<AzureLogsVariable[]> {
const subscriptionId = this.templateSrv.replace(subscription || this.subscriptionId); const subscriptionId = this.templateSrv.replace(subscription || this.subscriptionId);
......
public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json
...@@ -99,6 +99,15 @@ ...@@ -99,6 +99,15 @@
] ]
}, },
{ {
"path": "chinaappinsights",
"method": "GET",
"url": "https://api.applicationinsights.azure.cn",
"headers": [
{ "name": "X-API-Key", "content": "{{.SecureJsonData.appInsightsApiKey}}" },
{ "name": "x-ms-app", "content": "Grafana" }
]
},
{
"path": "workspacesloganalytics", "path": "workspacesloganalytics",
"method": "GET", "method": "GET",
"url": "https://management.azure.com", "url": "https://management.azure.com",
...@@ -114,6 +123,21 @@ ...@@ -114,6 +123,21 @@
"headers": [{ "name": "x-ms-app", "content": "Grafana" }] "headers": [{ "name": "x-ms-app", "content": "Grafana" }]
}, },
{ {
"path": "chinaworkspacesloganalytics",
"method": "GET",
"url": "https://management.chinacloudapi.cn",
"tokenAuth": {
"url": "https://login.chinacloudapi.cn/{{.JsonData.logAnalyticsTenantId}}/oauth2/token",
"params": {
"grant_type": "client_credentials",
"client_id": "{{.JsonData.logAnalyticsClientId}}",
"client_secret": "{{.SecureJsonData.logAnalyticsClientSecret}}",
"resource": "https://management.chinacloudapi.cn/"
}
},
"headers": [{ "name": "x-ms-app", "content": "Grafana" }]
},
{
"path": "loganalyticsazure", "path": "loganalyticsazure",
"method": "GET", "method": "GET",
"url": "https://api.loganalytics.io/v1/workspaces", "url": "https://api.loganalytics.io/v1/workspaces",
...@@ -131,6 +155,25 @@ ...@@ -131,6 +155,25 @@
{ "name": "Cache-Control", "content": "public, max-age=60" }, { "name": "Cache-Control", "content": "public, max-age=60" },
{ "name": "Accept-Encoding", "content": "gzip" } { "name": "Accept-Encoding", "content": "gzip" }
] ]
},
{
"path": "chinaloganalyticsazure",
"method": "GET",
"url": "https://api.loganalytics.azure.cn/v1/workspaces",
"tokenAuth": {
"url": "https://login.chinacloudapi.cn/{{.JsonData.logAnalyticsTenantId}}/oauth2/token",
"params": {
"grant_type": "client_credentials",
"client_id": "{{.JsonData.logAnalyticsClientId}}",
"client_secret": "{{.SecureJsonData.logAnalyticsClientSecret}}",
"resource": "https://api.loganalytics.azure.cn"
}
},
"headers": [
{ "name": "x-ms-app", "content": "Grafana" },
{ "name": "Cache-Control", "content": "public, max-age=60" },
{ "name": "Accept-Encoding", "content": "gzip" }
]
} }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment