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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.8.0
FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch repository-s3
5 changes: 2 additions & 3 deletions helm-charts/elk/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: elastic-stack
version: 0.0.1
appVersion: 7.8.0
version: 0.1.0
appVersion: 7.16.2
description: Elasticsearch stack
keywords:
- elasticsearch
Expand All @@ -9,4 +9,3 @@ keywords:
- logstash
- metricbeat
- apm

Binary file added helm-charts/elk/charts/apm-server-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/apm-server-7.8.0.tgz
Binary file not shown.
Binary file added helm-charts/elk/charts/elasticsearch-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/elasticsearch-7.8.0.tgz
Binary file not shown.
Binary file added helm-charts/elk/charts/filebeat-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/filebeat-7.8.0.tgz
Binary file not shown.
Binary file added helm-charts/elk/charts/kibana-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/kibana-7.8.0.tgz
Binary file not shown.
Binary file added helm-charts/elk/charts/logstash-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/logstash-7.8.0.tgz
Binary file not shown.
Binary file added helm-charts/elk/charts/metricbeat-7.16.2.tgz
Binary file not shown.
Binary file removed helm-charts/elk/charts/metricbeat-7.8.0.tgz
Binary file not shown.
16 changes: 8 additions & 8 deletions helm-charts/elk/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
dependencies:
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
- name: filebeat
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
- name: kibana
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
- name: logstash
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
- name: metricbeat
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
- name: apm-server
repository: https://helm.elastic.co
version: 7.8.0
digest: sha256:93d6018bc284e28a64311a40359056708699afabf81c53731b64aa2e30662a6d
generated: "2020-07-17T20:50:28.177348+06:00"
version: 7.16.2
digest: sha256:c224fbba0c5c3212fb2d9165d962ef4f991e1eeb2146037f550fcb9f35988ea8
generated: "2021-12-23T14:11:17.881693+06:00"
14 changes: 7 additions & 7 deletions helm-charts/elk/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
dependencies:
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
condition: elasticsearch.enabled
- name: filebeat
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
condition: filebeat.enabled
- name: kibana
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
condition: kibana.enabled
- name: logstash
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
condition: logstash.enabled
- name: metricbeat
repository: https://helm.elastic.co
version: 7.8.0
version: 7.16.2
condition: metricbeat.enabled
- name: apm-server
repository: https://helm.elastic.co
version: 7.8.0
condition: apm-server.enabled
version: 7.16.2
condition: apm-server.enabled
6 changes: 3 additions & 3 deletions terraform/layer2-k8s/eks-elk.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ locals {
elk_elasticsearch_values = <<VALUES
elasticsearch:
enabled: true
image: "public.ecr.aws/o7m5y2d9/elasticsearch" # Used this dockerfile https://github.com/maddevsio/aws-eks-base/blob/main/docker/elasticsearch/Dockerfile
imageTag: 7.8.0
image: "public.ecr.aws/o7m5y2d9/elasticsearch" # Uses this dockerfile https://github.com/maddevsio/aws-eks-base/blob/main/docker/elasticsearch/Dockerfile
imageTag: 7.16.2
esMajorVersion: 7
replicas: 1
clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
Expand Down Expand Up @@ -101,8 +101,8 @@ kibana:

ingress:
enabled: true
className: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
path: /
hosts:
Expand Down
4 changes: 2 additions & 2 deletions terraform/layer2-k8s/helm-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ releases:
- id: istio-operator-resources
enabled: false
chart: ../../helm-charts/istio/istio-operator-resources
repository:
repository:
chart_version:
namespace: istio-system
- id: istio-resources
enabled: false
chart: ../../helm-charts/istio/istio-resources
repository:
chart_version:
chart_version:
namespace: istio-system
- id: keda
enabled: false
Expand Down