From 6e271d599259062f44b275fe6095cc67dd7dfc74 Mon Sep 17 00:00:00 2001 From: chrismark Date: Tue, 26 Jan 2021 11:46:36 +0200 Subject: [PATCH 1/3] Add Agent standalone k8s manifest Signed-off-by: chrismark --- .../elastic-agent-standalone-kubernetes.yml | 509 ++++++++++++++++++ 1 file changed, 509 insertions(+) create mode 100644 deploy/kubernetes/elastic-agent-standalone-kubernetes.yml diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml new file mode 100644 index 00000000000..f0249aca13d --- /dev/null +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml @@ -0,0 +1,509 @@ +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: elastic-agent + namespace: kube-system + labels: + app: elastic-agent +spec: + selector: + matchLabels: + app: elastic-agent + template: + metadata: + labels: + app: elastic-agent + spec: + tolerations: + - key: node-role.kubernetes.io/master + effect: NoSchedule + serviceAccountName: elastic-agent + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: elastic-agent + image: docker.elastic.co/beats/elastic-agent:7.11.0-SNAPSHOT + args: [ + "-c", "/etc/agent.yml", + "-e", "-d", "*", + ] + env: + - name: ES_USERNAME + value: "elastic" + - name: ES_PASSWORD + value: "" + - name: ES_HOST + value: "" + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + securityContext: + runAsUser: 0 + resources: + limits: + memory: 200Mi + requests: + cpu: 100m + memory: 100Mi + volumeMounts: + - name: datastreams + mountPath: /etc/agent.yml + readOnly: true + subPath: agent.yml + volumes: + - name: datastreams + configMap: + defaultMode: 0640 + name: agent-node-datastreams +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: agent-node-datastreams + namespace: kube-system + labels: + k8s-app: elastic-agent +data: + agent.yml: |- + id: ef9cc740-5bf0-11eb-8b51-39775155c3f5 + revision: 2 + outputs: + default: + type: elasticsearch + hosts: + - >- + ${ES_HOST} + username: ${ES_USERNAME} + password: ${ES_PASSWORD} + agent: + monitoring: + enabled: true + use_output: default + logs: true + metrics: true + providers.kubernetes: + node: ${NODE_NAME} + scope: node + inputs: + - id: 934ef8aa-ed19-405b-8160-ebf62e3d32f8 + name: kubernetes-node-metrics + revision: 1 + type: kubernetes/metrics + use_output: default + meta: + package: + name: kubernetes + version: 0.2.8 + data_stream: + namespace: default + streams: + #- id: >- + # kubernetes/metrics-kubernetes.controllermanager-3d50c483-2327-40e7-b3e5-d877d4763fe1 + # data_stream: + # dataset: kubernetes.controllermanager + # type: metrics + # metricsets: + # - controllermanager + # hosts: + # - '${kubernetes.pod.ip}:10252' + # period: 10s + # condition: ${kubernetes.pod.labels.component} == 'kube-controller-manager' + #- id: >- + # kubernetes/metrics-kubernetes.scheduler-3d50c483-2327-40e7-b3e5-d877d4763fe1 + # data_stream: + # dataset: kubernetes.scheduler + # type: metrics + # metricsets: + # - scheduler + # hosts: + # - '${kubernetes.pod.ip}:10251' + # period: 10s + # condition: ${kubernetes.pod.labels.component} == 'kube-scheduler' + - id: >- + kubernetes/metrics-kubernetes.proxy-3d50c483-2327-40e7-b3e5-d877d4763fe1 + data_stream: + dataset: kubernetes.proxy + type: metrics + metricsets: + - proxy + hosts: + - 'localhost:10249' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.container-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.container + type: metrics + metricsets: + - container + add_metadata: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${NODE_NAME}:10250' + period: 10s + ssl.verification_mode: none + - id: >- + kubernetes/metrics-kubernetes.node-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.node + type: metrics + metricsets: + - node + add_metadata: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${NODE_NAME}:10250' + period: 10s + ssl.verification_mode: none + - id: kubernetes/metrics-kubernetes.pod-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.pod + type: metrics + metricsets: + - pod + add_metadata: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${NODE_NAME}:10250' + period: 10s + ssl.verification_mode: none + - id: >- + kubernetes/metrics-kubernetes.system-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.system + type: metrics + metricsets: + - system + add_metadata: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${NODE_NAME}:10250' + period: 10s + ssl.verification_mode: none + - id: >- + kubernetes/metrics-kubernetes.volume-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.volume + type: metrics + metricsets: + - volume + add_metadata: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${NODE_NAME}:10250' + period: 10s + ssl.verification_mode: none +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: elastic-agent + namespace: kube-system + labels: + app: elastic-agent +spec: + selector: + matchLabels: + app: elastic-agent + template: + metadata: + labels: + app: elastic-agent + spec: + serviceAccountName: elastic-agent + containers: + - name: elastic-agent + image: docker.elastic.co/beats/elastic-agent:7.11.0-SNAPSHOT + args: [ + "-c", "/etc/agent.yml", + "-e", "-d", "*", + ] + env: + - name: ES_USERNAME + value: "elastic" + - name: ES_PASSWORD + value: "" + - name: ES_HOST + value: "" + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + # this is needed because we cannot use hostNetwork + - name: HOSTNAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + securityContext: + runAsUser: 0 + resources: + limits: + memory: 200Mi + requests: + cpu: 100m + memory: 100Mi + volumeMounts: + - name: datastreams + mountPath: /etc/agent.yml + readOnly: true + subPath: agent.yml + volumes: + - name: datastreams + configMap: + defaultMode: 0640 + name: agent-deployment-datastreams +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: agent-deployment-datastreams + namespace: kube-system + labels: + k8s-app: elastic-agent +data: + # This part requires `kube-state-metrics` up and running under `kube-system` namespace + agent.yml: |- + id: ef9cc740-5bf0-11eb-8b51-39775155c3f5 + revision: 2 + outputs: + default: + type: elasticsearch + hosts: + - >- + ${ES_HOST} + username: ${ES_USERNAME} + password: ${ES_PASSWORD} + agent: + monitoring: + enabled: true + use_output: default + logs: true + metrics: true + inputs: + - id: 934ef8aa-ed19-405b-8160-ebf62e3d32f9 + name: kubernetes-cluster-metrics + revision: 1 + type: kubernetes/metrics + use_output: default + meta: + package: + name: kubernetes + version: 0.2.8 + data_stream: + namespace: default + streams: + - id: >- + kubernetes/metrics-kubernetes.apiserver-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.apiserver + type: metrics + metricsets: + - apiserver + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + hosts: + - 'https://${env.KUBERNETES_SERVICE_HOST}:${env.KUBERNETES_SERVICE_PORT}' + period: 30s + ssl.certificate_authorities: + - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + - id: >- + kubernetes/metrics-kubernetes.event-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.event + type: metrics + metricsets: + - event + period: 10s + add_metadata: true + - id: >- + kubernetes/metrics-kubernetes.state_container-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_container + type: metrics + metricsets: + - state_container + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_cronjob-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_cronjob + type: metrics + metricsets: + - state_cronjob + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_deployment-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_deployment + type: metrics + metricsets: + - state_deployment + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_node-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_node + type: metrics + metricsets: + - state_node + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_persistentvolume-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_persistentvolume + type: metrics + metricsets: + - state_persistentvolume + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_persistentvolumeclaim-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_persistentvolumeclaim + type: metrics + metricsets: + - state_persistentvolumeclaim + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_pod-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_pod + type: metrics + metricsets: + - state_pod + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_replicaset-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_replicaset + type: metrics + metricsets: + - state_replicaset + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_resourcequota-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_resourcequota + type: metrics + metricsets: + - state_resourcequota + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_service-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_service + type: metrics + metricsets: + - state_service + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_statefulset-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_statefulset + type: metrics + metricsets: + - state_statefulset + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s + - id: >- + kubernetes/metrics-kubernetes.state_storageclass-934ef8aa-ed19-405b-8160-ebf62e3d32f8 + data_stream: + dataset: kubernetes.state_storageclass + type: metrics + metricsets: + - state_storageclass + add_metadata: true + hosts: + - 'kube-state-metrics:8080' + period: 10s +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: elastic-agent +subjects: + - kind: ServiceAccount + name: elastic-agent + namespace: kube-system +roleRef: + kind: ClusterRole + name: elastic-agent + apiGroup: rbac.authorization.k8s.io +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: elastic-agent + labels: + k8s-app: elastic-agent +rules: + - apiGroups: [""] + resources: + - nodes + - namespaces + - events + - pods + - secrets + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: + - replicasets + verbs: ["get", "list", "watch"] + - apiGroups: ["apps"] + resources: + - statefulsets + - deployments + - replicasets + verbs: ["get", "list", "watch"] + - apiGroups: + - "" + resources: + - nodes/stats + verbs: + - get + # required for apiserver + - nonResourceURLs: + - "/metrics" + verbs: + - get +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: elastic-agent + namespace: kube-system + labels: + k8s-app: elastic-agent +--- From d9ef3d72e8dac2475d18a12611b76cb163ad8fef Mon Sep 17 00:00:00 2001 From: chrismark Date: Tue, 16 Feb 2021 13:12:23 +0200 Subject: [PATCH 2/3] Finilise manifests Signed-off-by: chrismark --- ...t-standalone-kubernetes-container-logs.yml | 270 ++++++++++++++++++ .../elastic-agent-standalone-kubernetes.yml | 64 ++--- 2 files changed, 302 insertions(+), 32 deletions(-) create mode 100644 deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml b/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml new file mode 100644 index 00000000000..c0012294b74 --- /dev/null +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml @@ -0,0 +1,270 @@ +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: elastic-agent + namespace: kube-system + labels: + app: elastic-agent +spec: + selector: + matchLabels: + app: elastic-agent + template: + metadata: + labels: + app: elastic-agent + spec: + tolerations: + - key: node-role.kubernetes.io/master + effect: NoSchedule + serviceAccountName: elastic-agent + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: elastic-agent + image: docker.elastic.co/beats/elastic-agent:7.12.0-SNAPSHOT + args: [ + "-c", "/etc/agent.yml", + "-e", "-d", "*", + ] + env: + - name: ES_USERNAME + value: "elastic" + - name: ES_PASSWORD + value: "changeme" + - name: ES_HOST + value: "http://34.89.201.93:9200/" + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + securityContext: + runAsUser: 0 + resources: + limits: + memory: 200Mi + requests: + cpu: 100m + memory: 100Mi + volumeMounts: + - name: datastreams + mountPath: /etc/agent.yml + readOnly: true + subPath: agent.yml + - name: proc + mountPath: /hostfs/proc + readOnly: true + - name: cgroup + mountPath: /hostfs/sys/fs/cgroup + readOnly: true + volumes: + - name: datastreams + configMap: + defaultMode: 0640 + name: agent-node-datastreams + - name: proc + hostPath: + path: /proc + - name: cgroup + hostPath: + path: /sys/fs/cgroup +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: agent-node-datastreams + namespace: kube-system + labels: + k8s-app: elastic-agent +data: + agent.yml: |- + id: ef9cc740-5bf0-11eb-8b51-39775155c3f5 + revision: 2 + outputs: + default: + type: elasticsearch + hosts: + - >- + ${ES_HOST} + username: ${ES_USERNAME} + password: ${ES_PASSWORD} + agent: + monitoring: + enabled: true + use_output: default + logs: true + metrics: true + inputs: + - id: 1f6112ef-9847-4294-aba4-0dc9e7240551 + name: system-3 + revision: 2 + type: system/metrics + use_output: default + meta: + package: + name: system + version: 0.10.9 + data_stream: + namespace: default + streams: + - id: system/metrics-system.core-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.core + type: metrics + metricsets: + - core + core.metrics: + - percentages + - id: system/metrics-system.cpu-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.cpu + type: metrics + period: 10s + cpu.metrics: + - percentages + - normalized_percentages + metricsets: + - cpu + - id: system/metrics-system.diskio-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.diskio + type: metrics + period: 10s + diskio.include_devices: null + metricsets: + - diskio + - id: system/metrics-system.filesystem-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.filesystem + type: metrics + period: 1m + metricsets: + - filesystem + processors: + - drop_event.when.regexp: + system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/) + - id: system/metrics-system.fsstat-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.fsstat + type: metrics + period: 1m + metricsets: + - fsstat + processors: + - drop_event.when.regexp: + system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/) + - id: system/metrics-system.load-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.load + type: metrics + period: 10s + metricsets: + - load + - id: system/metrics-system.memory-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.memory + type: metrics + period: 10s + metricsets: + - memory + - id: system/metrics-system.network-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.network + type: metrics + period: 10s + network.interfaces: null + metricsets: + - network + - id: system/metrics-system.process-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.process + type: metrics + process.include_top_n.by_memory: 5 + period: 10s + processes: + - .* + process.include_top_n.by_cpu: 5 + process.cgroups.enabled: false + process.cmdline.cache.enabled: true + metricsets: + - process + process.include_cpu_ticks: false + system.hostfs: /hostfs + - id: >- + system/metrics-system.process_summary-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.process_summary + type: metrics + period: 10s + metricsets: + - process_summary + system.hostfs: /hostfs + - id: >- + system/metrics-system.socket_summary-1f6112ef-9847-4294-aba4-0dc9e7240551 + data_stream: + dataset: system.socket_summary + type: metrics + period: 10s + metricsets: + - socket_summary + system.hostfs: /hostfs +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: elastic-agent +subjects: + - kind: ServiceAccount + name: elastic-agent + namespace: kube-system +roleRef: + kind: ClusterRole + name: elastic-agent + apiGroup: rbac.authorization.k8s.io +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: elastic-agent + labels: + k8s-app: elastic-agent +rules: + - apiGroups: [""] + resources: + - nodes + - namespaces + - events + - pods + - secrets + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: + - replicasets + verbs: ["get", "list", "watch"] + - apiGroups: ["apps"] + resources: + - statefulsets + - deployments + - replicasets + verbs: ["get", "list", "watch"] + - apiGroups: + - "" + resources: + - nodes/stats + verbs: + - get + # required for apiserver + - nonResourceURLs: + - "/metrics" + verbs: + - get +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: elastic-agent + namespace: kube-system + labels: + k8s-app: elastic-agent +--- diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml index f0249aca13d..f99281b6889 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yml @@ -23,10 +23,10 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:7.11.0-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.12.0-SNAPSHOT args: [ "-c", "/etc/agent.yml", - "-e", "-d", "*", + "-e", "-d", "composable.providers.kubernetes", ] env: - name: ES_USERNAME @@ -99,28 +99,28 @@ data: data_stream: namespace: default streams: - #- id: >- - # kubernetes/metrics-kubernetes.controllermanager-3d50c483-2327-40e7-b3e5-d877d4763fe1 - # data_stream: - # dataset: kubernetes.controllermanager - # type: metrics - # metricsets: - # - controllermanager - # hosts: - # - '${kubernetes.pod.ip}:10252' - # period: 10s - # condition: ${kubernetes.pod.labels.component} == 'kube-controller-manager' - #- id: >- - # kubernetes/metrics-kubernetes.scheduler-3d50c483-2327-40e7-b3e5-d877d4763fe1 - # data_stream: - # dataset: kubernetes.scheduler - # type: metrics - # metricsets: - # - scheduler - # hosts: - # - '${kubernetes.pod.ip}:10251' - # period: 10s - # condition: ${kubernetes.pod.labels.component} == 'kube-scheduler' + - id: >- + kubernetes/metrics-kubernetes.controllermanager-3d50c483-2327-40e7-b3e5-d877d4763fe1 + data_stream: + dataset: kubernetes.controllermanager + type: metrics + metricsets: + - controllermanager + hosts: + - '${kubernetes.pod.ip}:10252' + period: 10s + condition: ${kubernetes.pod.labels.component} == 'kube-controller-manager' + - id: >- + kubernetes/metrics-kubernetes.scheduler-3d50c483-2327-40e7-b3e5-d877d4763fe1 + data_stream: + dataset: kubernetes.scheduler + type: metrics + metricsets: + - scheduler + hosts: + - '${kubernetes.pod.ip}:10251' + period: 10s + condition: ${kubernetes.pod.labels.component} == 'kube-scheduler' - id: >- kubernetes/metrics-kubernetes.proxy-3d50c483-2327-40e7-b3e5-d877d4763fe1 data_stream: @@ -141,7 +141,7 @@ data: add_metadata: true bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token hosts: - - 'https://${NODE_NAME}:10250' + - 'https://${env.NODE_NAME}:10250' period: 10s ssl.verification_mode: none - id: >- @@ -154,7 +154,7 @@ data: add_metadata: true bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token hosts: - - 'https://${NODE_NAME}:10250' + - 'https://${env.NODE_NAME}:10250' period: 10s ssl.verification_mode: none - id: kubernetes/metrics-kubernetes.pod-934ef8aa-ed19-405b-8160-ebf62e3d32f8 @@ -166,7 +166,7 @@ data: add_metadata: true bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token hosts: - - 'https://${NODE_NAME}:10250' + - 'https://${env.NODE_NAME}:10250' period: 10s ssl.verification_mode: none - id: >- @@ -179,7 +179,7 @@ data: add_metadata: true bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token hosts: - - 'https://${NODE_NAME}:10250' + - 'https://${env.NODE_NAME}:10250' period: 10s ssl.verification_mode: none - id: >- @@ -192,7 +192,7 @@ data: add_metadata: true bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token hosts: - - 'https://${NODE_NAME}:10250' + - 'https://${env.NODE_NAME}:10250' period: 10s ssl.verification_mode: none --- @@ -215,10 +215,10 @@ spec: serviceAccountName: elastic-agent containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:7.11.0-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.12.0-SNAPSHOT args: [ "-c", "/etc/agent.yml", - "-e", "-d", "*", + "-e", "-d", "composable.providers.kubernetes", ] env: - name: ES_USERNAME @@ -226,7 +226,7 @@ spec: - name: ES_PASSWORD value: "" - name: ES_HOST - value: "" + value: "" - name: NODE_NAME valueFrom: fieldRef: From 9955c748f4c7bd5c04e73bba5fbd95e132f3bc8e Mon Sep 17 00:00:00 2001 From: chrismark Date: Tue, 16 Feb 2021 13:19:32 +0200 Subject: [PATCH 3/3] Remove container logs file Signed-off-by: chrismark --- ...t-standalone-kubernetes-container-logs.yml | 270 ------------------ 1 file changed, 270 deletions(-) delete mode 100644 deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml b/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml deleted file mode 100644 index c0012294b74..00000000000 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes-container-logs.yml +++ /dev/null @@ -1,270 +0,0 @@ ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: elastic-agent - namespace: kube-system - labels: - app: elastic-agent -spec: - selector: - matchLabels: - app: elastic-agent - template: - metadata: - labels: - app: elastic-agent - spec: - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - serviceAccountName: elastic-agent - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - containers: - - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:7.12.0-SNAPSHOT - args: [ - "-c", "/etc/agent.yml", - "-e", "-d", "*", - ] - env: - - name: ES_USERNAME - value: "elastic" - - name: ES_PASSWORD - value: "changeme" - - name: ES_HOST - value: "http://34.89.201.93:9200/" - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - securityContext: - runAsUser: 0 - resources: - limits: - memory: 200Mi - requests: - cpu: 100m - memory: 100Mi - volumeMounts: - - name: datastreams - mountPath: /etc/agent.yml - readOnly: true - subPath: agent.yml - - name: proc - mountPath: /hostfs/proc - readOnly: true - - name: cgroup - mountPath: /hostfs/sys/fs/cgroup - readOnly: true - volumes: - - name: datastreams - configMap: - defaultMode: 0640 - name: agent-node-datastreams - - name: proc - hostPath: - path: /proc - - name: cgroup - hostPath: - path: /sys/fs/cgroup ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: agent-node-datastreams - namespace: kube-system - labels: - k8s-app: elastic-agent -data: - agent.yml: |- - id: ef9cc740-5bf0-11eb-8b51-39775155c3f5 - revision: 2 - outputs: - default: - type: elasticsearch - hosts: - - >- - ${ES_HOST} - username: ${ES_USERNAME} - password: ${ES_PASSWORD} - agent: - monitoring: - enabled: true - use_output: default - logs: true - metrics: true - inputs: - - id: 1f6112ef-9847-4294-aba4-0dc9e7240551 - name: system-3 - revision: 2 - type: system/metrics - use_output: default - meta: - package: - name: system - version: 0.10.9 - data_stream: - namespace: default - streams: - - id: system/metrics-system.core-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.core - type: metrics - metricsets: - - core - core.metrics: - - percentages - - id: system/metrics-system.cpu-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.cpu - type: metrics - period: 10s - cpu.metrics: - - percentages - - normalized_percentages - metricsets: - - cpu - - id: system/metrics-system.diskio-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.diskio - type: metrics - period: 10s - diskio.include_devices: null - metricsets: - - diskio - - id: system/metrics-system.filesystem-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.filesystem - type: metrics - period: 1m - metricsets: - - filesystem - processors: - - drop_event.when.regexp: - system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/) - - id: system/metrics-system.fsstat-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.fsstat - type: metrics - period: 1m - metricsets: - - fsstat - processors: - - drop_event.when.regexp: - system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/) - - id: system/metrics-system.load-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.load - type: metrics - period: 10s - metricsets: - - load - - id: system/metrics-system.memory-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.memory - type: metrics - period: 10s - metricsets: - - memory - - id: system/metrics-system.network-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.network - type: metrics - period: 10s - network.interfaces: null - metricsets: - - network - - id: system/metrics-system.process-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.process - type: metrics - process.include_top_n.by_memory: 5 - period: 10s - processes: - - .* - process.include_top_n.by_cpu: 5 - process.cgroups.enabled: false - process.cmdline.cache.enabled: true - metricsets: - - process - process.include_cpu_ticks: false - system.hostfs: /hostfs - - id: >- - system/metrics-system.process_summary-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.process_summary - type: metrics - period: 10s - metricsets: - - process_summary - system.hostfs: /hostfs - - id: >- - system/metrics-system.socket_summary-1f6112ef-9847-4294-aba4-0dc9e7240551 - data_stream: - dataset: system.socket_summary - type: metrics - period: 10s - metricsets: - - socket_summary - system.hostfs: /hostfs ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: elastic-agent -subjects: - - kind: ServiceAccount - name: elastic-agent - namespace: kube-system -roleRef: - kind: ClusterRole - name: elastic-agent - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: elastic-agent - labels: - k8s-app: elastic-agent -rules: - - apiGroups: [""] - resources: - - nodes - - namespaces - - events - - pods - - secrets - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: - - replicasets - verbs: ["get", "list", "watch"] - - apiGroups: ["apps"] - resources: - - statefulsets - - deployments - - replicasets - verbs: ["get", "list", "watch"] - - apiGroups: - - "" - resources: - - nodes/stats - verbs: - - get - # required for apiserver - - nonResourceURLs: - - "/metrics" - verbs: - - get ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: elastic-agent - namespace: kube-system - labels: - k8s-app: elastic-agent ----