Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
3 changes: 2 additions & 1 deletion packages/kubernetes/_dev/deploy/k8s/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
rules:
- apiGroups:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
apiVersion: batch/v1beta1
apiVersion: batch/v1
kind: CronJob
metadata:
name: hello
labels:
k8s-app: myjob
spec:
schedule: "*/1 * * * *"
jobTemplate:
Expand Down
14 changes: 11 additions & 3 deletions packages/kubernetes/_dev/deploy/k8s/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: kube-system
spec:
Expand All @@ -14,11 +15,13 @@ spec:
template:
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
spec:
automountServiceAccountToken: true
containers:
- image: quay.io/coreos/kube-state-metrics:v1.9.0
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.3.0
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -38,6 +41,11 @@ spec:
initialDelaySeconds: 5
timeoutSeconds: 5
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
runAsUser: 65534
nodeSelector:
kubernetes.io/os: linux
Expand Down
4 changes: 3 additions & 1 deletion packages/kubernetes/_dev/deploy/k8s/service-account.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: kube-system
3 changes: 2 additions & 1 deletion packages/kubernetes/_dev/deploy/k8s/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: 2.0.0-rc.1
app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: kube-system
spec:
Expand Down
5 changes: 5 additions & 0 deletions packages/kubernetes/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.17.2"
changes:
- description: Add missing metadata fields
type: bugfix
link: https://github.com/elastic/integrations/pull/2702
- version: "1.17.1"
changes:
- description: Improve default ndjson parser configuration
Expand Down
2 changes: 2 additions & 0 deletions packages/kubernetes/data_stream/container/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
name: orchestrator.cluster.name
- external: ecs
name: orchestrator.cluster.url
- external: ecs
name: container.runtime
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
description: >
Kubernetes statefulset name

- name: job.name
type: keyword
description: >
Name of the Job to which the Pod belongs

- name: cronjob.name
type: keyword
description: >
Name of the CronJob to which the Pod belongs

- name: container.name
type: keyword
description: >
Expand Down
3 changes: 2 additions & 1 deletion packages/kubernetes/docs/kube-state-metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,10 @@ An example event for `state_job` looks as following:
| kubernetes.annotations.\* | Kubernetes annotations map | object | |
| kubernetes.container.image | Kubernetes container image | keyword | |
| kubernetes.container.name | Kubernetes container name | keyword | |
| kubernetes.cronjob.name | Name of the CronJob to which the Pod belongs | keyword | |
| kubernetes.deployment.name | Kubernetes deployment name | keyword | |
| kubernetes.job.completions.desired | The configured completion count for the job (Spec) | long | gauge |
| kubernetes.job.name | The name of the job resource | keyword | |
| kubernetes.job.name | Name of the Job to which the Pod belongs | keyword | |
| kubernetes.job.owner.is_controller | Owner is controller ("true", "false", or `"\<none\>"`) | keyword | |
| kubernetes.job.owner.kind | The kind of resource that owns this job (eg. "CronJob") | keyword | |
| kubernetes.job.owner.name | The name of the resource that owns this job | keyword | |
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes/docs/kubelet.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ An example event for `container` looks as following:
| container.image.name | Name of the image the container was built on. | keyword | | |
| container.labels | Image labels. | object | | |
| container.name | Container name. | keyword | | |
| container.runtime | Runtime managing this container. | keyword | | |
| data_stream.dataset | Data stream dataset. | constant_keyword | | |
| data_stream.namespace | Data stream namespace. | constant_keyword | | |
| data_stream.type | Data stream type. | constant_keyword | | |
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: kubernetes
title: Kubernetes
version: 1.17.1
version: 1.17.2
license: basic
description: Collect logs and metrics from Kubernetes clusters with Elastic Agent.
type: integration
Expand Down