From 651445fa871c086a9d25157c093de364344216dc Mon Sep 17 00:00:00 2001 From: chrismark Date: Mon, 27 Jan 2020 13:33:01 +0200 Subject: [PATCH 1/6] Add galley metricset for Istio Metricbeat module Signed-off-by: chrismark --- metricbeat/docs/fields.asciidoc | 331 +++++ metricbeat/docs/modules/istio.asciidoc | 15 +- metricbeat/docs/modules/istio/galley.asciidoc | 23 + metricbeat/docs/modules_list.asciidoc | 3 +- x-pack/metricbeat/include/list.go | 1 + x-pack/metricbeat/metricbeat.reference.yml | 9 +- .../module/istio/_meta/config.reference.yml | 9 +- .../metricbeat/module/istio/_meta/config.yml | 13 +- .../module/istio/_meta/docs.asciidoc | 2 +- x-pack/metricbeat/module/istio/fields.go | 2 +- .../module/istio/galley/_meta/data.json | 24 + .../module/istio/galley/_meta/docs.asciidoc | 1 + .../module/istio/galley/_meta/fields.yml | 145 ++ .../istio/galley/_meta/testdata/config.yml | 3 + .../istio/galley/_meta/testdata/docs.plain | 156 ++ .../_meta/testdata/docs.plain-expected.json | 1310 +++++++++++++++++ .../metricbeat/module/istio/galley/galley.go | 63 + .../module/istio/galley/galley_test.go | 19 + x-pack/metricbeat/module/istio/mixer/mixer.go | 2 +- .../module/istio/mixer/mixer_test.go | 2 +- .../metricbeat/modules.d/istio.yml.disabled | 13 +- 21 files changed, 2131 insertions(+), 15 deletions(-) create mode 100644 metricbeat/docs/modules/istio/galley.asciidoc create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/data.json create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/docs.asciidoc create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/fields.yml create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/testdata/config.yml create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain create mode 100644 x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain-expected.json create mode 100644 x-pack/metricbeat/module/istio/galley/galley.go create mode 100644 x-pack/metricbeat/module/istio/galley/galley_test.go diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c6acd54d4710..f47b23519196 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -16602,6 +16602,337 @@ istio Module +[float] +=== galley + +Contains statistics related to the Istio galley service + + + +*`istio.galley.name`*:: ++ +-- +The name of the resource the metric is related to + + +type: keyword + +-- + +*`istio.galley.namespace`*:: ++ +-- +The Kubernates namespace of the resource + + +type: keyword + +-- + +*`istio.galley.version`*:: ++ +-- +The version of the object + + +type: keyword + +-- + +*`istio.galley.collection`*:: ++ +-- +The collection of the instance + + +type: keyword + +-- + +*`istio.galley.istio.authentication.meshpolicies`*:: ++ +-- +The number of valid istio/authentication/meshpolicies known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.authentication.policies`*:: ++ +-- +The number of valid istio/authentication/policies known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.mesh.MeshConfig`*:: ++ +-- +The number of valid istio/mesh/MeshConfig known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.networking.destinationrules`*:: ++ +-- +The number of valid istio/networking/destinationrules known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.networking.envoyfilters`*:: ++ +-- +The number of valid istio/networking/envoyfilters known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.networking.gateways`*:: ++ +-- +The number of valid istio/networking/gateways known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.networking.sidecars`*:: ++ +-- +The number of valid istio/networking/sidecars known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.networking.virtualservices`*:: ++ +-- +The number of valid istio/networking/virtualservices known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.policy.attributemanifests`*:: ++ +-- +The number of valid istio/policy/attributemanifests known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.policy.handlers`*:: ++ +-- +The number of valid istio/policy/handlers known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.policy.instances`*:: ++ +-- +The number of valid istio/policy/instances known to galley at a point in time + + +type: long + +-- + +*`istio.galley.istio.policy.rules`*:: ++ +-- +The number of valid istio/policy/rules known to galley at a point in time + + +type: long + +-- + +*`istio.galley.runtime.processor.event_span.duration.ms.bucket.*`*:: ++ +-- +The duration between each incoming event as histogram buckets in milliseconds + + +type: object + +-- + +*`istio.galley.runtime.processor.event_span.duration.ms.sum`*:: ++ +-- +The duration between each incoming event, sum of durations in milliseconds + + +type: long + +format: duration + +-- + +*`istio.galley.runtime.processor.event_span.duration.ms.count`*:: ++ +-- +The duration between each incoming event, number of metrics + + +type: long + +-- + +*`istio.galley.runtime.processor.snapshot_events.bucket.*`*:: ++ +-- +The number of events that have been processed as histogram buckets + + +type: object + +-- + +*`istio.galley.runtime.processor.snapshot_events.sum`*:: ++ +-- +The number of events that have been processed, sum of events + + +type: long + +-- + +*`istio.galley.runtime.processor.snapshot_events.count`*:: ++ +-- +The duration between each incoming event, number of metrics + + +type: long + +-- + +*`istio.galley.runtime.processor.snapshot_lifetime.duration.ms.bucket.*`*:: ++ +-- +The duration of each snapshot as histogram buckets in milliseconds + + +type: object + +-- + +*`istio.galley.runtime.processor.snapshot_lifetime.duration.ms.sum`*:: ++ +-- +The duration of each snapshot, sum of durations in milliseconds + + +type: long + +format: duration + +-- + +*`istio.galley.runtime.processor.snapshot_lifetime.duration.ms.count`*:: ++ +-- +The duration of each snapshot, number of metrics + + +type: long + +-- + +*`istio.galley.runtime.state_type_instances`*:: ++ +-- +The number of type instances per type URL + + +type: long + +-- + +*`istio.galley.runtime.strategy.on_change`*:: ++ +-- +The number of times the strategy's onChange has been called + + +type: long + +-- + +*`istio.galley.runtime.strategy.timer_quiesce_reached`*:: ++ +-- +The number of times a quiesce has been reached + + +type: long + +-- + +*`istio.galley.source_kube_event_success_total`*:: ++ +-- +The number of times a kubernetes source successfully handled an event + + +type: long + +-- + +*`istio.galley.validation.cert_key.updates`*:: ++ +-- +Galley validation webhook certificate updates + + +type: long + +-- + +*`istio.galley.validation.config.load`*:: ++ +-- +k8s webhook configuration (re)loads + + +type: long + +-- + +*`istio.galley.validation.config.updates`*:: ++ +-- +k8s webhook configuration updates + + +type: long + +-- + [float] === mesh diff --git a/metricbeat/docs/modules/istio.asciidoc b/metricbeat/docs/modules/istio.asciidoc index 796e100032a3..c1e29c6c6688 100644 --- a/metricbeat/docs/modules/istio.asciidoc +++ b/metricbeat/docs/modules/istio.asciidoc @@ -11,7 +11,7 @@ beta[] This is the Istio module. The Istio module collects metrics from the Istio https://istio.io/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints]. -The default metricsets are `mesh`, `mixer`. +The default metricsets are `mesh`, `mixer`, `galley`. [float] === Compatibility @@ -28,7 +28,7 @@ in <>. Here is an example configuration: [source,yaml] ---- metricbeat.modules: -# Istio mesh. To collect all all Mixer-generated metrics +# Istio mesh. To collect all Mixer-generated metrics - module: istio metricsets: ["mesh"] period: 10s @@ -41,6 +41,13 @@ metricbeat.modules: period: 10s # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:15014"] + +# Istio galley. To collect all Galley-generated metrics +- module: galley + metricsets: ["galley"] + period: 10s + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + hosts: ["localhost:15014"] ---- [float] @@ -48,10 +55,14 @@ metricbeat.modules: The following metricsets are available: +* <> + * <> * <> +include::istio/galley.asciidoc[] + include::istio/mesh.asciidoc[] include::istio/mixer.asciidoc[] diff --git a/metricbeat/docs/modules/istio/galley.asciidoc b/metricbeat/docs/modules/istio/galley.asciidoc new file mode 100644 index 000000000000..6fbd197f8f8c --- /dev/null +++ b/metricbeat/docs/modules/istio/galley.asciidoc @@ -0,0 +1,23 @@ +//// +This file is generated! See scripts/mage/docs_collector.go +//// + +[[metricbeat-metricset-istio-galley]] +=== istio galley metricset + +beta[] + +include::../../../../x-pack/metricbeat/module/istio/galley/_meta/docs.asciidoc[] + + +==== Fields + +For a description of each field in the metricset, see the +<> section. + +Here is an example document generated by this metricset: + +[source,json] +---- +include::../../../../x-pack/metricbeat/module/istio/galley/_meta/data.json[] +---- diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 02a4fa63a3bd..21eec5097845 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -104,7 +104,8 @@ 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-no.png[No prebuilt dashboards] | -.2+| .2+| |<> beta[] +.3+| .3+| |<> beta[] +|<> beta[] |<> beta[] |<> |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go index d9ffd317c6ff..65fb1c848823 100644 --- a/x-pack/metricbeat/include/list.go +++ b/x-pack/metricbeat/include/list.go @@ -30,6 +30,7 @@ import ( _ "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud/stackdriver" _ "github.com/elastic/beats/x-pack/metricbeat/module/ibmmq" _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/galley" _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/mesh" _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/mixer" _ "github.com/elastic/beats/x-pack/metricbeat/module/mssql" diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index e7e285883807..3b41f7f9df36 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -538,7 +538,7 @@ metricbeat.modules: } #-------------------------------- Istio Module -------------------------------- -# Istio mesh. To collect all all Mixer-generated metrics +# Istio mesh. To collect all Mixer-generated metrics - module: istio metricsets: ["mesh"] period: 10s @@ -552,6 +552,13 @@ metricbeat.modules: # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:15014"] +# Istio galley. To collect all Galley-generated metrics +- module: galley + metricsets: ["galley"] + period: 10s + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + hosts: ["localhost:15014"] + #------------------------------- Jolokia Module ------------------------------- - module: jolokia #metricsets: ["jmx"] diff --git a/x-pack/metricbeat/module/istio/_meta/config.reference.yml b/x-pack/metricbeat/module/istio/_meta/config.reference.yml index 60c087484b4c..5c3d46050b7f 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.reference.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.reference.yml @@ -1,4 +1,4 @@ -# Istio mesh. To collect all all Mixer-generated metrics +# Istio mesh. To collect all Mixer-generated metrics - module: istio metricsets: ["mesh"] period: 10s @@ -11,3 +11,10 @@ period: 10s # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:15014"] + +# Istio galley. To collect all Galley-generated metrics +- module: galley + metricsets: ["galley"] + period: 10s + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + hosts: ["localhost:15014"] diff --git a/x-pack/metricbeat/module/istio/_meta/config.yml b/x-pack/metricbeat/module/istio/_meta/config.yml index 9e9f33d37e1f..5c3d46050b7f 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.yml @@ -1,13 +1,20 @@ -# Istio mesh. To collect all all Mixer-generated metrics +# Istio mesh. To collect all Mixer-generated metrics - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + hosts: ["localhost:15014"] + +# Istio galley. To collect all Galley-generated metrics +- module: galley + metricsets: ["galley"] + period: 10s + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:15014"] diff --git a/x-pack/metricbeat/module/istio/_meta/docs.asciidoc b/x-pack/metricbeat/module/istio/_meta/docs.asciidoc index 7206ba40e3ec..fc6846f393a7 100644 --- a/x-pack/metricbeat/module/istio/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/istio/_meta/docs.asciidoc @@ -1,7 +1,7 @@ This is the Istio module. The Istio module collects metrics from the Istio https://istio.io/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints]. -The default metricsets are `mesh`, `mixer`. +The default metricsets are `mesh`, `mixer`, `galley`. [float] === Compatibility diff --git a/x-pack/metricbeat/module/istio/fields.go b/x-pack/metricbeat/module/istio/fields.go index 21be91f98ad5..f26b13bd557b 100644 --- a/x-pack/metricbeat/module/istio/fields.go +++ b/x-pack/metricbeat/module/istio/fields.go @@ -19,5 +19,5 @@ func init() { // AssetIstio returns asset data. // This is the base64 encoded gzipped contents of module/istio. func AssetIstio() string { - return "eJzUmk9v2zgTxu/5FIMeX7T6ADm8wGIv20OBott7SlHjaBqK1A5Ju+6nX/CfrCiykihWkvWhiGWRz2+GD8kR1U9wh8drIOvIXAE4cgqv4UP8/uEKoEErmXpHRl/D/68AIN0LX0zjFV4BMCoUFq+hRieuAHaEqrHX8dZPoEWHp+7Dxx17vIZbNr7PV2Y0wudHbPUDpNFOkLZgnXDhmrTgWuHggIzAKBrYseng80hkDDEG6dC2w8U5lgWe8PlzhoVRCYcNOAOuxYQRhcAi70niqIdpsspnynsvedo6oe91c2J3+MtNfljAD5/vLULPpkPXorfzvRfpn6aeVb3D48Fw8yLhad9Fk/Efj9bZWWFl9O0zVY0TaugUWqEbhQ3URxA6j1XP5tdxiaVqPIsgUHW2qr28Q1f9b5bP1D9RTgckXbxZG8G3BAEFAlqyztyy6CCxhEGEjpQii9Loxj45Fuu7p6Z5Z7gT7nqgWBWDHZp/BOs7MLvhwvogpPF6mvIX5nrMqX1XIwfUWWdOySz9xqo+OnxDp/xNv/GhS56K/QxTrOOZCiywbDC2U5r7EmfAbG+0xf/e4D7kfsPRfQjzXoa3N+yQL7fVfcs9AjWoHe0IbawNilJYTdL35Hj47IAsWHShimjQOtJpraddbhR+j2WOiGUF8njzAqEbsMazxNkWUhFqN25RzWYidVEdDN8pI5oqXL1kAUB2mpGgELKR4YsyHFqSbSz92Kh0a4Z7MrjtxZmi6aL0UaYM6CSMRdieSUvqhdqWsUdkGLQKqGOx25EsLCMDHlrUqZHwrg1dyWxFC97ickyi77eNJidY9D3UwmIDRscvStSo1ozCHtk+LGcuTJ1FHuWbBR0tB28xM8er0XJGz4K+xUxch/0u5uQY6MUTc9zZ5rNznPTlKTo7PI9H8BazddlJjyLnQ4CqNXa+1LkI9xgyK0JQLGUX1QrDM1x46iUtTUf6dig/nhzD9qvOXBxB9XmMr73gzFA/4pCS+p6NM9Jsvd5kleW684+vn0930i78vacGm49gXIt8IDu0BMOhONMoY8yl1fwoDZW/NM38qKw41pmJsuhA0HkQamyR1iCy0DPaUBIbrY5hgfrr+/ev0KFjknY+ilO4lUXpmdyx6o0iedy44smzYLLoJ+nlAe2880LdOGXT5pHq/7xdxBvEXchW13ld+o2xYXygmDxGnNmWnAGv77Q56CQyaZVrHUs6/JsTV+il0No4qKNDe2QVful9PE89jcJweEu/7j2kbXh6G5QudXwbeqw62VdlkIS8u9jpZliJpgdUEASAUSLt01HnY49P0ugd3VaiEb1DrkjvTIXMhsMjevhpE9ykAKjjMzoyNtB4DhtTz0aiteHPbPCMBgEt45YjwCdHlK5tk/o0AbJcPMsM1NIzh1Um0yySOsdUe4eb8g0iKwjT0Tm/Qhqz0ksgs3v3QlEzd169mYNrlMJbLDHAiQAYnWeNTWq2GEZ5K/POZmHBesYMHCLZ3jZFao1v2Kv3luyA9IxEjyPohJPtNltMhmoovbRJL2KFhbCP94Itilot7zIRdHs3BJk1TnDY9aEkeGduKFjPcMQQyfbJLlJrEu61DdXYjrCpRCywb/LiuQlwksjO3QlSMesYCsBh36kxZN5rsRekzhu6IduHmYZ8MyqO7U2PfLMXTOiON864M6dJLw3kSyxSS2E0BoglX/FLBomi82GUPbOEX0llLE4fXS4DPaT49D84klpxfjIFOBba0nmLF+ZGYGf0Ja1dnHvfMXuEJAVsvCOdnC7glvY41H2Aek9sdIf6zKFKwQ6+8xxfI5J6jUxno0vGVIusy/aAHcfstdbEQ0sq2SQgD3GtC2EwucbDazlc40EdU+5XG33gZvSvODkZP/nVs/OSkPltRDwjTBNxVqUQ5FVvI4LS+78BAAD//wv4RSk=" + return "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" } diff --git a/x-pack/metricbeat/module/istio/galley/_meta/data.json b/x-pack/metricbeat/module/istio/galley/_meta/data.json new file mode 100644 index 000000000000..eef36b0aed56 --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/data.json @@ -0,0 +1,24 @@ +{ + "@timestamp": "2019-03-01T08:05:34.853Z", + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/envoyfilters", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/istio/galley/_meta/docs.asciidoc b/x-pack/metricbeat/module/istio/galley/_meta/docs.asciidoc new file mode 100644 index 000000000000..03ea6014656c --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/docs.asciidoc @@ -0,0 +1 @@ +This is the galley metricset of the module istio. This metricset collects Galley-specific metrics. diff --git a/x-pack/metricbeat/module/istio/galley/_meta/fields.yml b/x-pack/metricbeat/module/istio/galley/_meta/fields.yml new file mode 100644 index 000000000000..468bc3741181 --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/fields.yml @@ -0,0 +1,145 @@ +- name: galley + type: group + description: > + Contains statistics related to the Istio galley service + release: beta + fields: + - name: name + type: keyword + description: > + The name of the resource the metric is related to + - name: namespace + type: keyword + description: > + The Kubernates namespace of the resource + - name: version + type: keyword + description: > + The version of the object + - name: collection + type: keyword + description: > + The collection of the instance + + - name: istio.authentication.meshpolicies + type: long + description: > + The number of valid istio/authentication/meshpolicies known to galley at a point in time + - name: istio.authentication.policies + type: long + description: > + The number of valid istio/authentication/policies known to galley at a point in time + - name: istio.mesh.MeshConfig + type: long + description: > + The number of valid istio/mesh/MeshConfig known to galley at a point in time + - name: istio.networking.destinationrules + type: long + description: > + The number of valid istio/networking/destinationrules known to galley at a point in time + - name: istio.networking.envoyfilters + type: long + description: > + The number of valid istio/networking/envoyfilters known to galley at a point in time + - name: istio.networking.gateways + type: long + description: > + The number of valid istio/networking/gateways known to galley at a point in time + - name: istio.networking.sidecars + type: long + description: > + The number of valid istio/networking/sidecars known to galley at a point in time + - name: istio.networking.virtualservices + type: long + description: > + The number of valid istio/networking/virtualservices known to galley at a point in time + - name: istio.policy.attributemanifests + type: long + description: > + The number of valid istio/policy/attributemanifests known to galley at a point in time + - name: istio.policy.handlers + type: long + description: > + The number of valid istio/policy/handlers known to galley at a point in time + - name: istio.policy.instances + type: long + description: > + The number of valid istio/policy/instances known to galley at a point in time + - name: istio.policy.rules + type: long + description: > + The number of valid istio/policy/rules known to galley at a point in time + + + - name: runtime.processor.event_span.duration.ms.bucket.* + type: object + object_type: long + description: > + The duration between each incoming event as histogram buckets in milliseconds + - name: runtime.processor.event_span.duration.ms.sum + type: long + format: duration + description: > + The duration between each incoming event, sum of durations in milliseconds + - name: runtime.processor.event_span.duration.ms.count + type: long + description: > + The duration between each incoming event, number of metrics + + - name: runtime.processor.snapshot_events.bucket.* + type: object + object_type: long + description: > + The number of events that have been processed as histogram buckets + - name: runtime.processor.snapshot_events.sum + type: long + description: > + The number of events that have been processed, sum of events + - name: runtime.processor.snapshot_events.count + type: long + description: > + The duration between each incoming event, number of metrics + + - name: runtime.processor.snapshot_lifetime.duration.ms.bucket.* + type: object + object_type: long + description: > + The duration of each snapshot as histogram buckets in milliseconds + - name: runtime.processor.snapshot_lifetime.duration.ms.sum + type: long + format: duration + description: > + The duration of each snapshot, sum of durations in milliseconds + - name: runtime.processor.snapshot_lifetime.duration.ms.count + type: long + description: > + The duration of each snapshot, number of metrics + + - name: runtime.state_type_instances + type: long + description: > + The number of type instances per type URL + - name: runtime.strategy.on_change + type: long + description: > + The number of times the strategy's onChange has been called + - name: runtime.strategy.timer_quiesce_reached + type: long + description: > + The number of times a quiesce has been reached + - name: source_kube_event_success_total + type: long + description: > + The number of times a kubernetes source successfully handled an event + - name: validation.cert_key.updates + type: long + description: > + Galley validation webhook certificate updates + - name: validation.config.load + type: long + description: > + k8s webhook configuration (re)loads + - name: validation.config.updates + type: long + description: > + k8s webhook configuration updates diff --git a/x-pack/metricbeat/module/istio/galley/_meta/testdata/config.yml b/x-pack/metricbeat/module/istio/galley/_meta/testdata/config.yml new file mode 100644 index 000000000000..ab6bf2416543 --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/testdata/config.yml @@ -0,0 +1,3 @@ +type: http +url: "/metrics" +suffix: plain diff --git a/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain b/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain new file mode 100644 index 000000000000..12d079fcf2cc --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain @@ -0,0 +1,156 @@ +# HELP galley_istio_authentication_meshpolicies The number of valid istio/authentication/meshpolicies known to galley at a point in time +# TYPE galley_istio_authentication_meshpolicies gauge +galley_istio_authentication_meshpolicies{name="default",namespace="",version="v1alpha1"} 1 +# HELP galley_istio_authentication_policies The number of valid istio/authentication/policies known to galley at a point in time +# TYPE galley_istio_authentication_policies gauge +galley_istio_authentication_policies{name="grafana-ports-mtls-disabled",namespace="istio-system",version="v1alpha1"} 1 +# HELP galley_istio_mesh_MeshConfig The number of valid istio/mesh/MeshConfig known to galley at a point in time +# TYPE galley_istio_mesh_MeshConfig gauge +galley_istio_mesh_MeshConfig{name="meshconfig",namespace="istio-system",version="v1alpha1"} 1 +# HELP galley_istio_networking_destinationrules The number of valid istio/networking/destinationrules known to galley at a point in time +# TYPE galley_istio_networking_destinationrules gauge +galley_istio_networking_destinationrules{name="istio-multicluster-destinationrule",namespace="istio-system",version="v1alpha3"} 1 +galley_istio_networking_destinationrules{name="istio-policy",namespace="istio-system",version="v1alpha3"} 1 +galley_istio_networking_destinationrules{name="istio-telemetry",namespace="istio-system",version="v1alpha3"} 1 +# HELP galley_istio_networking_envoyfilters The number of valid istio/networking/envoyfilters known to galley at a point in time +# TYPE galley_istio_networking_envoyfilters gauge +galley_istio_networking_envoyfilters{name="istio-multicluster-egressgateway",namespace="istio-system",version="v1alpha3"} 1 +# HELP galley_istio_networking_gateways The number of valid istio/networking/gateways known to galley at a point in time +# TYPE galley_istio_networking_gateways gauge +galley_istio_networking_gateways{name="bookinfo-gateway",namespace="default",version="v1alpha3"} 1 +galley_istio_networking_gateways{name="ingressgateway",namespace="istio-system",version="v1alpha3"} 1 +galley_istio_networking_gateways{name="istio-multicluster-egressgateway",namespace="istio-system",version="v1alpha3"} 1 +# HELP galley_istio_networking_sidecars The number of valid istio/networking/sidecars known to galley at a point in time +# TYPE galley_istio_networking_sidecars gauge +galley_istio_networking_sidecars{name="default",namespace="istio-system",version="v1alpha3"} 1 +# HELP galley_istio_networking_virtualservices The number of valid istio/networking/virtualservices known to galley at a point in time +# TYPE galley_istio_networking_virtualservices gauge +galley_istio_networking_virtualservices{name="bookinfo",namespace="default",version="v1alpha3"} 1 +galley_istio_networking_virtualservices{name="istio-multicluster-egressgateway",namespace="istio-system",version="v1alpha3"} 1 +# HELP galley_istio_policy_attributemanifests The number of valid istio/policy/attributemanifests known to galley at a point in time +# TYPE galley_istio_policy_attributemanifests gauge +galley_istio_policy_attributemanifests{name="istioproxy",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_attributemanifests{name="kubernetes",namespace="istio-system",version="v1beta1"} 1 +# HELP galley_istio_policy_handlers The number of valid istio/policy/handlers known to galley at a point in time +# TYPE galley_istio_policy_handlers gauge +galley_istio_policy_handlers{name="kubernetesenv",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_handlers{name="prometheus",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_handlers{name="stdio",namespace="istio-system",version="v1beta1"} 1 +# HELP galley_istio_policy_instances The number of valid istio/policy/instances known to galley at a point in time +# TYPE galley_istio_policy_instances gauge +galley_istio_policy_instances{name="accesslog",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="attributes",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="requestcount",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="requestduration",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="requestsize",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="responsesize",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="tcpaccesslog",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="tcpbytereceived",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="tcpbytesent",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="tcpconnectionsclosed",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_instances{name="tcpconnectionsopened",namespace="istio-system",version="v1beta1"} 1 +# HELP galley_istio_policy_rules The number of valid istio/policy/rules known to galley at a point in time +# TYPE galley_istio_policy_rules gauge +galley_istio_policy_rules{name="kubeattrgenrulerule",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="promhttp",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="promtcp",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="promtcpconnectionclosed",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="promtcpconnectionopen",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="stdio",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="stdiotcp",namespace="istio-system",version="v1beta1"} 1 +galley_istio_policy_rules{name="tcpkubeattrgenrulerule",namespace="istio-system",version="v1beta1"} 1 +# HELP galley_runtime_processor_event_span_duration_milliseconds The duration between each incoming event +# TYPE galley_runtime_processor_event_span_duration_milliseconds histogram +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="0"} 0 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="1"} 65 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="2"} 69 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="4"} 71 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="8"} 71 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="16"} 72 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="32"} 75 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="64"} 80 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="128"} 90 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="256"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="512"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="1024"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="2048"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="4096"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="8193"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="16384"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="32768"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="65536"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="131072"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="262144"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="524288"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="1.048576e+06"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="2.097152e+06"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="4.194304e+06"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="8.388608e+06"} 99 +galley_runtime_processor_event_span_duration_milliseconds_bucket{le="+Inf"} 99 +galley_runtime_processor_event_span_duration_milliseconds_sum 2784.0000000000005 +galley_runtime_processor_event_span_duration_milliseconds_count 99 +# HELP galley_runtime_processor_events_processed_total The number of events that have been processed +# TYPE galley_runtime_processor_events_processed_total counter +galley_runtime_processor_events_processed_total 99 +# HELP galley_runtime_processor_snapshot_events_total The number of events per snapshot +# TYPE galley_runtime_processor_snapshot_events_total histogram +galley_runtime_processor_snapshot_events_total_bucket{le="0"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="1"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="2"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="4"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="8"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="16"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="32"} 0 +galley_runtime_processor_snapshot_events_total_bucket{le="64"} 2 +galley_runtime_processor_snapshot_events_total_bucket{le="128"} 2 +galley_runtime_processor_snapshot_events_total_bucket{le="256"} 2 +galley_runtime_processor_snapshot_events_total_bucket{le="+Inf"} 2 +galley_runtime_processor_snapshot_events_total_sum 99 +galley_runtime_processor_snapshot_events_total_count 2 +# HELP galley_runtime_processor_snapshot_lifetime_duration_milliseconds The duration of each snapshot +# TYPE galley_runtime_processor_snapshot_lifetime_duration_milliseconds histogram +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="0"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="1"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="2"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="4"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="8"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="16"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="32"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="64"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="128"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="256"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="512"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="1024"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="2048"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="4096"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="8193"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="16384"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="32768"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="65536"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="131072"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="262144"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="524288"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="1.048576e+06"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="2.097152e+06"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="4.194304e+06"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="8.388608e+06"} 0 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_bucket{le="+Inf"} 2 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_sum 1.8446744073708e+13 +galley_runtime_processor_snapshot_lifetime_duration_milliseconds_count 2 +# HELP galley_runtime_processor_snapshots_published_total The number of snapshots that have been published +# TYPE galley_runtime_processor_snapshots_published_total counter +galley_runtime_processor_snapshots_published_total 2 +# HELP galley_runtime_state_type_instances_total The number of type instances per type URL +# TYPE galley_runtime_state_type_instances_total gauge +galley_runtime_state_type_instances_total{collection="istio/authentication/v1alpha1/meshpolicies"} 1 +galley_runtime_state_type_instances_total{collection="istio/authentication/v1alpha1/policies"} 1 +galley_runtime_state_type_instances_total{collection="istio/mesh/v1alpha1/MeshConfig"} 1 +galley_runtime_state_type_instances_total{collection="istio/networking/v1alpha3/destinationrules"} 3 +galley_runtime_state_type_instances_total{collection="istio/networking/v1alpha3/envoyfilters"} 1 +galley_runtime_state_type_instances_total{collection="istio/networking/v1alpha3/gateways"} 3 +galley_runtime_state_type_instances_total{collection="istio/networking/v1alpha3/sidecars"} 1 +galley_runtime_state_type_instances_total{collection="istio/networking/v1alpha3/virtualservices"} 2 +galley_runtime_state_type_instances_total{collection="istio/policy/v1beta1/attributemanifests"} 2 +galley_runtime_state_type_instances_total{collection="istio/policy/v1beta1/handlers"} 3 +galley_runtime_state_type_instances_total{collection="istio/policy/v1beta1/instances"} 11 +galley_runtime_state_type_instances_total{collection="istio/policy/v1beta1/rules"} 8 diff --git a/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain-expected.json b/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain-expected.json new file mode 100644 index 000000000000..609bae2dfd77 --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/_meta/testdata/docs.plain-expected.json @@ -0,0 +1,1310 @@ +[ + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/envoyfilters", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "virtualservices": 1 + } + }, + "name": "bookinfo", + "namespace": "default", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "tcpconnectionsclosed", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/policy/v1beta1/attributemanifests", + "runtime": { + "state_type_instances": 2 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "authentication": { + "policies": 1 + } + }, + "name": "grafana-ports-mtls-disabled", + "namespace": "istio-system", + "version": "v1alpha1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "attributemanifests": 1 + } + }, + "name": "kubernetes", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/virtualservices", + "runtime": { + "state_type_instances": 2 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "envoyfilters": 1, + "gateways": 1, + "virtualservices": 1 + } + }, + "name": "istio-multicluster-egressgateway", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "mesh": { + "MeshConfig": 1 + } + }, + "name": "meshconfig", + "namespace": "istio-system", + "version": "v1alpha1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/sidecars", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "tcpbytesent", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/authentication/v1alpha1/meshpolicies", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "promtcpconnectionclosed", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "promtcp", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "handlers": 1 + } + }, + "name": "kubernetesenv", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "attributemanifests": 1 + } + }, + "name": "istioproxy", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "gateways": 1 + } + }, + "name": "bookinfo-gateway", + "namespace": "default", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "destinationrules": 1 + } + }, + "name": "istio-telemetry", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/policy/v1beta1/rules", + "runtime": { + "state_type_instances": 8 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/authentication/v1alpha1/policies", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/gateways", + "runtime": { + "state_type_instances": 3 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "kubeattrgenrulerule", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "promtcpconnectionopen", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "requestduration", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/policy/v1beta1/handlers", + "runtime": { + "state_type_instances": 3 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/networking/v1alpha3/destinationrules", + "runtime": { + "state_type_instances": 3 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "authentication": { + "meshpolicies": 1 + } + }, + "name": "default", + "version": "v1alpha1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "attributes", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "sidecars": 1 + } + }, + "name": "default", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "destinationrules": 1 + } + }, + "name": "istio-policy", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "stdiotcp", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/policy/v1beta1/instances", + "runtime": { + "state_type_instances": 11 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "tcpaccesslog", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "tcpbytereceived", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "handlers": 1, + "rules": 1 + } + }, + "name": "stdio", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "accesslog", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "tcpconnectionsopened", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "tcpkubeattrgenrulerule", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "requestsize", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "collection": "istio/mesh/v1alpha1/MeshConfig", + "runtime": { + "state_type_instances": 1 + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "gateways": 1 + } + }, + "name": "ingressgateway", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "rules": 1 + } + }, + "name": "promhttp", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "handlers": 1 + } + }, + "name": "prometheus", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "responsesize", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "runtime": { + "processor": { + "event_span": { + "duration": { + "ms": { + "bucket": { + "+Inf": 99, + "0": 0, + "1": 65, + "1024": 99, + "1048576": 99, + "128": 90, + "131072": 99, + "16": 72, + "16384": 99, + "2": 69, + "2048": 99, + "2097152": 99, + "256": 99, + "262144": 99, + "32": 75, + "32768": 99, + "4": 71, + "4096": 99, + "4194304": 99, + "512": 99, + "524288": 99, + "64": 80, + "65536": 99, + "8": 71, + "8193": 99, + "8388608": 99 + }, + "count": 99, + "sum": 2784.0000000000005 + } + } + }, + "snapshot_events": { + "bucket": { + "+Inf": 2, + "0": 0, + "1": 0, + "128": 2, + "16": 0, + "2": 0, + "256": 2, + "32": 0, + "4": 0, + "64": 2, + "8": 0 + }, + "count": 2, + "sum": 99 + }, + "snapshot_lifetime": { + "duration": { + "ms": { + "bucket": { + "+Inf": 2, + "0": 0, + "1": 0, + "1024": 0, + "1048576": 0, + "128": 0, + "131072": 0, + "16": 0, + "16384": 0, + "2": 0, + "2048": 0, + "2097152": 0, + "256": 0, + "262144": 0, + "32": 0, + "32768": 0, + "4": 0, + "4096": 0, + "4194304": 0, + "512": 0, + "524288": 0, + "64": 0, + "65536": 0, + "8": 0, + "8193": 0, + "8388608": 0 + }, + "count": 2, + "sum": 18446744073708 + } + } + } + } + } + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "networking": { + "destinationrules": 1 + } + }, + "name": "istio-multicluster-destinationrule", + "namespace": "istio-system", + "version": "v1alpha3" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + }, + { + "event": { + "dataset": "istio.galley", + "duration": 115000, + "module": "istio" + }, + "istio": { + "galley": { + "istio": { + "policy": { + "instances": 1 + } + }, + "name": "requestcount", + "namespace": "istio-system", + "version": "v1beta1" + } + }, + "metricset": { + "name": "galley", + "period": 10000 + }, + "service": { + "address": "127.0.0.1:55555", + "type": "istio" + } + } +] \ No newline at end of file diff --git a/x-pack/metricbeat/module/istio/galley/galley.go b/x-pack/metricbeat/module/istio/galley/galley.go new file mode 100644 index 000000000000..72976943ee6a --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/galley.go @@ -0,0 +1,63 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +package galley + +import ( + "github.com/elastic/beats/metricbeat/helper/prometheus" + "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/metricbeat/mb/parse" +) + +const ( + defaultScheme = "http" + defaultPath = "/metrics" +) + +var ( + hostParser = parse.URLHostParserBuilder{ + DefaultScheme: defaultScheme, + DefaultPath: defaultPath, + }.Build() +) + +var mapping = &prometheus.MetricsMapping{ + Metrics: map[string]prometheus.MetricMap{ + "galley_istio_authentication_meshpolicies": prometheus.Metric("istio.authentication.meshpolicies"), + "galley_istio_authentication_policies": prometheus.Metric("istio.authentication.policies"), + "galley_istio_mesh_MeshConfig": prometheus.Metric("istio.mesh.MeshConfig"), + "galley_istio_networking_destinationrules": prometheus.Metric("istio.networking.destinationrules"), + "galley_istio_networking_envoyfilters": prometheus.Metric("istio.networking.envoyfilters"), + "galley_istio_networking_gateways": prometheus.Metric("istio.networking.gateways"), + "galley_istio_networking_sidecars": prometheus.Metric("istio.networking.sidecars"), + "galley_istio_networking_virtualservices": prometheus.Metric("istio.networking.virtualservices"), + "galley_istio_policy_attributemanifests": prometheus.Metric("istio.policy.attributemanifests"), + "galley_istio_policy_handlers": prometheus.Metric("istio.policy.handlers"), + "galley_istio_policy_instances": prometheus.Metric("istio.policy.instances"), + "galley_istio_policy_rules": prometheus.Metric("istio.policy.rules"), + "galley_runtime_processor_event_span_duration_milliseconds": prometheus.Metric("runtime.processor.event_span.duration.ms"), + "galley_runtime_processor_snapshot_events_total": prometheus.Metric("runtime.processor.snapshot_events"), + "galley_runtime_processor_snapshot_lifetime_duration_milliseconds": prometheus.Metric("runtime.processor.snapshot_lifetime.duration.ms"), + "galley_runtime_state_type_instances_total": prometheus.Metric("runtime.state_type_instances"), + "galley_runtime_strategy_on_change_total": prometheus.Metric("runtime.strategy.on_change"), + "galley_runtime_strategy_timer_quiesce_reached_total": prometheus.Metric("runtime.strategy.timer_quiesce_reached"), + "galley_source_kube_event_success_total": prometheus.Metric("source_kube_event_success_total"), + "galley_validation_cert_key_updates": prometheus.Metric("validation.cert_key.updates"), + "galley_validation_config_load": prometheus.Metric("validation.config.load"), + "galley_validation_config_updates": prometheus.Metric("validation.config.updates"), + }, + + Labels: map[string]prometheus.LabelMap{ + "name": prometheus.KeyLabel("name"), + "namespace": prometheus.KeyLabel("namespace"), + "version": prometheus.KeyLabel("version"), + "collection": prometheus.KeyLabel("collection"), + }, +} + +func init() { + mb.Registry.MustAddMetricSet("istio", "galley", + prometheus.MetricSetBuilder(mapping), + mb.WithHostParser(hostParser)) +} diff --git a/x-pack/metricbeat/module/istio/galley/galley_test.go b/x-pack/metricbeat/module/istio/galley/galley_test.go new file mode 100644 index 000000000000..87d3537fdf22 --- /dev/null +++ b/x-pack/metricbeat/module/istio/galley/galley_test.go @@ -0,0 +1,19 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +// +build !integration + +package galley + +import ( + "testing" + + mbtest "github.com/elastic/beats/metricbeat/mb/testing" + + _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" +) + +func TestData(t *testing.T) { + mbtest.TestDataFiles(t, "istio", "galley") +} diff --git a/x-pack/metricbeat/module/istio/mixer/mixer.go b/x-pack/metricbeat/module/istio/mixer/mixer.go index 7c5eb7bce5d8..bbf150eeb328 100644 --- a/x-pack/metricbeat/module/istio/mixer/mixer.go +++ b/x-pack/metricbeat/module/istio/mixer/mixer.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -package mesh +package mixer import ( "github.com/elastic/beats/metricbeat/helper/prometheus" diff --git a/x-pack/metricbeat/module/istio/mixer/mixer_test.go b/x-pack/metricbeat/module/istio/mixer/mixer_test.go index 8c10083423e2..a50267040a0e 100644 --- a/x-pack/metricbeat/module/istio/mixer/mixer_test.go +++ b/x-pack/metricbeat/module/istio/mixer/mixer_test.go @@ -4,7 +4,7 @@ // +build !integration -package mesh +package mixer import ( "testing" diff --git a/x-pack/metricbeat/modules.d/istio.yml.disabled b/x-pack/metricbeat/modules.d/istio.yml.disabled index 6a87b3428e59..998098f24057 100644 --- a/x-pack/metricbeat/modules.d/istio.yml.disabled +++ b/x-pack/metricbeat/modules.d/istio.yml.disabled @@ -1,16 +1,23 @@ # Module: istio # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-istio.html -# Istio mesh. To collect all all Mixer-generated metrics +# Istio mesh. To collect all Mixer-generated metrics - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + hosts: ["localhost:15014"] + +# Istio galley. To collect all Galley-generated metrics +- module: galley + metricsets: ["galley"] + period: 10s + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset hosts: ["localhost:15014"] From 9032397ba37cade391cc245bf6eb1af75503221c Mon Sep 17 00:00:00 2001 From: chrismark Date: Mon, 27 Jan 2020 14:38:21 +0200 Subject: [PATCH 2/6] Add changelog entry Signed-off-by: chrismark --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 39a0e511984c..68dd9bb3baea 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -104,6 +104,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add mesh metricset for Istio Metricbeat module {pull}15535[15535] - Add mixer metricset for Istio Metricbeat module {pull}15696[15696] - Make the `system/cpu` metricset collect normalized CPU metrics by default. {issue}15618[15618] {pull}15729[15729] +- Add galley metricset for Istio Metricbeat module {pull}15857[15857] *Packetbeat* From 58498a2213632791ffc77bd3ebe9899b0e01d3d9 Mon Sep 17 00:00:00 2001 From: chrismark Date: Mon, 27 Jan 2020 14:44:37 +0200 Subject: [PATCH 3/6] fix config Signed-off-by: chrismark --- metricbeat/docs/modules/istio.asciidoc | 2 +- x-pack/metricbeat/metricbeat.reference.yml | 2 +- x-pack/metricbeat/module/istio/_meta/config.reference.yml | 2 +- x-pack/metricbeat/module/istio/_meta/config.yml | 2 +- x-pack/metricbeat/modules.d/istio.yml.disabled | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metricbeat/docs/modules/istio.asciidoc b/metricbeat/docs/modules/istio.asciidoc index c1e29c6c6688..6fbe1f453953 100644 --- a/metricbeat/docs/modules/istio.asciidoc +++ b/metricbeat/docs/modules/istio.asciidoc @@ -43,7 +43,7 @@ metricbeat.modules: hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics -- module: galley +- module: istio metricsets: ["galley"] period: 10s # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 3b41f7f9df36..f2368bc10210 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -553,7 +553,7 @@ metricbeat.modules: hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics -- module: galley +- module: istio metricsets: ["galley"] period: 10s # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset diff --git a/x-pack/metricbeat/module/istio/_meta/config.reference.yml b/x-pack/metricbeat/module/istio/_meta/config.reference.yml index 5c3d46050b7f..ea7fe471deee 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.reference.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.reference.yml @@ -13,7 +13,7 @@ hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics -- module: galley +- module: istio metricsets: ["galley"] period: 10s # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset diff --git a/x-pack/metricbeat/module/istio/_meta/config.yml b/x-pack/metricbeat/module/istio/_meta/config.yml index 5c3d46050b7f..ea7fe471deee 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.yml @@ -13,7 +13,7 @@ hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics -- module: galley +- module: istio metricsets: ["galley"] period: 10s # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset diff --git a/x-pack/metricbeat/modules.d/istio.yml.disabled b/x-pack/metricbeat/modules.d/istio.yml.disabled index 998098f24057..e1f048f4b112 100644 --- a/x-pack/metricbeat/modules.d/istio.yml.disabled +++ b/x-pack/metricbeat/modules.d/istio.yml.disabled @@ -16,7 +16,7 @@ hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics -- module: galley +- module: istio metricsets: ["galley"] period: 10s # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset From c36044817c4f260a658aa4e27eb06a9e357a57f3 Mon Sep 17 00:00:00 2001 From: chrismark Date: Thu, 30 Jan 2020 11:04:07 +0200 Subject: [PATCH 4/6] fix typo Signed-off-by: chrismark --- metricbeat/docs/fields.asciidoc | 2 +- x-pack/metricbeat/module/istio/fields.go | 2 +- x-pack/metricbeat/module/istio/galley/_meta/fields.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index f47b23519196..033cd68ee6df 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -16622,7 +16622,7 @@ type: keyword *`istio.galley.namespace`*:: + -- -The Kubernates namespace of the resource +The Kubernetes namespace of the resource type: keyword diff --git a/x-pack/metricbeat/module/istio/fields.go b/x-pack/metricbeat/module/istio/fields.go index f26b13bd557b..bd074e758dfb 100644 --- a/x-pack/metricbeat/module/istio/fields.go +++ b/x-pack/metricbeat/module/istio/fields.go @@ -19,5 +19,5 @@ func init() { // AssetIstio returns asset data. // This is the base64 encoded gzipped contents of module/istio. func AssetIstio() string { - return "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" + return "eJzUm0uP47gRx+/9KQp7yQMzmmvQhwDBHJJBMsBiMjl7KapscU2R2iJpj/fTB3xJarWsbrslu9eHRlsP/n9VLJLFhz/CHk+PIIwV+gHACivxEX4K3396AKjQcBKtFVo9wt8fACA+C1915SQ+ABBKZAYfoUTLHgC2AmVlHsOjH0GxBvvi/ceeWnyEHWnXpisTGv7zS3jrF+BaWSaUAWOZ9de4AVszC0ckBEJWwZZ0A18GIkOIIciOSYmn7vIUzQyR/3yeoCGUzGIFVoOtMYIkKTBIB8FxUMbYYfkzZh5y+79PbmTyPZ6OmqrRvRl+//leYygR9DYAExrtiGP40qAlwUEMzTrLZFrGFwb7tyuRFFo0vcIYdJLngGSEVsvSpEIzgC5/RW4n5bmWErldnKAvN0MIZSxTAy9M8oTWUzBna1RWcOZLKBo0daul4ALNJKbUandFMLmmRPJ8ByZFFbU/PdX+NNSGvdJH5RtMaibMAoNWC2VBKLCima7jSaPuZdAyxni3FF/R1J+12oox6/JGeL1Pvd7b4BXao6a9ULuiQmOFCp4hJ29QG732p7H2YkahOujTVkiLdFODhrqLGbNjFo/sdFNDsuZiRhhRIWe3rY2suZgRB0HWMZlyg5vaMpJ+m0mhBzwVzFoSpbPYMCW2aOz6FkXlT8+VFzGoZqqSt2jyyYystwh8Tg9uRt8JLoJ/m8EjoV88WsznXOSUf7poSXM0RlOBB1R2Y1qmispRSsJMUTq+R1v8ddLOiSQT0sXNWzyRAfzE44ioABmvQSiuG6F2EFCBGaiFsXpHrIGIabwXGiGlMMi1qszbbDeueW31bjU1zD525OvY/AGMa3yA5IcXNphrp8bVuXY9fhjEfZzRmUtD1yjWmlrbTSjwTjHbWxEp4sy/ZgeE0puecLGaDNwrLb0gQpc0oYvD+NyV8H/0aJNii+He++kvfZV4ozPjkp3kvN336SvH9i7WQc4bu1rkPrfnynA1llkMMbVZN8vypUCfV7VI8dL/vv3nBUBiFnenQqsNr5naTS/OvRlPNGjCWlQW/JMBrT4HRaiZiT0b9+lU9Tpg/402vzmBhuOGfH3heLVsSXgGSavHnRLNvHHdcbN3JW7SMO+4j+qN1ZbJVUH3/YpoWqdN2lsn5Qni5KECpmJnPL046nPf2NI4kt3s8VS4tmJ2sQD+Z8ydeyE4YllrvQcvKLaCM4swpTnFGNamCqnZUjGw/5vpgULpuXf4M+FfvNBroZZ123musU4matDUD2PhNXYwvNBC+xfPlqyH7BZ/jLv9V7STlnSDtkZnpkvP0r/qclL16gX5gfC47K53w9/ckssgvovpCu0afHnybT7WVUv6x2mO5b7p1LcI0Q/JV6ZPE7bcLEX6lv2fX782LZowYsnUZ4KzH1MmI3NMZsTvWJQni3eMlP+K3/G1E7rn2MvN4M7wjAVmWFao2zHNU4kzYKbVyuAfr3Kfc9+xdp/DvJfqbTVZpOWGum+pRBAVKp+/pYw/K/V78jHi4YsFYcCg9VnEYEcOxDa95O+HoxospBVIw8ELmKpyfjv1BpcClR2+Ucxk6sVR095ndcXSRyeEGXskH6VI8FkZjrXgdTi+Qlqm6VKEezX44ucrpumfHLIYmTEL25JQXLRnJkCLMbaIBJ1WBrXEtlvBM8sgAI81qvjS0y17f98ZnLeJte261iQHs7aFkhmsQKvwRbIS5TW1sMLJl+fUo5MwZ/kmQQfdwT1a5rA3mvfoWdB7tMTrsN9FmxwCvblhDgtbvXUOnT7fRCer52UL7tFa5yPpReS0CFDU2kynOotwDyGTInjFnHaJUqKfw/lZb7f/kNOPV9uwfq8zZYdXvYzx1h3OBPULEZJd35K2muu1+5ukMp93/uPnL/2TYuv/P4gKqw+gbY10FKZ7EzT55Eylw5X5rela6jJ/rqvl1tSfW5l1wOs8MzW8EfsgYaAlND4l1kqefAf1r+/ff877GdNW9OYWBrkjYU/p2MXKGU9qBaNOP0rPV2jjrGNyY6WJg0fM/9NwER5ge++tpnEqlxtswzChGE0jzgxLVoNT8RRIEBm9lVfdhfJ/k+MyPWdKaQtliNAWSfo7rQvrqX0tdIu34seTSdqKq7deaanl23hSlbdFriTG9+vsfOXG6QWAkKM4xKXOl6ZPaXWeVay1SIVQW10gkSaTFu5XwY0KgCrM0ZGwgsqRH5jSrqf/NwV4QgOP9nSt//UWxWvruD42gCQX1jI9NXdEvpdJNLOk+TTeqnydyBWE6aDdDdzYHem7HjJFb78DdasILpEzZzDbMNzTI7SOFFbxtVkz8q7MO2uFGeuCFthZsn7Y9Hv+l8cNOfnenO2RLnD00IKGWV6vM8QkqErETZv4YzJmwI/jLSODrJTzo0wAXT8a4vHUyyPBYtP6lOCdRUPGuiAiOkvWd3aWusbhThmfjW0FVgULCfYmdZ6rAEeJFLlbJmTwOvoEsBt3SvSed4odmJDnA7oSpvUtDWkzSI7NpkXaHBgJtKcVj7h8DUlqToyGACHly/GSQILotBl5zMzmF1xqs9IBos7F/a9Qo1qO/BgUYIkpI86HeGauGDZaLRnaOXKfRswBIUoBaWeFipHOYCcO2OV9gOogSKsG1ZlFlYzt485R2EYU8haeToHOCWMucp23O+xQZ7fqE4+1kDFMPHJn13UmdEGu8HirCFd4lKfo+6sDveMmdDdsnIQf3dWtc0nIwU+uU0OcVOmPnoVebyWCXPr/AwAA//8IvHOv" } diff --git a/x-pack/metricbeat/module/istio/galley/_meta/fields.yml b/x-pack/metricbeat/module/istio/galley/_meta/fields.yml index 468bc3741181..df9e6f29c00c 100644 --- a/x-pack/metricbeat/module/istio/galley/_meta/fields.yml +++ b/x-pack/metricbeat/module/istio/galley/_meta/fields.yml @@ -11,7 +11,7 @@ - name: namespace type: keyword description: > - The Kubernates namespace of the resource + The Kubernetes namespace of the resource - name: version type: keyword description: > From ee5005c7faa1265ab63176d86927853c5b526d92 Mon Sep 17 00:00:00 2001 From: chrismark Date: Thu, 30 Jan 2020 13:39:02 +0200 Subject: [PATCH 5/6] fix docs Signed-off-by: chrismark --- metricbeat/docs/modules/istio.asciidoc | 6 +----- x-pack/metricbeat/module/istio/_meta/docs.asciidoc | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/metricbeat/docs/modules/istio.asciidoc b/metricbeat/docs/modules/istio.asciidoc index 7c6fc64532fc..1198926dac19 100644 --- a/metricbeat/docs/modules/istio.asciidoc +++ b/metricbeat/docs/modules/istio.asciidoc @@ -11,11 +11,7 @@ beta[] This is the Istio module. The Istio module collects metrics from the Istio https://istio.io/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints]. -<<<<<<< HEAD -The default metricsets are `mesh`, `mixer`, `galley`. -======= -The default metricsets are `mesh`, `mixer`, `pilot`. ->>>>>>> upstream/master +The default metricsets are `mesh`, `mixer`, `pilot`, `galley`. [float] === Compatibility diff --git a/x-pack/metricbeat/module/istio/_meta/docs.asciidoc b/x-pack/metricbeat/module/istio/_meta/docs.asciidoc index f323f81373cd..8d2abd1f9623 100644 --- a/x-pack/metricbeat/module/istio/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/istio/_meta/docs.asciidoc @@ -1,11 +1,7 @@ This is the Istio module. The Istio module collects metrics from the Istio https://istio.io/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints]. -<<<<<<< HEAD -The default metricsets are `mesh`, `mixer`, `galley`. -======= -The default metricsets are `mesh`, `mixer`, `pilot`. ->>>>>>> upstream/master +The default metricsets are `mesh`, `mixer`, `pilot`, `galley`. [float] === Compatibility From 42a874731d8b31925ede1c9fd124739d757e3b95 Mon Sep 17 00:00:00 2001 From: chrismark Date: Fri, 31 Jan 2020 00:21:44 +0200 Subject: [PATCH 6/6] fix typo in config comments Signed-off-by: chrismark --- metricbeat/docs/modules/istio.asciidoc | 8 ++++---- x-pack/metricbeat/metricbeat.reference.yml | 8 ++++---- x-pack/metricbeat/module/istio/_meta/config.reference.yml | 8 ++++---- x-pack/metricbeat/module/istio/_meta/config.yml | 8 ++++---- x-pack/metricbeat/module/istio/pilot/_meta/data.json | 2 +- x-pack/metricbeat/modules.d/istio.yml.disabled | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/metricbeat/docs/modules/istio.asciidoc b/metricbeat/docs/modules/istio.asciidoc index 1198926dac19..34da877c4b33 100644 --- a/metricbeat/docs/modules/istio.asciidoc +++ b/metricbeat/docs/modules/istio.asciidoc @@ -32,28 +32,28 @@ metricbeat.modules: - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics - module: istio metricsets: ["galley"] period: 10s - # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio pilot. To collect all Pilot-generated metrics. - module: istio metricsets: ["pilot"] period: 10s - # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] ---- diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index b65c2762d8b3..4e64e70a8ed0 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -542,28 +542,28 @@ metricbeat.modules: - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics - module: istio metricsets: ["galley"] period: 10s - # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio pilot. To collect all Pilot-generated metrics. - module: istio metricsets: ["pilot"] period: 10s - # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] #------------------------------- Jolokia Module ------------------------------- diff --git a/x-pack/metricbeat/module/istio/_meta/config.reference.yml b/x-pack/metricbeat/module/istio/_meta/config.reference.yml index 05e9a3cc6e8c..9274eefce250 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.reference.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.reference.yml @@ -2,26 +2,26 @@ - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics - module: istio metricsets: ["galley"] period: 10s - # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio pilot. To collect all Pilot-generated metrics. - module: istio metricsets: ["pilot"] period: 10s - # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] diff --git a/x-pack/metricbeat/module/istio/_meta/config.yml b/x-pack/metricbeat/module/istio/_meta/config.yml index 05e9a3cc6e8c..9274eefce250 100644 --- a/x-pack/metricbeat/module/istio/_meta/config.yml +++ b/x-pack/metricbeat/module/istio/_meta/config.yml @@ -2,26 +2,26 @@ - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics - module: istio metricsets: ["galley"] period: 10s - # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio pilot. To collect all Pilot-generated metrics. - module: istio metricsets: ["pilot"] period: 10s - # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] diff --git a/x-pack/metricbeat/module/istio/pilot/_meta/data.json b/x-pack/metricbeat/module/istio/pilot/_meta/data.json index 46444b9e226e..56abc7408098 100644 --- a/x-pack/metricbeat/module/istio/pilot/_meta/data.json +++ b/x-pack/metricbeat/module/istio/pilot/_meta/data.json @@ -23,4 +23,4 @@ "address": "127.0.0.1:55555", "type": "istio" } -} +} \ No newline at end of file diff --git a/x-pack/metricbeat/modules.d/istio.yml.disabled b/x-pack/metricbeat/modules.d/istio.yml.disabled index da0c97922c4b..5c498d6f183f 100644 --- a/x-pack/metricbeat/modules.d/istio.yml.disabled +++ b/x-pack/metricbeat/modules.d/istio.yml.disabled @@ -5,26 +5,26 @@ - module: istio metricsets: ["mesh"] period: 10s - # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:42422, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:42422"] # Istio mixer. To monitor Mixer itself. - module: istio metricsets: ["mixer"] period: 10s - # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-telemetry.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio galley. To collect all Galley-generated metrics - module: istio metricsets: ["galley"] period: 10s - # use istio-galley.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-galley.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"] # Istio pilot. To collect all Pilot-generated metrics. - module: istio metricsets: ["pilot"] period: 10s - # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kuberentes cluster as Pod or Daemonset + # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset hosts: ["localhost:15014"]