Skip to content
Merged
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
ba13b58
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 1, 2022
1d7d23e
Bump Confluent to 7.3.0-0, Kafka to 7.3.0-0
ConfluentJenkins Apr 1, 2022
e23f803
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 2, 2022
675524c
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 5, 2022
4ed79a2
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 5, 2022
a212185
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 6, 2022
ade69b0
Merge branch '7.2.x' into master by chuck-confluent
ConfluentJenkins Apr 7, 2022
4b2e625
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 8, 2022
9be2eb9
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 10, 2022
8d878e0
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 10, 2022
6562433
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 10, 2022
b4155c0
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 10, 2022
1a508b7
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 11, 2022
c4b2f95
Merge branch '7.2.x' into master by chuck-confluent
ConfluentJenkins Apr 12, 2022
e929f68
Merge branch '7.2.x' into master by chuck-confluent
ConfluentJenkins Apr 18, 2022
8f045f2
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 19, 2022
abb0b00
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 19, 2022
241d332
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 20, 2022
9f17bd4
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 20, 2022
0b68d86
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 20, 2022
2838a0c
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Apr 26, 2022
8807b01
Merge branch '7.2.x' into master by chuck-confluent
ConfluentJenkins May 23, 2022
f583601
Merge branch '7.2.x' into master by chuck-confluent
ConfluentJenkins May 26, 2022
bae540b
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 14, 2022
87e285e
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 17, 2022
f7da7a5
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 17, 2022
501165b
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 18, 2022
42c2f7a
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 21, 2022
1eb0dbc
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 22, 2022
b1ccf3d
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 22, 2022
bbf5e1e
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 23, 2022
db18d35
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 24, 2022
a21623e
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 25, 2022
c485ef1
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 27, 2022
4e477b4
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 28, 2022
602119f
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 29, 2022
01e66e1
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 29, 2022
fe41336
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 29, 2022
0d2042b
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 29, 2022
53d61d1
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 29, 2022
ea4e29f
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jun 30, 2022
65c5d70
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 7, 2022
62a0b4e
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 7, 2022
5122a97
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
432a7aa
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 21, 2022
74c9714
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
7de7786
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
d216b11
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
d239d58
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 21, 2022
7763d85
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
67aca5a
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
27f45d9
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
13c01f8
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
46857d1
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 21, 2022
7f3932f
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 21, 2022
1426e6e
Merge branch '6.2.6-post' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
4219d89
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
9110e31
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
e46d6d4
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
4c97bd0
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
82c131c
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
5b8b0c2
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 22, 2022
fa0a077
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 22, 2022
03532d0
Merge branch '6.1.7-post' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
2879150
Merge branch '6.2.6-post' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
07d1fa4
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
3ea24d5
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
578cbae
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
8764147
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
21abde1
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
c13b629
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
6928fbd
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 25, 2022
a9e0b99
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 25, 2022
be41730
Merge branch '6.0.9-post' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
d6e1242
Merge branch '6.1.7-post' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
8cf057e
Merge branch '6.2.6-post' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
620600c
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
d903d34
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
853955c
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
67f9fb1
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
0d7a316
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
a6f074e
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
810fa4d
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
02bf3d0
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 26, 2022
8d1a3f4
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 26, 2022
7bad537
Merge branch '5.5.11-post' into 5.5.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
32e6861
Merge branch '6.0.9-post' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
b873995
Merge branch '6.1.7-post' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
e869ed1
Merge branch '6.2.6-post' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
9f5d7e3
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
a5c8756
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
02a7f70
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
37abcbc
Merge branch '5.5.x' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
5464e3c
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
1255c7f
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
3b57730
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
8a311fd
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
b55e2fc
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
011b0c1
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 27, 2022
468dc61
Merge branch '5.4.9-post' into 5.4.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
b2b38f4
Merge branch '5.5.11-post' into 5.5.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
726c0df
Merge branch '6.0.9-post' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
1a4a37c
Merge branch '6.1.7-post' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
02832d8
Merge branch '6.2.6-post' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
34608a8
Merge branch '7.0.5-post' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
859db1e
Merge branch '7.1.3-post' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
ab63dff
Merge branch '7.2.1-post' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
ef07220
Merge branch '5.4.x' into 5.5.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
4beac3e
Merge branch '5.5.x' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
167df3c
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
86530c2
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
28af568
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
c4e8ec4
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
d83f6e5
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
e10657f
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 27, 2022
66f5043
Bump Confluent to 5.4.10-SNAPSHOT, Kafka to 5.4.10-SNAPSHOT
ConfluentJenkins Jul 27, 2022
af70ef9
Merge branch '5.4.x' into 5.5.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
6c83509
Merge branch '5.5.x' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
daf04d8
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
cd85217
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
bc85696
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
0d337dd
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
7055a12
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 27, 2022
17b843f
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 27, 2022
abfcb6a
Bump Confluent to 5.5.12-SNAPSHOT, Kafka to 5.5.12-SNAPSHOT
ConfluentJenkins Jul 28, 2022
cc73a1c
Merge branch '5.5.x' into 6.0.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
cb3db1d
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
b8dbf0e
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
acf3119
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
24fb7ab
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
cad4883
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
b0b4d5a
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 28, 2022
0c0be08
Bump Confluent to 6.0.10-SNAPSHOT, Kafka to 6.0.10-SNAPSHOT
ConfluentJenkins Jul 28, 2022
ed094df
Merge branch '6.0.x' into 6.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
3889a24
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
890edf6
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
26fece9
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
957c5b7
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
79ef8ca
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 28, 2022
3c698d7
Bump Confluent to 6.1.8-0, Kafka to 6.1.8-0
ConfluentJenkins Jul 28, 2022
54bbe60
Merge branch '6.1.x' into 6.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
4982429
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
597e861
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
56a966f
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
1b6b4c6
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 28, 2022
4ef4216
Bump Confluent to 6.2.7-0, Kafka to 6.2.7-0
ConfluentJenkins Jul 28, 2022
2df3151
Merge branch '6.2.x' into 7.0.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
9f55aed
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
9ed8d3d
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 28, 2022
80161d6
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 28, 2022
1c761b7
Bump Confluent to 7.0.6-0, Kafka to 7.0.6-0
ConfluentJenkins Jul 29, 2022
25eca3d
Merge branch '7.0.x' into 7.1.x (using strategy ours)
ConfluentJenkins Jul 29, 2022
ebca747
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 29, 2022
de97d9b
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 29, 2022
e49e725
Bump Confluent to 7.1.4-0, Kafka to 7.1.4-0
ConfluentJenkins Jul 29, 2022
94f8e88
Merge branch '7.1.x' into 7.2.x (using strategy ours)
ConfluentJenkins Jul 29, 2022
d308848
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 29, 2022
857ebcb
Bump Confluent to 7.2.2-0, Kafka to 7.2.2-0
ConfluentJenkins Jul 29, 2022
7ed5569
Merge branch '7.2.x' into master (using strategy ours)
ConfluentJenkins Jul 29, 2022
30bd573
Merge branch '7.2.1-post' into 7.2.x
ConfluentJenkins Aug 10, 2022
fb85136
Merge branch '7.2.x' into master
ConfluentJenkins Aug 10, 2022
0a35748
Bump Confluent to 7.3.0-0, Kafka to 7.3.0-0
ConfluentJenkins Aug 10, 2022
e88e010
Merge branch '7.3.x' into master (using strategy ours)
ConfluentJenkins Aug 10, 2022
56e329e
Bump Confluent to 7.4.0-0, Kafka to 7.4.0-0
ConfluentJenkins Aug 10, 2022
e12ef1c
Merge branch '6.0.9-post' into 6.0.x
joel-hamill Aug 24, 2022
7d51453
Merge branch '6.1.7-post' into 6.1.x
joel-hamill Aug 24, 2022
88da7ee
Merge branch '6.2.6-post' into 6.2.x
joel-hamill Aug 24, 2022
92f0244
Merge branch '7.0.5-post' into 7.0.x
joel-hamill Aug 24, 2022
c22dab6
Merge branch '7.1.3-post' into 7.1.x
joel-hamill Aug 24, 2022
488405a
Merge branch '7.2.1-post' into 7.2.x
joel-hamill Aug 24, 2022
6261652
Merge branch '6.0.x' into 6.1.x
joel-hamill Aug 24, 2022
938f2e6
Merge branch '6.1.x' into 6.2.x
joel-hamill Aug 24, 2022
beb1d94
Merge branch '6.2.x' into 7.0.x
joel-hamill Aug 24, 2022
db4aae2
Merge branch '7.0.x' into 7.1.x
joel-hamill Aug 24, 2022
7ced69b
Merge branch '7.1.x' into 7.2.x
joel-hamill Aug 24, 2022
d035e04
Merge branch '7.2.x' into 7.3.x
joel-hamill Aug 24, 2022
8ecc6eb
Merge branch '7.3.x' into master
joel-hamill Aug 24, 2022
8833b8c
bump es and kibana version
gadelkareem Aug 30, 2022
6669ea7
Revert "bump es and kibana version"
gadelkareem Aug 30, 2022
712b85a
bump es and kibana version
gadelkareem Aug 30, 2022
4968145
use 7.2.1 branch files
gadelkareem Aug 30, 2022
a3a0764
use 7.2.1 branch files
gadelkareem Aug 30, 2022
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
11 changes: 7 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -624,24 +624,27 @@ services:


elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3
container_name: elasticsearch
#restart: always
healthcheck:
start_period: 10s
interval: 10s
retries: 20
test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
test: curl --user "elastic:es_pass" -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
ports:
- 9200:9200
- 9300:9300
environment:
discovery.type: "single-node"
ES_JAVA_OPTS: "-Xms1g -Xmx1g"
cluster.name: "elasticsearch-cp-demo"
bootstrap.memory_lock: true
discovery.type: single-node
ELASTIC_PASSWORD: es_pass
xpack.security.enabled: false

kibana:
image: docker.elastic.co/kibana/kibana-oss:7.10.0
image: docker.elastic.co/kibana/kibana:8.3.3
container_name: kibana
restart: always
healthcheck:
Expand Down