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.

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

Add support for app_state metricset #20639

Merged
merged 44 commits into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
938e66c
mofidy doc
narph Jul 23, 2020
4daef08
Merge branch 'master' of github.com:elastic/beats
narph Aug 3, 2020
b613178
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
05364cf
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
f147c4d
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
4574718
Merge branch 'master' of github.com:elastic/beats
narph Aug 17, 2020
ac22f09
add metricset
narph Aug 17, 2020
b5724ef
chnagelog
narph Aug 17, 2020
3f5c674
config
narph Aug 19, 2020
1e43077
Merge branch 'master' of github.com:elastic/beats
narph Aug 19, 2020
807cf06
Merge branch 'master' of github.com:elastic/beats
narph Aug 24, 2020
2096668
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
da8ac1f
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
c2d8930
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
7bd9e73
Merge branch 'master' of github.com:elastic/beats
narph Aug 31, 2020
6e89a84
Merge branch 'master' of github.com:elastic/beats
narph Aug 31, 2020
bdf21e9
Merge branch 'master' of github.com:elastic/beats
narph Sep 2, 2020
7833687
Merge branch 'master' of github.com:elastic/beats
narph Sep 3, 2020
bbf6178
Merge branch 'master' of github.com:elastic/beats
narph Sep 4, 2020
4ba8817
Merge branch 'master' of github.com:elastic/beats
narph Sep 7, 2020
d9231c2
work on app_state
narph Sep 8, 2020
0cba5dc
Merge branch 'master' of github.com:elastic/beats
narph Sep 8, 2020
b2625ca
Merge branch 'master' of github.com:elastic/beats
narph Sep 8, 2020
5100e6a
Merge branch 'master' of github.com:elastic/beats
narph Sep 9, 2020
a302d31
Merge branch 'master' of github.com:elastic/beats
narph Sep 14, 2020
631d667
Merge branch 'master' of github.com:elastic/beats
narph Sep 15, 2020
35072a5
Merge branch 'master' of github.com:elastic/beats
narph Sep 17, 2020
4b2f87a
Merge branch 'master' of github.com:elastic/beats
narph Sep 22, 2020
f26b533
Merge branch 'master' of github.com:elastic/beats
narph Sep 28, 2020
3571726
Merge branch 'master' into app_stats
narph Sep 28, 2020
724ca95
remove extra
narph Sep 28, 2020
c61620d
Merge branch 'master' of github.com:elastic/beats
narph Sep 28, 2020
7d35e92
Merge branch 'master' into app_stats
narph Sep 28, 2020
1597e2f
fix changelog
narph Sep 28, 2020
269ecf0
mage fmt update
narph Sep 28, 2020
43f90c4
Merge branch 'master' of github.com:elastic/beats
narph Sep 30, 2020
2d28f07
Merge branch 'master' of github.com:elastic/beats
narph Oct 1, 2020
e0b944b
Merge branch 'master' into app_stats
narph Oct 1, 2020
4258e66
work on mapping fields
narph Oct 2, 2020
1f7ec8c
work on tests
narph Oct 2, 2020
88e6089
fix vis name
narph Oct 2, 2020
6483972
no default
narph Oct 2, 2020
602de0b
fix tests
narph Oct 2, 2020
fbab487
add headers
narph Oct 2, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add missing info about the rest of the azure metricsets in the documentation. {pull}19601[19601]
- Fix k8s scheduler compatibility issue. {pull}19699[19699]
- Fix SQL module mapping NULL values as string {pull}18955[18955] {issue}18898[18898
- Add support for azure light metricset app_stats. {pull}20639[20639]
- Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680]
- Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736]
- The Kibana collector applies backoff when errored at getting usage stats {pull}20772[20772]
Expand Down
223 changes: 215 additions & 8 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4665,6 +4665,16 @@ type: keyword
The subscription ID


type: keyword

--

*`azure.application_id`*::
+
--
The application ID


type: keyword

--
Expand Down Expand Up @@ -4696,17 +4706,44 @@ application insights



*`azure.app_insights.application_id`*::
*`azure.app_insights.start_date`*::
+
--
The application ID
The start date


type: keyword
type: date

--

*`azure.app_insights.start_date`*::
*`azure.app_insights.end_date`*::
+
--
The end date


type: date

--

*`azure.app_insights.metrics.*.*`*::
+
--
The metrics


type: object

--

[float]
=== app_state

application state



*`azure.app_state.start_date`*::
+
--
The start date
Expand All @@ -4716,7 +4753,7 @@ type: date

--

*`azure.app_insights.end_date`*::
*`azure.app_state.end_date`*::
+
--
The end date
Expand All @@ -4726,13 +4763,183 @@ type: date

--

*`azure.app_insights.metrics.*.*`*::
*`azure.app_state.requests_count.sum`*::
+
--
The metrics
Request count


type: object
type: float

--

*`azure.app_state.requests_failed.sum`*::
+
--
Request failed count


type: float

--

*`azure.app_state.users_count.unique`*::
+
--
User count


type: float

--

*`azure.app_state.sessions_count.unique`*::
+
--
Session count


type: float

--

*`azure.app_state.users_authenticated.unique`*::
+
--
Authenticated users count


type: float

--

*`azure.app_state.browser_timings_network_duration.avg`*::
+
--
Browser timings network duration


type: float

--

*`azure.app_state.browser_timings_send_duration.avg`*::
+
--
Browser timings send duration


