Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick #20406 to 7.9: Makes metrics config option required in app_insights #20424

Merged
merged 1 commit into from
Aug 4, 2020
Merged

Cherry-pick #20406 to 7.9: Makes metrics config option required in app_insights #20424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix overflow on Prometheus rates when new buckets are added on the go. {pull}17753[17753]
- Add a switch to the driver definition on SQL module to use pretty names {pull}17378[17378]
- Modify doc for app_insights metricset to contain example of config. {pull}20185[20185]
- Add required option for `metrics` in app_insights. {pull}20406[20406]
- Groups same timestamp metric values to one event in the app_insights metricset. {pull}20403[20403]

*Packetbeat*
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/docs/modules/azure.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ metricbeat.modules:
period: 300s
application_id: ''
api_key: ''

metrics:
- id: ["requests/count", "requests/duration"]
----

[float]
Expand Down
3 changes: 2 additions & 1 deletion x-pack/metricbeat/metricbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ metricbeat.modules:
period: 300s
application_id: ''
api_key: ''

metrics:
- id: ["requests/count", "requests/duration"]

#--------------------------------- Beat Module ---------------------------------
- module: beat
Expand Down
3 changes: 2 additions & 1 deletion x-pack/metricbeat/module/azure/_meta/config.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,5 @@
period: 300s
application_id: ''
api_key: ''

metrics:
- id: ["requests/count", "requests/duration"]
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/azure/_meta/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,5 @@
# period: 300s
# application_id: ''
# api_key: ''
# metrics:
# - id: ["requests/count", "requests/duration"]
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/azure/app_insights/app_insights.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Config struct {
ApplicationId string `config:"application_id" validate:"required"`
ApiKey string `config:"api_key" validate:"required"`
Period time.Duration `config:"period" validate:"nonzero,required"`
Metrics []Metric `config:"metrics"`
Metrics []Metric `config:"metrics" validate:"required"`
}

// Metric struct used for configuration options
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/modules.d/azure.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,5 @@
# period: 300s
# application_id: ''
# api_key: ''
# metrics:
# - id: ["requests/count", "requests/duration"]