Skip to content

Commit d8d0551

Browse files
ChrsMarkChrsMark
authored
Add k8s cluster identifiers (#26056) (#26346)
(cherry picked from commit 0829211)
1 parent 48f1032 commit d8d0551

File tree

63 files changed

+1739
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1739
-531
lines changed

‎CHANGELOG.next.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
431431
- Add new option `suffix` to `logging.files` to control how log files are rotated. {pull}25464[25464]
432432
- Validate that required functionality in Elasticsearch is available upon initial connection. {pull}25351[25351]
433433
- Improve ES output error insights. {pull}25825[25825]
434+
- Add orchestrator.cluster.name/url fields as k8s metadata {pull}26056[26056]
434435
- Libbeat: report beat version to monitoring. {pull}26214[26214]
435436

436437
*Auditbeat*

‎deploy/kubernetes/auditbeat-kubernetes.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,34 @@ roleRef:
226226
apiGroup: rbac.authorization.k8s.io
227227
---
228228
apiVersion: rbac.authorization.k8s.io/v1
229+
kind: RoleBinding
230+
metadata:
231+
name: auditbeat
232+
namespace: kube-system
233+
subjects:
234+
- kind: ServiceAccount
235+
name: auditbeat
236+
namespace: kube-system
237+
roleRef:
238+
kind: Role
239+
name: auditbeat
240+
apiGroup: rbac.authorization.k8s.io
241+
---
242+
apiVersion: rbac.authorization.k8s.io/v1
243+
kind: RoleBinding
244+
metadata:
245+
name: auditbeat-kubeadm-config
246+
namespace: kube-system
247+
subjects:
248+
- kind: ServiceAccount
249+
name: auditbeat
250+
namespace: kube-system
251+
roleRef:
252+
kind: Role
253+
name: auditbeat-kubeadm-config
254+
apiGroup: rbac.authorization.k8s.io
255+
---
256+
apiVersion: rbac.authorization.k8s.io/v1
229257
kind: ClusterRole
230258
metadata:
231259
name: auditbeat
@@ -243,6 +271,36 @@ rules:
243271
- replicasets
244272
verbs: ["get", "list", "watch"]
245273
---
274+
apiVersion: rbac.authorization.k8s.io/v1
275+
kind: Role
276+
metadata:
277+
name: auditbeat
278+
# should be the namespace where auditbeat is running
279+
namespace: kube-system
280+
labels:
281+
k8s-app: auditbeat
282+
rules:
283+
- apiGroups:
284+
- coordination.k8s.io
285+
resources:
286+
- leases
287+
verbs: ["get", "create", "update"]
288+
---
289+
apiVersion: rbac.authorization.k8s.io/v1
290+
kind: Role
291+
metadata:
292+
name: auditbeat-kubeadm-config
293+
namespace: kube-system
294+
labels:
295+
k8s-app: auditbeat
296+
rules:
297+
- apiGroups: [""]
298+
resources:
299+
- configmaps
300+
resourceNames:
301+
- kubeadm-config
302+
verbs: ["get"]
303+
---
246304
apiVersion: v1
247305
kind: ServiceAccount
248306
metadata:

‎deploy/kubernetes/auditbeat/auditbeat-role-binding.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,31 @@ roleRef:
1010
kind: ClusterRole
1111
name: auditbeat
1212
apiGroup: rbac.authorization.k8s.io
13+
---
14+
apiVersion: rbac.authorization.k8s.io/v1
15+
kind: RoleBinding
16+
metadata:
17+
name: auditbeat
18+
namespace: kube-system
19+
subjects:
20+
- kind: ServiceAccount
21+
name: auditbeat
22+
namespace: kube-system
23+
roleRef:
24+
kind: Role
25+
name: auditbeat
26+
apiGroup: rbac.authorization.k8s.io
27+
---
28+
apiVersion: rbac.authorization.k8s.io/v1
29+
kind: RoleBinding
30+
metadata:
31+
name: auditbeat-kubeadm-config
32+
namespace: kube-system
33+
subjects:
34+
- kind: ServiceAccount
35+
name: auditbeat
36+
namespace: kube-system
37+
roleRef:
38+
kind: Role
39+
name: auditbeat-kubeadm-config
40+
apiGroup: rbac.authorization.k8s.io

‎deploy/kubernetes/auditbeat/auditbeat-role.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,33 @@ rules:
1515
resources:
1616
- replicasets
1717
verbs: ["get", "list", "watch"]
18+
---
19+
apiVersion: rbac.authorization.k8s.io/v1
20+
kind: Role
21+
metadata:
22+
name: auditbeat
23+
# should be the namespace where auditbeat is running
24+
namespace: kube-system
25+
labels:
26+
k8s-app: auditbeat
27+
rules:
28+
- apiGroups:
29+
- coordination.k8s.io
30+
resources:
31+
- leases
32+
verbs: ["get", "create", "update"]
33+
---
34+
apiVersion: rbac.authorization.k8s.io/v1
35+
kind: Role
36+
metadata:
37+
name: auditbeat-kubeadm-config
38+
namespace: kube-system
39+
labels:
40+
k8s-app: auditbeat
41+
rules:
42+
- apiGroups: [""]
43+
resources:
44+
- configmaps
45+
resourceNames:
46+
- kubeadm-config
47+
verbs: ["get"]

‎deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,20 @@ roleRef:
549549
apiGroup: rbac.authorization.k8s.io
550550
---
551551
apiVersion: rbac.authorization.k8s.io/v1
552+
kind: RoleBinding
553+
metadata:
554+
name: elastic-agent-kubeadm-config
555+
namespace: kube-system
556+
subjects:
557+
- kind: ServiceAccount
558+
name: elastic-agent
559+
namespace: kube-system
560+
roleRef:
561+
kind: Role
562+
name: elastic-agent-kubeadm-config
563+
apiGroup: rbac.authorization.k8s.io
564+
---
565+
apiVersion: rbac.authorization.k8s.io/v1
552566
kind: ClusterRole
553567
metadata:
554568
name: elastic-agent
@@ -562,6 +576,7 @@ rules:
562576
- events
563577
- pods
564578
- services
579+
- configmaps
565580
verbs: ["get", "list", "watch"]
566581
# Enable this rule only if planing to use kubernetes_secrets provider
567582
#- apiGroups: [""]
@@ -594,6 +609,7 @@ apiVersion: rbac.authorization.k8s.io/v1
594609
kind: Role
595610
metadata:
596611
name: elastic-agent
612+
# should be the namespace where elastic-agent is running
597613
namespace: kube-system
598614
labels:
599615
k8s-app: elastic-agent
@@ -604,6 +620,21 @@ rules:
604620
- leases
605621
verbs: ["get", "create", "update"]
606622
---
623+
apiVersion: rbac.authorization.k8s.io/v1
624+
kind: Role
625+
metadata:
626+
name: elastic-agent-kubeadm-config
627+
namespace: kube-system
628+
labels:
629+
k8s-app: elastic-agent
630+
rules:
631+
- apiGroups: [""]
632+
resources:
633+
- configmaps
634+
resourceNames:
635+
- kubeadm-config
636+
verbs: ["get"]
637+
---
607638
apiVersion: v1
608639
kind: ServiceAccount
609640
metadata:

‎deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-role-binding.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,17 @@ roleRef:
2424
kind: Role
2525
name: elastic-agent
2626
apiGroup: rbac.authorization.k8s.io
27+
---
28+
apiVersion: rbac.authorization.k8s.io/v1
29+
kind: RoleBinding
30+
metadata:
31+
name: elastic-agent-kubeadm-config
32+
namespace: kube-system
33+
subjects:
34+
- kind: ServiceAccount
35+
name: elastic-agent
36+
namespace: kube-system
37+
roleRef:
38+
kind: Role
39+
name: elastic-agent-kubeadm-config
40+
apiGroup: rbac.authorization.k8s.io

‎deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-role.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ rules:
1212
- events
1313
- pods
1414
- services
15+
- configmaps
1516
verbs: ["get", "list", "watch"]
1617
# Enable this rule only if planing to use kubernetes_secrets provider
1718
#- apiGroups: [""]
@@ -44,6 +45,7 @@ apiVersion: rbac.authorization.k8s.io/v1
4445
kind: Role
4546
metadata:
4647
name: elastic-agent
48+
# should be the namespace where elastic-agent is running
4749
namespace: kube-system
4850
labels:
4951
k8s-app: elastic-agent
@@ -53,3 +55,18 @@ rules:
5355
resources:
5456
- leases
5557
verbs: ["get", "create", "update"]
58+
---
59+
apiVersion: rbac.authorization.k8s.io/v1
60+
kind: Role
61+
metadata:
62+
name: elastic-agent-kubeadm-config
63+
namespace: kube-system
64+
labels:
65+
k8s-app: elastic-agent
66+
rules:
67+
- apiGroups: [""]
68+
resources:
69+
- configmaps
70+
resourceNames:
71+
- kubeadm-config
72+
verbs: ["get"]

‎deploy/kubernetes/filebeat-kubernetes.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,34 @@ roleRef:
141141
apiGroup: rbac.authorization.k8s.io
142142
---
143143
apiVersion: rbac.authorization.k8s.io/v1
144+
kind: RoleBinding
145+
metadata:
146+
name: filebeat
147+
namespace: kube-system
148+
subjects:
149+
- kind: ServiceAccount
150+
name: filebeat
151+
namespace: kube-system
152+
roleRef:
153+
kind: Role
154+
name: filebeat
155+
apiGroup: rbac.authorization.k8s.io
156+
---
157+
apiVersion: rbac.authorization.k8s.io/v1
158+
kind: RoleBinding
159+
metadata:
160+
name: filebeat-kubeadm-config
161+
namespace: kube-system
162+
subjects:
163+
- kind: ServiceAccount
164+
name: filebeat
165+
namespace: kube-system
166+
roleRef:
167+
kind: Role
168+
name: filebeat-kubeadm-config
169+
apiGroup: rbac.authorization.k8s.io
170+
---
171+
apiVersion: rbac.authorization.k8s.io/v1
144172
kind: ClusterRole
145173
metadata:
146174
name: filebeat
@@ -161,6 +189,36 @@ rules:
161189
- replicasets
162190
verbs: ["get", "list", "watch"]
163191
---
192+
apiVersion: rbac.authorization.k8s.io/v1
193+
kind: Role
194+
metadata:
195+
name: filebeat
196+
# should be the namespace where filebeat is running
197+
namespace: kube-system
198+
labels:
199+
k8s-app: filebeat
200+
rules:
201+
- apiGroups:
202+
- coordination.k8s.io
203+
resources:
204+
- leases
205+
verbs: ["get", "create", "update"]
206+
---
207+
apiVersion: rbac.authorization.k8s.io/v1
208+
kind: Role
209+
metadata:
210+
name: filebeat-kubeadm-config
211+
namespace: kube-system
212+
labels:
213+
k8s-app: filebeat
214+
rules:
215+
- apiGroups: [""]
216+
resources:
217+
- configmaps
218+
resourceNames:
219+
- kubeadm-config
220+
verbs: ["get"]
221+
---
164222
apiVersion: v1
165223
kind: ServiceAccount
166224
metadata:

‎deploy/kubernetes/filebeat/filebeat-role-binding.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,31 @@ roleRef:
1010
kind: ClusterRole
1111
name: filebeat
1212
apiGroup: rbac.authorization.k8s.io
13+
---
14+
apiVersion: rbac.authorization.k8s.io/v1
15+
kind: RoleBinding
16+
metadata:
17+
name: filebeat
18+
namespace: kube-system
19+
subjects:
20+
- kind: ServiceAccount
21+
name: filebeat
22+
namespace: kube-system
23+
roleRef:
24+
kind: Role
25+
name: filebeat
26+
apiGroup: rbac.authorization.k8s.io
27+
---
28+
apiVersion: rbac.authorization.k8s.io/v1
29+
kind: RoleBinding
30+
metadata:
31+
name: filebeat-kubeadm-config
32+
namespace: kube-system
33+
subjects:
34+
- kind: ServiceAccount
35+
name: filebeat
36+
namespace: kube-system
37+
roleRef:
38+
kind: Role
39+
name: filebeat-kubeadm-config
40+
apiGroup: rbac.authorization.k8s.io

‎deploy/kubernetes/filebeat/filebeat-role.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,33 @@ rules:
1818
resources:
1919
- replicasets
2020
verbs: ["get", "list", "watch"]
21+
---
22+
apiVersion: rbac.authorization.k8s.io/v1
23+
kind: Role
24+
metadata:
25+
name: filebeat
26+
# should be the namespace where filebeat is running
27+
namespace: kube-system
28+
labels:
29+
k8s-app: filebeat
30+
rules:
31+
- apiGroups:
32+
- coordination.k8s.io
33+
resources:
34+
- leases
35+
verbs: ["get", "create", "update"]
36+
---
37+
apiVersion: rbac.authorization.k8s.io/v1
38+
kind: Role
39+
metadata:
40+
name: filebeat-kubeadm-config
41+
namespace: kube-system
42+
labels:
43+
k8s-app: filebeat
44+
rules:
45+
- apiGroups: [""]
46+
resources:
47+
- configmaps
48+
resourceNames:
49+
- kubeadm-config
50+
verbs: ["get"]

0 commit comments

Comments
 (0)