Merge branch 'master' of github.com:elastic/beats into metricbeat/kib…

…ana/usage_collection
elastic · Sep 1, 2020 · 8bae5da · 8bae5da
2 parents 6d9c7ba + ba0f03d
commit 8bae5da
Show file tree

Hide file tree

Showing 24 changed files with 2,086 additions and 4 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -549,6 +549,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Return error when log harvester tries to open a named pipe. {issue}18682[18682] {pull}20450[20450]
 - Avoid goroutine leaks in Filebeat readers. {issue}19193[19193] {pull}20455[20455]
 - Convert httpjson to v2 input {pull}20226[20226]
+- Improve Zeek x509 module with `x509` ECS mappings {pull}20867[20867]
 
 *Heartbeat*
 
@@ -661,6 +662,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add cloud.instance.name into aws ec2 metricset. {pull}20077[20077]
 - Add host inventory metrics into aws ec2 metricset. {pull}20171[20171]
 - Add `scope` setting for elasticsearch module, allowing it to monitor an Elasticsearch cluster behind a load-balancing proxy. {issue}18539[18539] {pull}18547[18547]
+- Add state_daemonset metricset for Kubernetes Metricbeat module {pull}20649[20649]
 - Add host inventory metrics to azure compute_vm metricset. {pull}20641[20641]
 - Add host inventory metrics to googlecloud compute metricset. {pull}20391[20391]
 - Request prometheus endpoints to be gzipped by default {pull}20766[20766]

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -27716,6 +27716,67 @@ type: double
 --
 Deadline seconds after schedule for considering failed
 
+type: long
+
+--
+
+[float]
+=== daemonset
+
+Kubernetes DaemonSet metrics
+
+
+
+*`kubernetes.daemonset.name`*::
++
+--
+type: keyword
+
+--
+
+[float]
+=== replicas
+
+Kubernetes DaemonSet replica metrics
+
+
+
+*`kubernetes.daemonset.replicas.available`*::
++
+--
+The number of available replicas per DaemonSet
+
+
+type: long
+
+--
+
+*`kubernetes.daemonset.replicas.desired`*::
++
+--
+The desired number of replicas per DaemonSet
+
+
+type: long
+
+--
+
+*`kubernetes.daemonset.replicas.ready`*::
++
+--
+The number of ready replicas per DaemonSet
+
+
+type: long
+
+--
+
+*`kubernetes.daemonset.replicas.unavailable`*::
++
+--
+The number of unavailable replicas per DaemonSet
+
+
 type: long
 
 --

diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -210,6 +210,7 @@ metricbeat.modules:
   enabled: true
   metricsets:
     - state_node
+    - state_daemonset
     - state_deployment
     - state_replicaset
     - state_statefulset
@@ -303,6 +304,8 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-kubernetes-state_cronjob,state_cronjob>>
 
+* <<metricbeat-metricset-kubernetes-state_daemonset,state_daemonset>>
+
 * <<metricbeat-metricset-kubernetes-state_deployment,state_deployment>>
 
 * <<metricbeat-metricset-kubernetes-state_node,state_node>>
@@ -345,6 +348,8 @@ include::kubernetes/state_container.asciidoc[]
 
 include::kubernetes/state_cronjob.asciidoc[]
 
+include::kubernetes/state_daemonset.asciidoc[]
+
 include::kubernetes/state_deployment.asciidoc[]
 
 include::kubernetes/state_node.asciidoc[]

diff --git a/metricbeat/docs/modules/kubernetes/state_daemonset.asciidoc b/metricbeat/docs/modules/kubernetes/state_daemonset.asciidoc
@@ -0,0 +1,23 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-kubernetes-state_daemonset]]
+=== Kubernetes state_daemonset metricset
+
+experimental[]
+
+include::../../../module/kubernetes/state_daemonset/_meta/docs.asciidoc[]
+
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-kubernetes,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../module/kubernetes/state_daemonset/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -148,7 +148,7 @@ This file is generated! See scripts/mage/docs_collector.go
 .2+| .2+|  |<<metricbeat-metricset-kibana-stats,stats>>   
 |<<metricbeat-metricset-kibana-status,status>>   
 |<<metricbeat-module-kubernetes,Kubernetes>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.21+| .21+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>>   
+.22+| .22+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>>   
 |<<metricbeat-metricset-kubernetes-container,container>>   
 |<<metricbeat-metricset-kubernetes-controllermanager,controllermanager>>   
 |<<metricbeat-metricset-kubernetes-event,event>>   
@@ -158,6 +158,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-kubernetes-scheduler,scheduler>>   
 |<<metricbeat-metricset-kubernetes-state_container,state_container>>   
 |<<metricbeat-metricset-kubernetes-state_cronjob,state_cronjob>>   
+|<<metricbeat-metricset-kubernetes-state_daemonset,state_daemonset>> experimental[]  
 |<<metricbeat-metricset-kubernetes-state_deployment,state_deployment>>   
 |<<metricbeat-metricset-kubernetes-state_node,state_node>>   
 |<<metricbeat-metricset-kubernetes-state_persistentvolumeclaim,state_persistentvolumeclaim>> experimental[]  

diff --git a/metricbeat/include/list_docker.go b/metricbeat/include/list_docker.go
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -489,6 +489,7 @@ metricbeat.modules:
   enabled: true
   metricsets:
     - state_node
+    - state_daemonset
     - state_deployment
     - state_replicaset
     - state_statefulset

diff --git a/metricbeat/module/kubernetes/_meta/config.reference.yml b/metricbeat/module/kubernetes/_meta/config.reference.yml
@@ -29,6 +29,7 @@
   enabled: true
   metricsets:
     - state_node
+    - state_daemonset
     - state_deployment
     - state_replicaset
     - state_statefulset

diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go
diff --git a/metricbeat/module/kubernetes/state_daemonset/_meta/data.json b/metricbeat/module/kubernetes/state_daemonset/_meta/data.json
@@ -0,0 +1,28 @@
+{
+    "@timestamp": "2019-03-01T08:05:34.853Z",
+    "event": {
+        "dataset": "kubernetes.daemonset",
+        "duration": 115000,
+        "module": "kubernetes"
+    },
+    "kubernetes": {
+        "daemonset": {
+            "name": "kube-proxy",
+            "replicas": {
+                "available": 1,
+                "desired": 1,
+                "ready": 1,
+                "unavailable": 0
+            }
+        },
+        "namespace": "kube-system"
+    },
+    "metricset": {
+        "name": "state_daemonset",
+        "period": 10000
+    },
+    "service": {
+        "address": "127.0.0.1:55555",
+        "type": "kubernetes"
+    }
+}
diff --git a/metricbeat/module/kubernetes/state_daemonset/_meta/docs.asciidoc b/metricbeat/module/kubernetes/state_daemonset/_meta/docs.asciidoc
@@ -0,0 +1 @@
+This is the `state_daemonset` metricset of the Kubernetes module.