diff --git a/monitoring/kubernetes-elk/curator-cronjob.yaml b/monitoring/kubernetes-elk/curator-cronjob.yaml index bbbfa19..4fc6a2d 100644 --- a/monitoring/kubernetes-elk/curator-cronjob.yaml +++ b/monitoring/kubernetes-elk/curator-cronjob.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: elasticsearch-curator - namespace: kube-system + namespace: elk labels: k8s-app: elasticsearch-logging spec: diff --git a/monitoring/kubernetes-elk/elasticsearch-ss.yaml b/monitoring/kubernetes-elk/elasticsearch-ss.yaml index 9a3e6e7..b6ec269 100644 --- a/monitoring/kubernetes-elk/elasticsearch-ss.yaml +++ b/monitoring/kubernetes-elk/elasticsearch-ss.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: elasticsearch-logging - namespace: kube-system + namespace: elk labels: k8s-app: elasticsearch-logging kubernetes.io/cluster-service: "true" @@ -130,3 +130,6 @@ spec: nodePort: 31335 selector: k8s-app: elasticsearch-logging + + + diff --git a/monitoring/kubernetes-elk/filebeat-ds.yaml b/monitoring/kubernetes-elk/filebeat-ds.yaml index 076a0ed..27403d1 100644 --- a/monitoring/kubernetes-elk/filebeat-ds.yaml +++ b/monitoring/kubernetes-elk/filebeat-ds.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: ServiceAccount metadata: name: filebeat - namespace: kube-system + namespace: elk labels: k8s-app: filebeat --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: filebeat @@ -24,7 +24,7 @@ rules: - list --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: filebeat diff --git a/monitoring/kubernetes-elk/kibana-deployment.yaml b/monitoring/kubernetes-elk/kibana-deployment.yaml index 2096a51..79b0b2a 100644 --- a/monitoring/kubernetes-elk/kibana-deployment.yaml +++ b/monitoring/kubernetes-elk/kibana-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kibana-logging - namespace: kube-system + namespace: elk labels: k8s-app: kibana-logging kubernetes.io/cluster-service: "true" diff --git a/monitoring/kubernetes-elk/logstash-deployment.yaml b/monitoring/kubernetes-elk/logstash-deployment.yaml index 009ef58..a845985 100644 --- a/monitoring/kubernetes-elk/logstash-deployment.yaml +++ b/monitoring/kubernetes-elk/logstash-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: logstash-configmap - namespace: kube-system + namespace: elk data: logstash.yml: | http.host: "0.0.0.0" diff --git a/monitoring/kubernetes-elk/metricbeat-ds.yaml b/monitoring/kubernetes-elk/metricbeat-ds.yaml index f115562..8040a1a 100644 --- a/monitoring/kubernetes-elk/metricbeat-ds.yaml +++ b/monitoring/kubernetes-elk/metricbeat-ds.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: ServiceAccount metadata: name: metricbeat - namespace: kube-system + namespace: elk labels: k8s-app: metricbeat --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: metricbeat @@ -20,7 +20,7 @@ roleRef: name: metricbeat apiGroup: rbac.authorization.k8s.io --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: metricbeat