type: float

--

*`azure.app_state.browser_timings_receive_uration.avg`*::
+
--
Browser timings receive duration


type: float

--

*`azure.app_state.browser_timings_processing_duration.avg`*::
+
--
Browser timings processing duration


type: float

--

*`azure.app_state.browser_timings_total_duration.avg`*::
+
--
Browser timings total duration


type: float

--

*`azure.app_state.exceptions_count.sum`*::
+
--
Exception count


type: float

--

*`azure.app_state.exceptions_browser.sum`*::
+
--
Exception count at browser level


type: float

--

*`azure.app_state.exceptions_server.sum`*::
+
--
Exception count at server level


type: float

--

*`azure.app_state.performance_counters_memory_available_bytes.avg`*::
+
--
Performance counters memory available bytes


type: float

--

*`azure.app_state.performance_counters_process_private_bytes.avg`*::
+
--
Performance counters process private bytes


type: float

--

*`azure.app_state.performance_counters_process_cpu_percentage_total.avg`*::
+
--
Performance counters process cpu percentage total


type: float

--

*`azure.app_state.performance_counters_process_cpu_percentage.avg`*::
+
--
Performance counters process cpu percentage


type: float

--

*`azure.app_state.performance_counters_processiobytes_per_second.avg`*::
+
--
Performance counters process IO bytes per second


type: float

--

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions metricbeat/docs/modules/azure.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ The Azure billing dashboards show relevant usage and forecast information:

image::./images/metricbeat-azure-billing-overview.png[]

The Azure app_state dashboard shows relevant application insights information:

image::./images/metricbeat-azure-app-state-overview.png[]

[float]
=== Module-specific configuration notes

Expand Down Expand Up @@ -120,6 +124,10 @@ so the `period` for `billing` metricset should be `24h` or multiples of `24h`.
=== `app_insights`
This metricset will collect application insights metrics, the `period` (interval) for the `app-insights` metricset is set by default at `300s`.

[float]
=== `app_state`
This metricset concentrate on the most relevant application insights metrics and provides a dashboard for visualization, the `period` (interval) for the `app_state` metricset is set by default at `300s`.

[float]
[[azure-api-cost]]
== Additional notes about metrics and costs
Expand Down Expand Up @@ -242,6 +250,14 @@ metricbeat.modules:
api_key: ''
metrics:
- id: ["requests/count", "requests/duration"]
- module: azure
metricsets:
- app_state
enabled: true
period: 300s
application_id: ''
api_key: ''
----

[float]
Expand All @@ -251,6 +267,8 @@ The following metricsets are available:

* <<metricbeat-metricset-azure-app_insights,app_insights>>

* <<metricbeat-metricset-azure-app_state,app_state>>

* <<metricbeat-metricset-azure-billing,billing>>

* <<metricbeat-metricset-azure-compute_vm,compute_vm>>
Expand All @@ -271,6 +289,8 @@ The following metricsets are available:

include::azure/app_insights.asciidoc[]

include::azure/app_state.asciidoc[]

include::azure/billing.asciidoc[]

include::azure/compute_vm.asciidoc[]
Expand Down
24 changes: 24 additions & 0 deletions metricbeat/docs/modules/azure/app_state.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
////
This file is generated! See scripts/mage/docs_collector.go
////

[[metricbeat-metricset-azure-app_state]]
[role="xpack"]
=== Azure app_state metricset

beta[]

include::../../../../x-pack/metricbeat/module/azure/app_state/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-azure,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../../x-pack/metricbeat/module/azure/app_state/_meta/data.json[]
----
3 changes: 2 additions & 1 deletion metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-metricset-aws-usage,usage>> beta[]
|<<metricbeat-metricset-aws-vpn,vpn>> beta[]
|<<metricbeat-module-azure,Azure>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.10+| .10+| |<<metricbeat-metricset-azure-app_insights,app_insights>> beta[]
.11+| .11+| |<<metricbeat-metricset-azure-app_insights,app_insights>> beta[]
|<<metricbeat-metricset-azure-app_state,app_state>> beta[]
|<<metricbeat-metricset-azure-billing,billing>> beta[]
|<<metricbeat-metricset-azure-compute_vm,compute_vm>>
|<<metricbeat-metricset-azure-compute_vm_scaleset,compute_vm_scaleset>>
Expand Down
8 changes: 8 additions & 0 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,14 @@ metricbeat.modules:
metrics:
- id: ["requests/count", "requests/duration"]

- module: azure
metricsets:
- app_state
enabled: true
period: 300s
application_id: ''
api_key: ''

#--------------------------------- Beat Module ---------------------------------
- module: beat
metricsets:
Expand Down
8 changes: 8 additions & 0 deletions x-pack/metricbeat/module/azure/_meta/config.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,11 @@
api_key: ''
metrics:
- id: ["requests/count", "requests/duration"]

- module: azure
metricsets:
- app_state
enabled: true
period: 300s
application_id: ''
api_key: ''
8 changes: 8 additions & 0 deletions x-pack/metricbeat/module/azure/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,11 @@
# api_key: ''
# metrics:
# - id: ["requests/count", "requests/duration"]

#- module: azure
# metricsets:
# - app_state
# enabled: true
kaiyan-sheng marked this conversation as resolved.
Show resolved Hide resolved
# period: 300s
# application_id: ''
# api_key: ''
Loading