Skip to content

Commit

Permalink
Merge branch 'main' into renovate/docker.elastic.co-elasticsearch-ela…
Browse files Browse the repository at this point in the history
…sticsearch-8.x
  • Loading branch information
rajadilipkolli authored Sep 12, 2022
2 parents 4ddb66d + 1a787a1 commit dbb151b
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aws-dynamo-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-kinesis-consumer-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-kinesis-producer-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-s3-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-ses-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.3.0
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-sqs-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
java-version: 18
distribution: 'zulu'
Expand Down
4 changes: 4 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ ports:
visibility: public
- port: 8080
visibility: public
- port: 9200
visibility: public
- port: 5601
visibility: public

vscode:
extensions:
Expand Down
50 changes: 27 additions & 23 deletions aws-dynamodb-project/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,50 @@
version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
- cluster.name=es-docker-cluster
- discovery.type=single-node
- bootstrap.memory_lock=true
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
volumes:
- esdata1:/usr/share/elasticsearch/data
ports:
- "9200:9200"
- "9300:9300"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:6.8.23
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
- ../config/elk:/etc/logstash/conf.d
- es-data:/usr/share/elasticsearch/data
ports:
- "5000:5000"
links:
- elasticsearch
- "9200:9200"
- "9300:9300"
networks:
- elastic

kibana:
image: docker.elastic.co/kibana/kibana:6.8.23
image: docker.elastic.co/kibana/kibana:7.17.6
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
ELASTICSEARCH_URL: http://elasticsearch:9200
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ports:
- "5601:5601"
links:
- elasticsearch
networks:
- elastic

logstash:
image: docker.elastic.co/logstash/logstash:7.17.6
container_name: logstash
ports:
- "5000:5000"
volumes:
- ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
networks:
- elastic

volumes:
esdata1:
es-data:
driver: local

networks:
elastic:
driver: bridge
50 changes: 27 additions & 23 deletions aws-kinesis-consumer-project/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,50 @@
version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
- cluster.name=es-docker-cluster
- discovery.type=single-node
- bootstrap.memory_lock=true
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
volumes:
- esdata1:/usr/share/elasticsearch/data
ports:
- "9200:9200"
- "9300:9300"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:6.8.23
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
- ../config/elk:/etc/logstash/conf.d
- es-data:/usr/share/elasticsearch/data
ports:
- "5000:5000"
links:
- elasticsearch
- "9200:9200"
- "9300:9300"
networks:
- elastic

kibana:
image: docker.elastic.co/kibana/kibana:6.8.23
image: docker.elastic.co/kibana/kibana:7.17.6
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
ELASTICSEARCH_URL: http://elasticsearch:9200
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ports:
- "5601:5601"
links:
- elasticsearch
networks:
- elastic

logstash:
image: docker.elastic.co/logstash/logstash:7.17.6
container_name: logstash
ports:
- "5000:5000"
volumes:
- ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
networks:
- elastic

volumes:
esdata1:
es-data:
driver: local

networks:
elastic:
driver: bridge
50 changes: 27 additions & 23 deletions aws-kinesis-project-producer/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,50 @@
version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
- cluster.name=es-docker-cluster
- discovery.type=single-node
- bootstrap.memory_lock=true
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
volumes:
- esdata1:/usr/share/elasticsearch/data
ports:
- "9200:9200"
- "9300:9300"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:6.8.23
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
- ../config/elk:/etc/logstash/conf.d
- es-data:/usr/share/elasticsearch/data
ports:
- "5000:5000"
links:
- elasticsearch
- "9200:9200"
- "9300:9300"
networks:
- elastic

kibana:
image: docker.elastic.co/kibana/kibana:6.8.23
image: docker.elastic.co/kibana/kibana:7.17.6
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
ELASTICSEARCH_URL: http://elasticsearch:9200
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ports:
- "5601:5601"
links:
- elasticsearch
networks:
- elastic

logstash:
image: docker.elastic.co/logstash/logstash:7.17.6
container_name: logstash
ports:
- "5000:5000"
volumes:
- ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
networks:
- elastic

volumes:
esdata1:
es-data:
driver: local

networks:
elastic:
driver: bridge
50 changes: 27 additions & 23 deletions aws-ses-project/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,50 @@
version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
- cluster.name=es-docker-cluster
- discovery.type=single-node
- bootstrap.memory_lock=true
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
volumes:
- esdata1:/usr/share/elasticsearch/data
ports:
- "9200:9200"
- "9300:9300"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:6.2.2
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
- ../config/elk:/etc/logstash/conf.d
- es-data:/usr/share/elasticsearch/data
ports:
- "5000:5000"
links:
- elasticsearch
- "9200:9200"
- "9300:9300"
networks:
- elastic

kibana:
image: docker.elastic.co/kibana/kibana:6.2.2
image: docker.elastic.co/kibana/kibana:7.17.6
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
ELASTICSEARCH_URL: http://elasticsearch:9200
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ports:
- "5601:5601"
links:
- elasticsearch
networks:
- elastic

logstash:
image: docker.elastic.co/logstash/logstash:7.17.6
container_name: logstash
ports:
- "5000:5000"
volumes:
- ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
networks:
- elastic

volumes:
esdata1:
es-data:
driver: local

networks:
elastic:
driver: bridge
2 changes: 1 addition & 1 deletion aws-ses-project/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.8'
services:
localstack:
image: localstack/localstack:1.0.0
image: localstack/localstack:1.1.0
ports:
- "4566:4566"
environment:
Expand Down

0 comments on commit dbb151b

Please sign in to comment.