From 6ad5e460e4658f3ed04a8fa2c26e5d81e62ba02e Mon Sep 17 00:00:00 2001 From: rkthtrifork Date: Fri, 8 Dec 2023 09:00:23 +0100 Subject: [PATCH 1/3] added some more core profiles --- docker-compose/kafka.yaml | 12 ++++++++---- docker-compose/oauth.yaml | 5 +++-- docker-compose/os.yaml | 11 +++++++---- readme.md | 20 ++++++++++---------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/docker-compose/kafka.yaml b/docker-compose/kafka.yaml index d0e9e85..55ddc32 100644 --- a/docker-compose/kafka.yaml +++ b/docker-compose/kafka.yaml @@ -15,8 +15,9 @@ services: mem_limit: 512m restart: unless-stopped profiles: - - kafka + - kafka-core - core + - kafka - full kafka: @@ -53,8 +54,9 @@ services: timeout: 10s retries: 10 profiles: - - kafka + - kafka-core - core + - kafka - full kafka-setup: @@ -77,8 +79,9 @@ services: KAFKA_ZOOKEEPER_CONNECT: ignored KAFKA_TOPICS: ${INITIAL_KAFKA_TOPICS} profiles: - - kafka + - kafka-core - core + - kafka - full redpanda: @@ -176,8 +179,9 @@ services: timeout: 10s retries: 10 profiles: - - kafka + - schema-registry-core - core + - kafka - full networks: diff --git a/docker-compose/oauth.yaml b/docker-compose/oauth.yaml index 5c73f90..b6388fc 100644 --- a/docker-compose/oauth.yaml +++ b/docker-compose/oauth.yaml @@ -14,9 +14,10 @@ services: - OAuth__Mode=Asymmetric - Simulator__DefaultKafkaRole=*_all profiles: - - opensearch - - kafka + - oauth-core - core + - kafka + - opensearch - full # Not enabled by default diff --git a/docker-compose/os.yaml b/docker-compose/os.yaml index 1c10676..c4ca2ff 100644 --- a/docker-compose/os.yaml +++ b/docker-compose/os.yaml @@ -47,15 +47,16 @@ services: ports: - 9200:9200 - 9600:9600 - profiles: - - opensearch - - core - - full healthcheck: test: curl -u admin:admin -s -f opensearch:9200/_cat/health > /dev/null || exit 1 interval: 30s timeout: 10s retries: 5 + profiles: + - opensearch-core + - core + - opensearch + - full opensearch-configurer: image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:latest @@ -75,6 +76,8 @@ services: - ./config/opensearch-configurer/index_templates/:/app/tmp/index_templates/ - ./config/opensearch-configurer/cluster/:/app/tmp/cluster/ profiles: + - opensearch-core + - core - opensearch - full diff --git a/readme.md b/readme.md index d889b89..384d6f7 100644 --- a/readme.md +++ b/readme.md @@ -130,13 +130,13 @@ curl -k -s -H "Authorization: Bearer $ACCESS_TOKEN" $OPENSEARCH_URL/_cat/indices Here is further explanation on what each profile starts. -| Images / profiles | full | core | kafka | opensearch | observability | -| :------------------: | :---: | :---: | :---: | :--------: | :-----------: | -| Kafka | x | x | x | | | -| OAuth simulator | x | x | x | x | | -| Redpanda console | x | | x | | | -| Schema registry | x | x | x | | | -| Opensearch | x | x | | x | | -| Opensearch dashboard | x | | | x | | -| Prometheus | x | | | | x | -| Grafana | x | | | | x | +| Images / profiles | oauth-core | kafka-core | schema-registry-core | opensearch-core | core | kafka | opensearch | observability | full | +| :------------------: | :---------: | :--------: | :------------------: | :-------------: | :---: | :---: | :--------: | :-----------: | :---: | +| Kafka | | x | | | x | x | | | x | +| OAuth simulator | x | | | | x | x | x | | x | +| Redpanda console | | | | | | x | | | x | +| Schema registry | | | x | | x | x | | | x | +| Opensearch | | | | x | x | | x | | x | +| Opensearch dashboard | | | | | | | x | | x | +| Prometheus | | | | | | | | x | x | +| Grafana | | | | | | | | x | x | From ec3109c75d176e7d7da3dd2285e6c3f73eb2c0f1 Mon Sep 17 00:00:00 2001 From: rkthtrifork Date: Wed, 13 Dec 2023 13:01:25 +0100 Subject: [PATCH 2/3] made sure new profiles also include other necessary services --- docker-compose/kafka.yaml | 3 +++ docker-compose/oauth.yaml | 4 +++- readme.md | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docker-compose/kafka.yaml b/docker-compose/kafka.yaml index 55ddc32..624d6c3 100644 --- a/docker-compose/kafka.yaml +++ b/docker-compose/kafka.yaml @@ -16,6 +16,7 @@ services: restart: unless-stopped profiles: - kafka-core + - schema-registry-core - core - kafka - full @@ -55,6 +56,7 @@ services: retries: 10 profiles: - kafka-core + - schema-registry-core - core - kafka - full @@ -80,6 +82,7 @@ services: KAFKA_TOPICS: ${INITIAL_KAFKA_TOPICS} profiles: - kafka-core + - schema-registry-core - core - kafka - full diff --git a/docker-compose/oauth.yaml b/docker-compose/oauth.yaml index b6388fc..aff54da 100644 --- a/docker-compose/oauth.yaml +++ b/docker-compose/oauth.yaml @@ -14,7 +14,9 @@ services: - OAuth__Mode=Asymmetric - Simulator__DefaultKafkaRole=*_all profiles: - - oauth-core + - kafka-core + - schema-registry-core + - opensearch-core - core - kafka - opensearch diff --git a/readme.md b/readme.md index 384d6f7..be152d6 100644 --- a/readme.md +++ b/readme.md @@ -130,13 +130,13 @@ curl -k -s -H "Authorization: Bearer $ACCESS_TOKEN" $OPENSEARCH_URL/_cat/indices Here is further explanation on what each profile starts. -| Images / profiles | oauth-core | kafka-core | schema-registry-core | opensearch-core | core | kafka | opensearch | observability | full | -| :------------------: | :---------: | :--------: | :------------------: | :-------------: | :---: | :---: | :--------: | :-----------: | :---: | -| Kafka | | x | | | x | x | | | x | -| OAuth simulator | x | | | | x | x | x | | x | -| Redpanda console | | | | | | x | | | x | -| Schema registry | | | x | | x | x | | | x | -| Opensearch | | | | x | x | | x | | x | -| Opensearch dashboard | | | | | | | x | | x | -| Prometheus | | | | | | | | x | x | -| Grafana | | | | | | | | x | x | +| Images / profiles | kafka-core | schema-registry-core | opensearch-core | core | kafka | opensearch | observability | full | +| :------------------: | :--------: | :------------------: | :-------------: | :---: | :---: | :--------: | :-----------: | :---: | +| Kafka | x | | | x | x | | | x | +| OAuth simulator | x | x | x | x | x | x | | x | +| Redpanda console | | | | | x | | | x | +| Schema registry | | x | | x | x | | | x | +| Opensearch | | | x | x | | x | | x | +| Opensearch dashboard | | | | | | x | | x | +| Prometheus | | | | | | | x | x | +| Grafana | | | | | | | x | x | From 86a6bcca2ae7b195f2f65f33827b3e27f2b2f985 Mon Sep 17 00:00:00 2001 From: rkthtrifork Date: Mon, 18 Dec 2023 10:12:10 +0100 Subject: [PATCH 3/3] added kafka to schema-registry-core profile --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index be152d6..667b93d 100644 --- a/readme.md +++ b/readme.md @@ -132,7 +132,7 @@ Here is further explanation on what each profile starts. | Images / profiles | kafka-core | schema-registry-core | opensearch-core | core | kafka | opensearch | observability | full | | :------------------: | :--------: | :------------------: | :-------------: | :---: | :---: | :--------: | :-----------: | :---: | -| Kafka | x | | | x | x | | | x | +| Kafka | x | x | | x | x | | | x | | OAuth simulator | x | x | x | x | x | x | | x | | Redpanda console | | | | | x | | | x | | Schema registry | | x | | x | x | | | x |