Add support for different Azure Cloud environments in the metricbeat azure module #21044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
botelastic
bot
added
the
needs_team
narph
added
[zube]: In Progress
Team:Platforms
|
Pinging @elastic/integrations-platforms (Team:Platforms) |
botelastic
bot
removed
the
needs_team
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
narph
added
[zube]: In Review
needs_backport
ChrsMark
reviewed
Oct 29, 2020
| 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) |
There was a problem hiding this comment.
Could this function be called with just config as input to avoid this unfolding and the extra assignments bellow?
There was a problem hiding this comment.
you mean the auth.NewClientCredentialsConfig, this is part of the azure sdk so we cannot pass the config we have.
| metricsDefinitionClient := insights.NewMetricDefinitionsClient(subscriptionId) | ||
| resourceClient := resources.NewClient(subscriptionId) | ||
| metricNamespaceClient := insights.NewMetricNamespacesClient(subscriptionId) | ||
| metricsClient := insights.NewMetricsClientWithBaseURI(config.ResourceManagerEndpoint, config.SubscriptionId) |
There was a problem hiding this comment.
Same as above, could this one take only one argument config instead of multiple values of config?
There was a problem hiding this comment.
same , this is part of the sdk, and to instantiate the metrics client is asking for the separate values
ChrsMark
approved these changes
Oct 29, 2020
| 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) |
| metricsDefinitionClient := insights.NewMetricDefinitionsClient(subscriptionId) | ||
| resourceClient := resources.NewClient(subscriptionId) | ||
| metricNamespaceClient := insights.NewMetricNamespacesClient(subscriptionId) | ||
| metricsClient := insights.NewMetricsClientWithBaseURI(config.ResourceManagerEndpoint, config.SubscriptionId) |
narph
added a commit
to narph/beats
that referenced
this pull request
Oct 29, 2020
…azure module (elastic#21044) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)
6 tasks
narph
added a commit
to narph/beats
that referenced
this pull request
Oct 29, 2020
…azure module (elastic#21044) * mofidy doc * work * changelog * fix url * work * fmt update * err (cherry picked from commit 554d564)
6 tasks
v1v
added a commit
to v1v/beats
that referenced
this pull request
Oct 29, 2020
* 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) ...
v1v
added a commit
to v1v/beats
that referenced
this pull request
Oct 29, 2020
* 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) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Related issues