Cherry-pick #21519 to 7.x: Add istiod metricset

CHANGELOG.next.asciidoc

@@ -519,6 +519,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - Add Cloud Foundry tags in related events. {pull}21177[21177]
 - Cloud Foundry metadata is cached to disk. {pull}20775[20775]
 - Add option to select the type of index template to load: legacy, component, index. {pull}21212[21212]
+- Add istiod metricset. {pull}21519[21519]
 - Release `add_cloudfoundry_metadata` as GA. {pull}21525[21525]
 - Add support for OpenStack SSL metadata APIs in `add_cloud_metadata`. {pull}21590[21590]
 

metricbeat/docs/modules/istio.asciidoc

@@ -8,15 +8,28 @@ This file is generated! See scripts/mage/docs_collector.go
 
 beta[]
 
-This is the Istio module. The Istio module collects metrics from the
+This is the Istio module.
+This module is compatible with versions before `1.5` of Istio where microservices architecture is used. If using
+versions priot to `1.5` then `mesh`, `mixer`, `pilot`, `galley`, `citadel` metricsets should be used.
+wehre the Istio module collects metrics from the
 Istio https://istio.io/v1.4/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints].
+For versions after `1.5`, `istiod` metricset can be used which collects metrics directly from Istio Daemon.
 
 The default metricsets are `mesh`, `mixer`, `pilot`, `galley`, `citadel`.
 
 [float]
 === Compatibility
 
-The Istio module is tested with Istio `1.4`.
+The Istio module is tested with Istio `1.4` for `mesh`, `mixer`, `pilot`, `galley`, `citadel`.
+The Istio module is tested with Istio `1.7` for `istiod`.
+
+[float]
+=== Dashboard
+
+The Istio module includes a predefined dashboard with overview information about Istio Daemon.
+This dashboard is only compatible with versions of Istio after `1.5` which should be monitored with `istiod` metricset.
+
+image::./images/metricbeat-istio-overview.png[]
 
 
 [float]
@@ -62,6 +75,13 @@ metricbeat.modules:
   period: 10s
   # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
   hosts: ["localhost:15014"]
+
+# Istio istiod to monitor the Istio Daemon for versions after 1.5 of Istio.
+- module: istio
+  metricsets: ['istiod']
+  period: 10s
+  # use istiod.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
+  hosts: ['localhost:15014']
 ----
 
 [float]

metricbeat/docs/modules_list.asciidoc

@@ -132,7 +132,7 @@ This file is generated! See scripts/mage/docs_collector.go
 .3+| .3+|  |<<metricbeat-metricset-iis-application_pool,application_pool>> beta[]  
 |<<metricbeat-metricset-iis-webserver,webserver>> beta[]  
 |<<metricbeat-metricset-iis-website,website>> beta[]  
-|<<metricbeat-module-istio,Istio>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+|<<metricbeat-module-istio,Istio>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .5+| .5+|  |<<metricbeat-metricset-istio-citadel,citadel>> beta[]  
 |<<metricbeat-metricset-istio-galley,galley>> beta[]  
 |<<metricbeat-metricset-istio-mesh,mesh>> beta[]  

x-pack/metricbeat/metricbeat.reference.yml

@@ -694,6 +694,13 @@ metricbeat.modules:
   # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
   hosts: ["localhost:15014"]
 
+# Istio istiod to monitor the Istio Daemon for versions after 1.5 of Istio.
+- module: istio
+  metricsets: ['istiod']
+  period: 10s
+  # use istiod.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
+  hosts: ['localhost:15014']
+
 #------------------------------- Jolokia Module -------------------------------
 - module: jolokia
   #metricsets: ["jmx"]

x-pack/metricbeat/module/istio/_meta/config.reference.yml

@@ -32,3 +32,10 @@
   period: 10s
   # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
   hosts: ["localhost:15014"]
+
+# Istio istiod to monitor the Istio Daemon for versions after 1.5 of Istio.
+- module: istio
+  metricsets: ['istiod']
+  period: 10s
+  # use istiod.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
+  hosts: ['localhost:15014']

x-pack/metricbeat/module/istio/_meta/config.yml

@@ -32,3 +32,10 @@
   period: 10s
   # use istio-pilot.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
   hosts: ["localhost:15014"]
+
+# Istio istiod to monitor the Istio Daemon for versions after 1.5 of Istio.
+- module: istio
+  metricsets: ['istiod']
+  period: 10s
+  # use istiod.istio-system:15014, when deploying Metricbeat in a kubernetes cluster as Pod or Daemonset
+  hosts: ['localhost:15014']

x-pack/metricbeat/module/istio/_meta/docs.asciidoc

@@ -1,9 +1,22 @@
-This is the Istio module. The Istio module collects metrics from the
+This is the Istio module.
+This module is compatible with versions before `1.5` of Istio where microservices architecture is used. If using
+versions priot to `1.5` then `mesh`, `mixer`, `pilot`, `galley`, `citadel` metricsets should be used.
+wehre the Istio module collects metrics from the
 Istio https://istio.io/v1.4/docs/tasks/observability/metrics/querying-metrics/#about-the-prometheus-add-on[prometheus exporters endpoints].
+For versions after `1.5`, `istiod` metricset can be used which collects metrics directly from Istio Daemon.
 
 The default metricsets are `mesh`, `mixer`, `pilot`, `galley`, `citadel`.
 
 [float]
 === Compatibility
 
-The Istio module is tested with Istio `1.4`.
+The Istio module is tested with Istio `1.4` for `mesh`, `mixer`, `pilot`, `galley`, `citadel`.
+The Istio module is tested with Istio `1.7` for `istiod`.
+
+[float]
+=== Dashboard
+
+The Istio module includes a predefined dashboard with overview information about Istio Daemon.
+This dashboard is only compatible with versions of Istio after `1.5` which should be monitored with `istiod` metricset.
+
+image::./images/metricbeat-istio-overview.png[]