Skip to content

Commit ca6f5bc

Browse files
author
charlyF
committed
merging upstream
2 parents da2cca7 + cb97ccf commit ca6f5bc

Some content is hidden

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

50 files changed

+638
-6652
lines changed

01-path-basics/101-start-here/readme.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ To install the script, run this command in the "bash" terminal tab of the Cloud9
7777

7878
aws s3 cp s3://aws-kubernetes-artifacts/v0.5/lab-ide-build.sh . && \
7979
chmod +x lab-ide-build.sh && \
80+
sed -i 's/aws-samples/CharlyF/' lab-ide-build.sh && \
8081
. ./lab-ide-build.sh
8182

8283
image:cloud9-run-script.png[Running the script in Cloud9 Terminal]

02-path-working-with-clusters/201-cluster-monitoring/readme.adoc

Lines changed: 269 additions & 224 deletions
Large diffs are not rendered by default.
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
apiVersion: extensions/v1beta1
2+
kind: DaemonSet
3+
metadata:
4+
name: dd-agent
5+
spec:
6+
template:
7+
metadata:
8+
labels:
9+
app: dd-agent
10+
name: dd-agent
11+
spec:
12+
containers:
13+
- image: datadog/agent:latest
14+
imagePullPolicy: Always
15+
name: dd-agent
16+
ports:
17+
- containerPort: 8125
18+
hostPort: 8125
19+
name: dogstatsdport
20+
protocol: UDP
21+
- containerPort: 8126
22+
name: traceport
23+
protocol: TCP
24+
env:
25+
- name: DD_API_KEY
26+
value: <DD_API_KEY>
27+
- name: KUBERNETES
28+
value: "yes"
29+
- name: DD_APM_ENABLED
30+
value: "true"
31+
- name: DD_PROCESS_AGENT_ENABLED
32+
value: "true"
33+
- name: DD_LOGS_ENABLED
34+
value: "true"
35+
- name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
36+
value: "true"
37+
- name: HOST_PROC
38+
value: /host/proc
39+
- name: HOST_SYS
40+
value: /host/sys
41+
volumeMounts:
42+
- name: dockersocket
43+
mountPath: /var/run/docker.sock
44+
- name: procdir
45+
mountPath: /host/proc
46+
readOnly: true
47+
- name: cgroups
48+
mountPath: /host/sys/fs/cgroup
49+
readOnly: true
50+
- name: passwd
51+
mountPath: /etc/passwd
52+
readOnly: true
53+
- name: pointerdir
54+
mountPath: /opt/datadog-agent/run
55+
volumes:
56+
- hostPath:
57+
path: /run/docker.sock
58+
name: dockersocket
59+
- hostPath:
60+
path: /proc
61+
name: procdir
62+
- hostPath:
63+
path: /sys/fs/cgroup
64+
name: cgroups
65+
- hostPath:
66+
path: /etc/passwd
67+
name: passwd
68+
- hostPath:
69+
path: /opt/datadog-agent/run
70+
name: pointerdir
71+
---
72+
apiVersion: v1
73+
kind: Service
74+
metadata:
75+
name: dd-agent
76+
labels:
77+
run: dd-agent
78+
spec:
79+
ports:
80+
- name: dogstatsdport
81+
port: 8125
82+
targetPort: 8125
83+
protocol: UDP
84+
- name: traceport
85+
port: 8126
86+
targetPort: 8126
87+
protocol: TCP
88+
targetPort: 8126
89+
protocol: TCP
90+
selector:
91+
app: dd-agent
92+
type: ClusterIP
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: datadog-agent
5+
rules:
6+
- apiGroups: # This is required by the agent to query the Kubelet API.
7+
- ""
8+
resources:
9+
- nodes/metrics
10+
- nodes/spec
11+
- nodes/proxy # Required to get /pods
12+
verbs:
13+
- get
14+
---
15+
kind: ServiceAccount
16+
apiVersion: v1
17+
metadata:
18+
name: datadog-agent
19+
namespace: default
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
22+
kind: ClusterRoleBinding
23+
metadata:
24+
name: datadog-agent
25+
roleRef:
26+
apiGroup: rbac.authorization.k8s.io
27+
kind: ClusterRole
28+
name: datadog-agent
29+
subjects:
30+
- kind: ServiceAccount
31+
name: datadog-agent
32+
namespace: default

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/grafana.yaml

Lines changed: 0 additions & 76 deletions
This file was deleted.

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster-rbac.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/influxdb.yaml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)