Merge remote-tracking branch 'upstream/master' into feature/ci-pipeli…

…ne-2.0 * upstream/master: Release Kubernetes state metricsets as GA (elastic#20901) Clarify use for shared_credential_file (elastic#20929)
v1v · Sep 3, 2020 · df6ebd5 · df6ebd5
2 parents 289d5ff + 9807eb1
commit df6ebd5
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 20 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -670,6 +670,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - 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]
+- Release all kubernetes `state` metricsets as GA {pull}20901[20901]
 - Add billing metricset into googlecloud module. {pull}20812[20812] {issue}20738[20738]
 
 *Packetbeat*

diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -29,6 +29,7 @@ data:
                   metricsets:
                     - state_node
                     - state_deployment
+                    - state_daemonset
                     - state_replicaset
                     - state_pod
                     - state_container

diff --git a/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml b/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml
@@ -29,6 +29,7 @@ data:
                   metricsets:
                     - state_node
                     - state_deployment
+                    - state_daemonset
                     - state_replicaset
                     - state_pod
                     - state_container

diff --git a/metricbeat/docs/modules/kubernetes/state_daemonset.asciidoc b/metricbeat/docs/modules/kubernetes/state_daemonset.asciidoc
@@ -5,8 +5,6 @@ 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[]
 
 

diff --git a/metricbeat/docs/modules/kubernetes/state_persistentvolumeclaim.asciidoc b/metricbeat/docs/modules/kubernetes/state_persistentvolumeclaim.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-kubernetes-state_persistentvolumeclaim]]
 === Kubernetes state_persistentvolumeclaim metricset
 
-experimental[]
-
 include::../../../module/kubernetes/state_persistentvolumeclaim/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/kubernetes/state_service.asciidoc b/metricbeat/docs/modules/kubernetes/state_service.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-kubernetes-state_service]]
 === Kubernetes state_service metricset
 
-experimental[]
-
 include::../../../module/kubernetes/state_service/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/kubernetes/state_storageclass.asciidoc b/metricbeat/docs/modules/kubernetes/state_storageclass.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-kubernetes-state_storageclass]]
 === Kubernetes state_storageclass metricset
 
-experimental[]
-
 include::../../../module/kubernetes/state_storageclass/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -159,16 +159,16 @@ 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_daemonset,state_daemonset>>   
 |<<metricbeat-metricset-kubernetes-state_deployment,state_deployment>>   
 |<<metricbeat-metricset-kubernetes-state_node,state_node>>   
-|<<metricbeat-metricset-kubernetes-state_persistentvolumeclaim,state_persistentvolumeclaim>> experimental[]  
+|<<metricbeat-metricset-kubernetes-state_persistentvolumeclaim,state_persistentvolumeclaim>>   
 |<<metricbeat-metricset-kubernetes-state_pod,state_pod>>   
 |<<metricbeat-metricset-kubernetes-state_replicaset,state_replicaset>>   
 |<<metricbeat-metricset-kubernetes-state_resourcequota,state_resourcequota>>   
-|<<metricbeat-metricset-kubernetes-state_service,state_service>> experimental[]  
+|<<metricbeat-metricset-kubernetes-state_service,state_service>>   
 |<<metricbeat-metricset-kubernetes-state_statefulset,state_statefulset>>   
-|<<metricbeat-metricset-kubernetes-state_storageclass,state_storageclass>> experimental[]  
+|<<metricbeat-metricset-kubernetes-state_storageclass,state_storageclass>>   
 |<<metricbeat-metricset-kubernetes-system,system>>   
 |<<metricbeat-metricset-kubernetes-volume,volume>>   
 |<<metricbeat-module-kvm,KVM>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  

diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go
diff --git a/metricbeat/module/kubernetes/state_daemonset/_meta/fields.yml b/metricbeat/module/kubernetes/state_daemonset/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Kubernetes DaemonSet metrics
-  release: experimental
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/kubernetes/state_persistentvolume/_meta/fields.yml b/metricbeat/module/kubernetes/state_persistentvolume/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     kubernetes persistent volume metrics from kube-state-metrics
-  release: experimental
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/_meta/fields.yml b/metricbeat/module/kubernetes/state_persistentvolumeclaim/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     kubernetes persistent volume clame metrics from kube-state-metrics
-  release: experimental
+  release: ga
   fields:
     - name: name
       type: keyword
@@ -22,4 +22,4 @@
     - name: storage_class
       type: keyword
       description: Storage class for the PVC.
-
+
diff --git a/metricbeat/module/kubernetes/state_service/_meta/fields.yml b/metricbeat/module/kubernetes/state_service/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     kubernetes service metrics
-  release: experimental
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/kubernetes/state_storageclass/_meta/fields.yml b/metricbeat/module/kubernetes/state_storageclass/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     kubernetes storage class metrics
-  release: experimental
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/x-pack/libbeat/docs/aws-credentials-config.asciidoc b/x-pack/libbeat/docs/aws-credentials-config.asciidoc
@@ -38,7 +38,8 @@ given, the default profile will be used.
 `shared_credential_file` is optional to specify the directory of your shared
 credentials file. If it's empty, the default directory will be used.
 In Windows, shared credentials file is at `C:\Users\<yourUserName>\.aws\credentials`.
-For Linux, macOS or Unix, the file is located at `~/.aws/credentials`. Please see
+For Linux, macOS or Unix, the file is located at `~/.aws/credentials`. When running as a service, 
+the home path depends on the user that manages the service, so the `shared_credential_file` parameter can be used to avoid ambiguity. Please see
 https://docs.aws.amazon.com/ses/latest/DeveloperGuide/create-shared-credentials-file.html[Create Shared Credentials File]
 for more details.