Add support for different Azure Cloud environments in the metricbeat azure module by narph · Pull Request #21044 · elastic/beats

narph · 2020-09-09T16:10:35Z

What does this PR do?

Adds support for different Azure Cloud environments in the metricbeat azure module

Adds 2 config options (similar to the filebeat azure module):

resource_manager_endpoint ::
string
Optional, by default the azure public environment is being used, to override, users can provide a specific resource manager endpoint in order to use a different azure environment.
Ex:
https://management.chinacloudapi.cn for azure ChinaCloud
https://management.microsoftazure.de for azure GermanCloud
https://management.azure.com for azure PublicCloud
https://management.usgovcloudapi.net for azure USGovernmentCloud

active_directory_endpoint ::
string
Optional, by default the associated active directory endpoint to the resource manager endpoint is being used, to override, users can provide a specific active directory endpoint in order to use a different azure environment.
Ex:
https://login.microsoftonline.com for azure ChinaCloud
https://login.microsoftonline.us for azure GermanCloud
https://login.chinacloudapi.cn for azure PublicCloud
https://login.microsoftonline.de for azure USGovernmentCloud

Why is it important?

Adds support for different Azure Cloud environments in the metricbeat azure module

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Closes Add support for different Azure Cloud environments in Metricbeat #20988

elasticmachine · 2020-09-09T16:11:40Z

Pinging @elastic/integrations-platforms (Team:Platforms)

elasticmachine · 2020-09-09T16:16:21Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: [Pull request #21044 updated]
Start Time: 2020-10-28T14:58:36.388+0000
Duration: 50 min 42 sec

Test stats 🧪

Test	Results
Failed	0
Passed	2669
Skipped	576
Total	3245

elasticmachine · 2020-10-28T14:07:20Z

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	2669
Skipped	576
Total	3245

ChrsMark

Looks good! Left one minor, let me know you think :)!

ChrsMark · 2020-10-29T09:16:46Z

x-pack/metricbeat/module/azure/monitor_service.go

