diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 22ab9bb7b0a2..6560c46430da 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -585,6 +585,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Adjust the Apache status fields in the fleet mode. {pull}22821[22821] - Add AWS Fargate overview dashboard. {pull}22941[22941] - Add process.state, process.cpu.pct, process.cpu.start_time and process.memory.pct. {pull}22845[22845] +- Move IIS module to GA and map fields. {issue}22609[22609] {pull}23024[23024] - Apache: convert status.total_kbytes to status.total_bytes in fleet mode. {pull}23022[23022] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 4bccb1724ccf..a17b8bc90981 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -23973,7 +23973,7 @@ iis module [float] === application_pool -application_pool +Application pool process stats. @@ -23987,23 +23987,873 @@ type: keyword -- -*`iis.webserver.*.*`*:: +[float] +=== process + +Worker process overview. + + + +*`iis.application_pool.process.handle_count`*:: ++ +-- +The number of handles. + + +type: long + +-- + +*`iis.application_pool.process.io_read_operations_per_sec`*:: ++ +-- +IO read operations per sec. + + +type: float + +-- + +*`iis.application_pool.process.io_write_operations_per_sec`*:: ++ +-- +IO write operations per sec. + + +type: float + +-- + +*`iis.application_pool.process.virtual_bytes`*:: ++ +-- +Memory virtual bytes. + + +type: float + +-- + +*`iis.application_pool.process.cpu_usage_perc`*:: ++ +-- +The CPU usage percentage. + + +type: float + +-- + +*`iis.application_pool.process.thread_count`*:: ++ +-- +The number of threats. + + +type: long + +-- + +*`iis.application_pool.process.working_set`*:: ++ +-- +Memory working set. + + +type: float + +-- + +*`iis.application_pool.process.private_bytes`*:: ++ +-- +Memory private bytes. + + +type: float + +-- + +*`iis.application_pool.process.page_faults_per_sec`*:: ++ +-- +Memory page faults. + + +type: float + +-- + +[float] +=== net_clr + +Common Language Runtime overview. + + + +*`iis.application_pool.net_clr.finallys_per_sec`*:: ++ +-- +The number of finallys per sec. + + +type: float + +-- + +*`iis.application_pool.net_clr.throw_to_catch_depth_per_sec`*:: ++ +-- +Throw to catch depth count per sec. + + +type: float + +-- + +*`iis.application_pool.net_clr.total_exceptions_thrown`*:: ++ +-- +Total number of exceptions thrown. + + +type: long + +-- + +*`iis.application_pool.net_clr.filters_per_sec`*:: ++ +-- +Number of filters per sec. + + +type: float + +-- + +[float] +=== webserver + +Webserver related metrics. + + + +[float] +=== process + +The process related stats. + + + +*`iis.webserver.process.cpu_usage_perc`*:: ++ +-- +The CPU usage percentage. + + +type: float + +-- + +*`iis.webserver.process.handle_count`*:: ++ +-- +The number of handles. + + +type: float + +-- + +*`iis.webserver.process.virtual_bytes`*:: ++ +-- +Memory virtual bytes. + + +type: float + +-- + +*`iis.webserver.process.thread_count`*:: ++ +-- +The number of threads. + + +type: long + +-- + +*`iis.webserver.process.working_set`*:: ++ +-- +Memory working set. + + +type: float + +-- + +*`iis.webserver.process.private_bytes`*:: ++ +-- +Memory private bytes. + + +type: float + +-- + +*`iis.webserver.process.worker_process_count`*:: ++ +-- +Number of worker processes running. + + +type: float + +-- + +*`iis.webserver.process.page_faults_per_sec`*:: ++ +-- +Memory page faults. + + +type: float + +-- + +*`iis.webserver.process.io_read_operations_per_sec`*:: ++ +-- +IO read operations per sec. + + +type: float + +-- + +*`iis.webserver.process.io_write_operations_per_sec`*:: ++ +-- +IO write operations per sec. + + +type: float + +-- + +[float] +=== asp_net + +Common Language Runtime overview. + + + +*`iis.webserver.asp_net.application_restarts`*:: ++ +-- +Number of applications restarts. + + +type: float + +-- + +*`iis.webserver.asp_net.request_wait_time`*:: ++ +-- +Request wait time. + + +type: long + +-- + +[float] +=== asp_net_application + +ASP.NET application overview. + + + +*`iis.webserver.asp_net_application.errors_total_per_sec`*:: ++ +-- +Total number of errors per sec. + + +type: float + +-- + +*`iis.webserver.asp_net_application.pipeline_instance_count`*:: ++ +-- +The pipeline instance count. + + +type: float + +-- + +*`iis.webserver.asp_net_application.requests_per_sec`*:: ++ +-- +Number of requests per sec. + + +type: float + +-- + +*`iis.webserver.asp_net_application.requests_executing`*:: ++ +-- +Number of requests executing. + + +type: float + +-- + +*`iis.webserver.asp_net_application.requests_in_application_queue`*:: ++ +-- +Number of requests in the application queue. + + +type: float + +-- + +[float] +=== cache + +The cache overview. + + + +*`iis.webserver.cache.current_file_cache_memory_usage`*:: ++ +-- +The current file cache memory usage size. + + +type: float + +-- + +*`iis.webserver.cache.current_files_cached`*:: ++ +-- +The number of current files cached. + + +type: float + +-- + +*`iis.webserver.cache.current_uris_cached`*:: ++ +-- +The number of current uris cached. + + +type: float + +-- + +*`iis.webserver.cache.file_cache_hits`*:: ++ +-- +The number of file cache hits. + + +type: float + +-- + +*`iis.webserver.cache.file_cache_misses`*:: ++ +-- +The number of file cache misses. + + +type: float + +-- + +*`iis.webserver.cache.maximum_file_cache_memory_usage`*:: ++ +-- +The max file cache size. + + +type: float + +-- + +*`iis.webserver.cache.output_cache_current_items`*:: ++ +-- +The number of output cache current items. + + +type: float + +-- + +*`iis.webserver.cache.output_cache_current_memory_usage`*:: ++ +-- +The output cache memory usage size. + + +type: float + +-- + +*`iis.webserver.cache.output_cache_total_hits`*:: ++ +-- +The output cache total hits count. + + +type: float + +-- + +*`iis.webserver.cache.output_cache_total_misses`*:: ++ +-- +The output cache total misses count. + + +type: float + +-- + +*`iis.webserver.cache.total_files_cached`*:: ++ +-- +the total number of files cached. + + +type: float + +-- + +*`iis.webserver.cache.total_uris_cached`*:: ++ +-- +The total number of URIs cached. + + +type: float + +-- + +*`iis.webserver.cache.uri_cache_hits`*:: ++ +-- +The number of URIs cached hits. + + +type: float + +-- + +*`iis.webserver.cache.uri_cache_misses`*:: ++ +-- +The number of URIs cache misses. + + +type: float + +-- + +[float] +=== network + +The network related stats. + + + +*`iis.webserver.network.anonymous_users_per_sec`*:: ++ +-- +The number of anonymous users per sec. + + +type: float + +-- + +*`iis.webserver.network.bytes_received_per_sec`*:: ++ +-- +The size of bytes received per sec. + + +type: float + +-- + +*`iis.webserver.network.bytes_sent_per_sec`*:: ++ +-- +The size of bytes sent per sec. + + +type: float + +-- + +*`iis.webserver.network.current_anonymous_users`*:: ++ +-- +The number of current anonymous users. + + +type: float + +-- + +*`iis.webserver.network.current_connections`*:: + -- -webserver +The number of current connections. -type: object +type: float -- -*`iis.website.*.*`*:: +*`iis.webserver.network.current_non_anonymous_users`*:: + -- -website +The number of current non anonymous users. -type: object +type: float + +-- + +*`iis.webserver.network.delete_requests_per_sec`*:: ++ +-- +Number of DELETE requests per sec. + + +type: float + +-- + +*`iis.webserver.network.get_requests_per_sec`*:: ++ +-- +Number of GET requests per sec. + + +type: float + +-- + +*`iis.webserver.network.maximum_connections`*:: ++ +-- +Number of maximum connections. + + +type: float + +-- + +*`iis.webserver.network.post_requests_per_sec`*:: ++ +-- +Number of POST requests per sec. + + +type: float + +-- + +*`iis.webserver.network.service_uptime`*:: ++ +-- +Service uptime. + + +type: float + +-- + +*`iis.webserver.network.total_anonymous_users`*:: ++ +-- +Total number of anonymous users. + + +type: float + +-- + +*`iis.webserver.network.total_bytes_received`*:: ++ +-- +Total size of bytes received. + + +type: float + +-- + +*`iis.webserver.network.total_bytes_sent`*:: ++ +-- +Total size of bytes sent. + + +type: float + +-- + +*`iis.webserver.network.total_connection_attempts`*:: ++ +-- +The total number of connection attempts. + + +type: float + +-- + +*`iis.webserver.network.total_delete_requests`*:: ++ +-- +The total number of DELETE requests. + + +type: float + +-- + +*`iis.webserver.network.total_get_requests`*:: ++ +-- +The total number of GET requests. + + +type: float + +-- + +*`iis.webserver.network.total_non_anonymous_users`*:: ++ +-- +The total number of non anonymous users. + + +type: float + +-- + +*`iis.webserver.network.total_post_requests`*:: ++ +-- +The total number of POST requests. + + +type: float + +-- + +[float] +=== website + +Website related metrics. + + + +*`iis.website.name`*:: ++ +-- +website name + + +type: keyword + +-- + +[float] +=== network + +The network overview. + + + +*`iis.website.network.bytes_received_per_sec`*:: ++ +-- +The bytes received per sec size. + + +type: float + +-- + +*`iis.website.network.bytes_sent_per_sec`*:: ++ +-- +The bytes sent per sec size. + + +type: float + +-- + +*`iis.website.network.current_connections`*:: ++ +-- +The number of current connections. + + +type: float + +-- + +*`iis.website.network.delete_requests_per_sec`*:: ++ +-- +The number of DELETE requests per sec. + + +type: float + +-- + +*`iis.website.network.get_requests_per_sec`*:: ++ +-- +The number of GET requests per sec. + + +type: float + +-- + +*`iis.website.network.maximum_connections`*:: ++ +-- +The number of maximum connections. + + +type: float + +-- + +*`iis.website.network.post_requests_per_sec`*:: ++ +-- +The number of POST requests per sec. + + +type: float + +-- + +*`iis.website.network.put_requests_per_sec`*:: ++ +-- +The number of PUT requests per sec. + + +type: float + +-- + +*`iis.website.network.service_uptime`*:: ++ +-- +The service uptime. + + +type: float + +-- + +*`iis.website.network.total_bytes_received`*:: ++ +-- +The total number of bytes received. + + +type: float + +-- + +*`iis.website.network.total_bytes_sent`*:: ++ +-- +The total number of bytes sent. + + +type: float + +-- + +*`iis.website.network.total_connection_attempts`*:: ++ +-- +The total number of connection attempts. + + +type: float + +-- + +*`iis.website.network.total_delete_requests`*:: ++ +-- +The total number of DELETE requests. + + +type: float + +-- + +*`iis.website.network.total_get_requests`*:: ++ +-- +The total number of GET requests. + + +type: float + +-- + +*`iis.website.network.total_post_requests`*:: ++ +-- +The total number of POST requests. + + +type: float + +-- + +*`iis.website.network.total_put_requests`*:: ++ +-- +The total number of PUT requests. + + +type: float -- diff --git a/metricbeat/docs/modules/iis.asciidoc b/metricbeat/docs/modules/iis.asciidoc index a0761f0c8381..8575fced5e46 100644 --- a/metricbeat/docs/modules/iis.asciidoc +++ b/metricbeat/docs/modules/iis.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] == IIS module -beta[] - This is the iis module. IIS (Internet Information Services) is a secure, reliable, and scalable Web server that provides an easy to manage platform for developing and hosting Web applications and services. diff --git a/metricbeat/docs/modules/iis/application_pool.asciidoc b/metricbeat/docs/modules/iis/application_pool.asciidoc index 042d41384c4d..74989449d0f3 100644 --- a/metricbeat/docs/modules/iis/application_pool.asciidoc +++ b/metricbeat/docs/modules/iis/application_pool.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] === IIS application_pool metricset -beta[] - include::../../../../x-pack/metricbeat/module/iis/application_pool/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/iis/webserver.asciidoc b/metricbeat/docs/modules/iis/webserver.asciidoc index 00be405b0580..24999d544534 100644 --- a/metricbeat/docs/modules/iis/webserver.asciidoc +++ b/metricbeat/docs/modules/iis/webserver.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] === IIS webserver metricset -beta[] - include::../../../../x-pack/metricbeat/module/iis/webserver/_meta/docs.asciidoc[] This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. diff --git a/metricbeat/docs/modules/iis/website.asciidoc b/metricbeat/docs/modules/iis/website.asciidoc index c7c170b2e921..96333df4fd77 100644 --- a/metricbeat/docs/modules/iis/website.asciidoc +++ b/metricbeat/docs/modules/iis/website.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] === IIS website metricset -beta[] - include::../../../../x-pack/metricbeat/module/iis/website/_meta/docs.asciidoc[] This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index d3404e5865cd..4ff28d2bcef5 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -130,10 +130,10 @@ This file is generated! See scripts/mage/docs_collector.go |<> |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> beta[] -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.3+| .3+| |<> beta[] -|<> beta[] -|<> beta[] +|<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.3+| .3+| |<> +|<> +|<> |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .7+| .7+| |<> beta[] |<> beta[] diff --git a/x-pack/metricbeat/module/iis/_meta/fields.yml b/x-pack/metricbeat/module/iis/_meta/fields.yml index 8c51c0dc26f6..9a92ce272cb8 100644 --- a/x-pack/metricbeat/module/iis/_meta/fields.yml +++ b/x-pack/metricbeat/module/iis/_meta/fields.yml @@ -2,7 +2,7 @@ title: "IIS" description: > iis module - release: beta + release: ga fields: - name: iis diff --git a/x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml b/x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml index 48b70c26101e..abb62a47a432 100644 --- a/x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml +++ b/x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml @@ -1,10 +1,72 @@ - name: application_pool type: group - release: beta + release: ga description: > - application_pool + Application pool process stats. fields: - name: name type: keyword description: > application pool name + - name: process + type: group + description: > + Worker process overview. + fields: + - name: handle_count + type: long + description: > + The number of handles. + - name: io_read_operations_per_sec + type: float + description: > + IO read operations per sec. + - name: io_write_operations_per_sec + type: float + description: > + IO write operations per sec. + - name: virtual_bytes + type: float + description: > + Memory virtual bytes. + - name: cpu_usage_perc + type: float + description: > + The CPU usage percentage. + - name: thread_count + type: long + description: > + The number of threats. + - name: working_set + type: float + description: > + Memory working set. + - name: private_bytes + type: float + description: > + Memory private bytes. + - name: page_faults_per_sec + type: float + description: > + Memory page faults. + - name: net_clr + type: group + description: > + Common Language Runtime overview. + fields: + - name: finallys_per_sec + type: float + description: > + The number of finallys per sec. + - name: throw_to_catch_depth_per_sec + type: float + description: > + Throw to catch depth count per sec. + - name: total_exceptions_thrown + type: long + description: > + Total number of exceptions thrown. + - name: filters_per_sec + type: float + description: > + Number of filters per sec. diff --git a/x-pack/metricbeat/module/iis/fields.go b/x-pack/metricbeat/module/iis/fields.go index 816ab17bc4ee..0ee02da3fe37 100644 --- a/x-pack/metricbeat/module/iis/fields.go +++ b/x-pack/metricbeat/module/iis/fields.go @@ -19,5 +19,5 @@ func init() { // AssetIis returns asset data. // This is the base64 encoded gzipped contents of module/iis. func AssetIis() string { - return "eJzMkrFuhDAQRHt/xYgS6e4DXKS/Oh+ADOydNmewZfty4u8jx0AAgUUZFxSzo5m3aC940iDB7AUQOGiSKG63z0IALfnGsQ1seokPASD60Jn2pUkAjjQpTxI1BSUEcGfSrZe/zgt61dGUHF8YLEk8nHnZUdkpWIcsg5S1mhsVzZU1Rs+GveT41nh/+m5repmOLdYSLX5XgwnpScPbuHYzywBsIBAh1vFT55tqT+6b3LW8lie2TkCm/qImLOQkVGl610YdDKtOWcv9Y3QWZXHuj86Ys7q7CQf6/3twoOxBHJ7D8TFkT2HsTHk/AQAA//+gjPaq" + return "eJzsmk9v2zgTxu/+FIPemw+QwwsUfYNFgG5bNAl6JFhpbBORSJV/7Hg//YKUZFGyZMquyBqL6tBDzPL5ecgZPkPrPbzi4R4YUysAzXSB9/Du8fHp3QogR5VJVmkm+D38bwUAdhyUIjcFrgAkFkgV3sOGrlYAa4ZFru7duPfAaYntvPbRh8qOlMJUzV9Gpu9P4k9Eq6pgGbWDSSVEcRwwNrN9fLjur6Oa9fOhUwCrAJUUGSoFSlOt7ryxQ0af0/7b+6Dle8XDXsh88NkZHvvQIdPJ9K1uAzsqPQzNDOHvQr6iPIZA7FDuGO7vBgPHIuFTbSnPCySZMFyfDGrxCsE3Ix8GCO3zvEXgpvyBEsS6EVNDRm8zCiKR5kRUKF1MFalQEoXZJNu6EHSMfAbc4xewatCpQYUSFGZnCfeSaUyH6OQuYtwxqQ0tyI+DxuF+W4TqbyyFPLQ64HSmcbLKEKPoBm2gYkTJbrKPX1/AidjwZMg13eA0kt66bZZm1zsxfSZAeyFfGd8QhdMwv75ajQoo1NMolWQ7qjH61ml0QlunsrtmTU2ho2ZZC2W3T612N350oCZZIZcq4R9FWQoOnyjfGCv9zXDNSry6lq8Zp0VxiBqq/tZuFcM1SW+l2BMtSEZ1tiU5Vnobl1OKPWgBTg+cHrh8n8EqNC0IvmVY1QXewfMYhcIqefHsNOuA8WnINSs0yqhr/dlbZyd2GrpjCcMfCuUO5fKu73s7tf2vVGMOJWrJstmGb2HjZTOgdV0t0YkBnWKClOfiFQfjLDu4WPkI+sEbczLpbUP+xzb4MDNtw971RqTJ0ni7uSuQ+143hgqk4Zzxzc1bG/jTfS3QfR3vQFRF+Ek63oxB9K9oJCpNpY6SrV1eeIr2tKwlp9dX4k+DSpM9ZZrYrxqhyn6rNcBqgNU4u5TE+wYLLeuHp693nx+ee1dH164oSimkIrVjjWmnh0bV6YYTtmIVFowjYVxpyrN41sLZskYNWrXa8Qf3WyIX3aqFw3bkwjfMjGajez0G2VFvBhvjfnKQnwbNdL4ui8k46C32MsjJj6dyRrPt+JXvlfbfTXh1zmZGSuSarJl12nYqUrpTuu4GYtnuRtb2cu03qGWb9kCxf840Bj60qqmHN+WLkXZlxmdWNXQeZjSSpUe0okFCb8m3LM7ZO7ygOS62FZxFVjLrYJOy1ZLTdCV9Y6UpU6dMSd98yvMZIoyujG7o2q3INJYJQllrN5jtjnTaF/KmiGoP9oIS1AOuHU/MJOphOjmXQiFLMUIZN6FGOGvBEGkNF7ug6yNVP/PDxbLmS1DMh3gv3x7DdEaypJXcgwqU8o4sVSXv2EYruffzyV7I1yWdWDPlr13EUi74oRRGEaMiX6n343YUBicc7gvcvReRmCHbYR4b1JZji+lUoVWdS6nseZKU0CqG6dqjbrDq6ZziYNXDpJngHDN3h5KO0hMNE3LBf188ueDzY5pjgRpJ2sb//w+fHp4fLuj/N6gTI/718HwBX+vHI+/MDq8RnLcrK6FSh+/rl6dL4qdQ7liGxFRnLzl/Ae2pVoBaIWSyUuTuwGTNztiasH/yxQMcP/Pm0dnzJxWZ1QpRdclCqNZYVvF86tBCd9LQSodoB5U5FemgNoco/cqcCtGvzSG+hCfxEPOic7j5xcKv1Kk4e7V6/FUWpv2ivOCLLEzjta+xLPvecvMtp19XjtisXXtxnrb7Ge96AndU6Vqf05Zn5g3+7XYTCb15n/Jm/Xkf8yY9eh/xNn16n/FCr16Z3wL5clv9hLttuainSODYRw73m/LtW4QJwD/2fSHS/5h9vyVDPEFofgPgi8/3bwAAAP//ebJtaQ==" } diff --git a/x-pack/metricbeat/module/iis/webserver/_meta/fields.yml b/x-pack/metricbeat/module/iis/webserver/_meta/fields.yml index b31375bdbb21..7a07d8608b2e 100644 --- a/x-pack/metricbeat/module/iis/webserver/_meta/fields.yml +++ b/x-pack/metricbeat/module/iis/webserver/_meta/fields.yml @@ -1,8 +1,231 @@ -- name: webserver.*.* - release: beta - type: object - object_type: float - object_type_mapping_type: "*" +- name: webserver + type: group + release: ga description: > - webserver - + Webserver related metrics. + fields: + - name: process + type: group + description: > + The process related stats. + fields: + - name: cpu_usage_perc + type: float + description: > + The CPU usage percentage. + - name: handle_count + type: float + description: > + The number of handles. + - name: virtual_bytes + type: float + description: > + Memory virtual bytes. + - name: thread_count + type: long + description: > + The number of threads. + - name: working_set + type: float + description: > + Memory working set. + - name: private_bytes + type: float + description: > + Memory private bytes. + - name: worker_process_count + type: float + description: > + Number of worker processes running. + - name: page_faults_per_sec + type: float + description: > + Memory page faults. + - name: io_read_operations_per_sec + type: float + description: > + IO read operations per sec. + - name: io_write_operations_per_sec + type: float + description: > + IO write operations per sec. + - name: asp_net + type: group + description: > + Common Language Runtime overview. + fields: + - name: application_restarts + type: float + description: > + Number of applications restarts. + - name: request_wait_time + type: long + description: > + Request wait time. + - name: asp_net_application + type: group + description: > + ASP.NET application overview. + fields: + - name: errors_total_per_sec + type: float + description: > + Total number of errors per sec. + - name: pipeline_instance_count + type: float + description: > + The pipeline instance count. + - name: requests_per_sec + type: float + description: > + Number of requests per sec. + - name: requests_executing + type: float + description: > + Number of requests executing. + - name: requests_in_application_queue + type: float + description: > + Number of requests in the application queue. + - name: cache + type: group + description: > + The cache overview. + fields: + - name: current_file_cache_memory_usage + type: float + description: > + The current file cache memory usage size. + - name: current_files_cached + type: float + description: > + The number of current files cached. + - name: current_uris_cached + type: float + description: > + The number of current uris cached. + - name: file_cache_hits + type: float + description: > + The number of file cache hits. + - name: file_cache_misses + type: float + description: > + The number of file cache misses. + - name: maximum_file_cache_memory_usage + type: float + description: > + The max file cache size. + - name: output_cache_current_items + type: float + description: > + The number of output cache current items. + - name: output_cache_current_memory_usage + type: float + description: > + The output cache memory usage size. + - name: output_cache_total_hits + type: float + description: > + The output cache total hits count. + - name: output_cache_total_misses + type: float + description: > + The output cache total misses count. + - name: total_files_cached + type: float + description: > + the total number of files cached. + - name: total_uris_cached + type: float + description: > + The total number of URIs cached. + - name: uri_cache_hits + type: float + description: > + The number of URIs cached hits. + - name: uri_cache_misses + type: float + description: > + The number of URIs cache misses. + - name: network + type: group + description: > + The network related stats. + fields: + - name: anonymous_users_per_sec + type: float + description: > + The number of anonymous users per sec. + - name: bytes_received_per_sec + type: float + description: > + The size of bytes received per sec. + - name: bytes_sent_per_sec + type: float + description: > + The size of bytes sent per sec. + - name: current_anonymous_users + type: float + description: > + The number of current anonymous users. + - name: current_connections + type: float + description: > + The number of current connections. + - name: current_non_anonymous_users + type: float + description: > + The number of current non anonymous users. + - name: delete_requests_per_sec + type: float + description: > + Number of DELETE requests per sec. + - name: get_requests_per_sec + type: float + description: > + Number of GET requests per sec. + - name: maximum_connections + type: float + description: > + Number of maximum connections. + - name: post_requests_per_sec + type: float + description: > + Number of POST requests per sec. + - name: service_uptime + type: float + description: > + Service uptime. + - name: total_anonymous_users + type: float + description: > + Total number of anonymous users. + - name: total_bytes_received + type: float + description: > + Total size of bytes received. + - name: total_bytes_sent + type: float + description: > + Total size of bytes sent. + - name: total_connection_attempts + type: float + description: > + The total number of connection attempts. + - name: total_delete_requests + type: float + description: > + The total number of DELETE requests. + - name: total_get_requests + type: float + description: > + The total number of GET requests. + - name: total_non_anonymous_users + type: float + description: > + The total number of non anonymous users. + - name: total_post_requests + type: float + description: > + The total number of POST requests. diff --git a/x-pack/metricbeat/module/iis/webserver/manifest.yml b/x-pack/metricbeat/module/iis/webserver/manifest.yml index 39648f054d84..71c4f15ff363 100644 --- a/x-pack/metricbeat/module/iis/webserver/manifest.yml +++ b/x-pack/metricbeat/module/iis/webserver/manifest.yml @@ -45,11 +45,13 @@ input: namespace: "asp_net_application" counters: - name: "Errors Total/Sec" + field: "errors_total_per_sec" - name: "Pipeline Instance Count" - name: "Requests Executing" - name: "Requests in Application Queue" format: 'large' - name: "Requests/Sec" + field: "requests_per_sec" #cache - object: "Web Service Cache" namespace: "cache" diff --git a/x-pack/metricbeat/module/iis/website/_meta/fields.yml b/x-pack/metricbeat/module/iis/website/_meta/fields.yml index 1bd4ebc3accc..1d81ae411e21 100644 --- a/x-pack/metricbeat/module/iis/website/_meta/fields.yml +++ b/x-pack/metricbeat/module/iis/website/_meta/fields.yml @@ -1,12 +1,79 @@ -- name: website.*.* - release: beta - type: object - object_type: float - object_type_mapping_type: "*" +- name: website + type: group + release: ga description: > - website + Website related metrics. fields: - - name: name - type: keyword - description: > - website name + - name: name + type: keyword + description: > + website name + - name: network + type: group + description: > + The network overview. + fields: + - name: bytes_received_per_sec + type: float + description: > + The bytes received per sec size. + - name: bytes_sent_per_sec + type: float + description: > + The bytes sent per sec size. + - name: current_connections + type: float + description: > + The number of current connections. + - name: delete_requests_per_sec + type: float + description: > + The number of DELETE requests per sec. + - name: get_requests_per_sec + type: float + description: > + The number of GET requests per sec. + - name: maximum_connections + type: float + description: > + The number of maximum connections. + - name: post_requests_per_sec + type: float + description: > + The number of POST requests per sec. + - name: put_requests_per_sec + type: float + description: > + The number of PUT requests per sec. + - name: service_uptime + type: float + description: > + The service uptime. + - name: total_bytes_received + type: float + description: > + The total number of bytes received. + - name: total_bytes_sent + type: float + description: > + The total number of bytes sent. + - name: total_connection_attempts + type: float + description: > + The total number of connection attempts. + - name: total_delete_requests + type: float + description: > + The total number of DELETE requests. + - name: total_get_requests + type: float + description: > + The total number of GET requests. + - name: total_post_requests + type: float + description: > + The total number of POST requests. + - name: total_put_requests + type: float + description: > + The total number of PUT requests.