-func NewService(clientId string, clientSecret string, tenantId string, subscriptionId string) (*MonitorService, error) {
-	clientConfig := auth.NewClientCredentialsConfig(clientId, clientSecret, tenantId)
+func NewService(config Config) (*MonitorService, error) {
+	clientConfig := auth.NewClientCredentialsConfig(config.ClientId, config.ClientSecret, config.TenantId)


Could this function be called with just config as input to avoid this unfolding and the extra assignments bellow?

you mean the auth.NewClientCredentialsConfig, this is part of the azure sdk so we cannot pass the config we have.

ah, I see 👍🏼

ChrsMark · 2020-10-29T09:17:47Z

x-pack/metricbeat/module/azure/monitor_service.go

-	metricsDefinitionClient := insights.NewMetricDefinitionsClient(subscriptionId)
-	resourceClient := resources.NewClient(subscriptionId)
-	metricNamespaceClient := insights.NewMetricNamespacesClient(subscriptionId)
+	metricsClient := insights.NewMetricsClientWithBaseURI(config.ResourceManagerEndpoint, config.SubscriptionId)


Same as above, could this one take only one argument config instead of multiple values of config?

same , this is part of the sdk, and to instantiate the metrics client is asking for the separate values

ChrsMark · 2020-10-29T09:55:34Z

x-pack/metricbeat/module/azure/monitor_service.go

-func NewService(clientId string, clientSecret string, tenantId string, subscriptionId string) (*MonitorService, error) {
-	clientConfig := auth.NewClientCredentialsConfig(clientId, clientSecret, tenantId)
+func NewService(config Config) (*MonitorService, error) {
+	clientConfig := auth.NewClientCredentialsConfig(config.ClientId, config.ClientSecret, config.TenantId)


ah, I see 👍🏼

ChrsMark · 2020-10-29T09:55:39Z

x-pack/metricbeat/module/azure/monitor_service.go

-	metricsDefinitionClient := insights.NewMetricDefinitionsClient(subscriptionId)
-	resourceClient := resources.NewClient(subscriptionId)
-	metricNamespaceClient := insights.NewMetricNamespacesClient(subscriptionId)
+	metricsClient := insights.NewMetricsClientWithBaseURI(config.ResourceManagerEndpoint, config.SubscriptionId)


…azure module (elastic#21044) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)

* upstream/master: (93 commits) Update commands used in the quick start (elastic#22248) Add interval documentation to `monitor` metricset (elastic#22152) [CI] enable x-pack/packetbeat in the CI (elastic#22252) Fix awscloudwatch input documentation (elastic#22247) Add support for different Azure Cloud environments in the metricbeat azure module (elastic#21044) [CI] support windows-2008-r2 (elastic#19791) protect against accessing undefined variables in sysmon module (elastic#22236) [CI] archive only if failed steps (elastic#22220) Add pe fields to Sysmon module (elastic#22217) [CI][flaky] Support 7.x branches and PRs (elastic#22197) Perfmon - Fix regular expressions to comply to multiple parentheses in instance name and object (elastic#22146) ci: improve linting speed (elastic#22103) Move cloudfoundry tags with metadata to common metadata fields (elastic#22150) [Docs] Update custom beat docs (elastic#22194) [Ingest Manager] Agent fix snapshot download for upgrade (elastic#22175) Update shared-autodiscover.asciidoc (elastic#21827) [DOCS] Warn about compression and Azure Event Hub for Kafka (elastic#21578) [CI][flaky] reporting for PRs in GitHub (elastic#21853) [Packetbeat] Create x-pack magefile (elastic#21979) [Elastic Agent] Fix deb/rpm installation (elastic#22153) ...

…azure module (#21044) (#22264) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)

…azure module (#21044) (#22262) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)

narph added 21 commits July 23, 2020 11:01

mofidy doc

938e66c

Merge branch 'master' of github.com:elastic/beats

4daef08

Merge branch 'master' of github.com:elastic/beats

b613178

Merge branch 'master' of github.com:elastic/beats

05364cf

Merge branch 'master' of github.com:elastic/beats

f147c4d

Merge branch 'master' of github.com:elastic/beats

4574718

Merge branch 'master' of github.com:elastic/beats

1e43077

Merge branch 'master' of github.com:elastic/beats

807cf06

Merge branch 'master' of github.com:elastic/beats

2096668

Merge branch 'master' of github.com:elastic/beats

da8ac1f

Merge branch 'master' of github.com:elastic/beats

c2d8930

Merge branch 'master' of github.com:elastic/beats

7bd9e73

Merge branch 'master' of github.com:elastic/beats

6e89a84

Merge branch 'master' of github.com:elastic/beats

bdf21e9

Merge branch 'master' of github.com:elastic/beats

7833687

Merge branch 'master' of github.com:elastic/beats

bbf6178

Merge branch 'master' of github.com:elastic/beats

4ba8817

Merge branch 'master' of github.com:elastic/beats

0cba5dc

Merge branch 'master' of github.com:elastic/beats

b2625ca

Merge branch 'master' of github.com:elastic/beats

5100e6a

work

0c798b2

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2020

narph self-assigned this Sep 9, 2020

narph added [zube]: In Progress Team:Platforms Label for the Integrations - Platforms team labels Sep 9, 2020

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2020

changelog

9ad71ce

fix url

d521c2a

narph added 12 commits October 2, 2020 17:41

Merge branch 'master' of github.com:elastic/beats

0a42bbe

Merge branch 'master' of github.com:elastic/beats

0bedffe

Merge branch 'master' of github.com:elastic/beats

2eb7142

Merge branch 'master' of github.com:elastic/beats

f9e4522

Merge branch 'master' of github.com:elastic/beats

227bd50

Merge branch 'master' of github.com:elastic/beats

6e39971

Merge branch 'master' of github.com:elastic/beats

0e85625

Merge branch 'master' of github.com:elastic/beats

6770f2d

Merge branch 'master' of github.com:elastic/beats

63ab6a7

Merge branch 'master' of github.com:elastic/beats

6358eb8

Merge branch 'master' of github.com:elastic/beats

8a9c382

Merge branch 'master' into azure-gov

bfd3b3d

narph added 2 commits October 28, 2020 15:49

fmt update

ce2289b

err

2bae4fc

narph added [zube]: In Review needs_backport PR is waiting to be backported to other branches. and removed [zube]: In Progress labels Oct 29, 2020

ChrsMark reviewed Oct 29, 2020

View reviewed changes

ChrsMark approved these changes Oct 29, 2020

View reviewed changes

narph merged commit 554d564 into elastic:master Oct 29, 2020

narph deleted the azure-gov branch October 29, 2020 13:18

narph mentioned this pull request Oct 29, 2020

Cherry-pick #21044 to 7.x: Add support for different Azure Cloud environments in the metricbeat azure module #22262

Merged

6 tasks

narph mentioned this pull request Oct 29, 2020

Cherry-pick #21044 to 7.10: Add support for different Azure Cloud environments in the metricbeat azure module #22264

Merged

6 tasks

narph added a commit that referenced this pull request Oct 30, 2020

Add support for different Azure Cloud environments in the metricbeat …

6078d4c

…azure module (#21044) (#22264) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)

narph added a commit that referenced this pull request Oct 30, 2020

Add support for different Azure Cloud environments in the metricbeat …

92b51e6

…azure module (#21044) (#22262) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)

Conversation

narph commented Sep 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Checklist

Related issues

Uh oh!

elasticmachine commented Sep 9, 2020

Uh oh!

elasticmachine commented Sep 9, 2020 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

Uh oh!

elasticmachine commented Oct 28, 2020 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Flaky test report

Test stats 🧪

Uh oh!

ChrsMark left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

narph commented Sep 9, 2020 •

edited

Loading

elasticmachine commented Sep 9, 2020 •

edited by jenkins-beats-ci bot

Loading

elasticmachine commented Oct 28, 2020 •

edited by jenkins-beats-ci bot

Loading