Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
isready
  • Loading branch information
maximilianpohle committed Jun 24, 2025
commit b1b15d6022083d0cc5aa56bdb8abec76d50854dd
2 changes: 1 addition & 1 deletion docs/howto/custom_images.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The current images that could be overwritten are:
| Kibana | KIBANA_IMAGE_REF_OVERRIDE | kibana |
| Elastic Agent | ELASTIC_AGENT_IMAGE_REF_OVERRIDE | elastic-agent |
| Logstash | LOGSTASH_IMAGE_REF_OVERRIDE | logstash |
| is_ready | IS_READY_IMAGE_REF_OVERRIDE | is_ready |
| IsReady | ISREADY_IMAGE_REF_OVERRIDE | is_ready |


For the following two examples, it will be used as example overwriting elastic-agent image.
Expand Down
8 changes: 4 additions & 4 deletions internal/install/application_configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (s stack) ImageRefOverridesForVersion(version string) ImageRefs {
Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Elasticsearch, "")),
Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Kibana, "")),
Logstash: checkImageRefOverride("LOGSTASH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Logstash, "")),
is_ready: checkImageRefOverride("IS_READY_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.is_ready, "")),
IsReady: checkImageRefOverride("IsReady_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.IsReady, "")),
}
}

Expand All @@ -112,7 +112,7 @@ type ImageRefs struct {
Elasticsearch string `yaml:"elasticsearch"`
Kibana string `yaml:"kibana"`
Logstash string `yaml:"logstash"`
IsReady string `yaml:"is_ready"`
IsReady string `yaml:"is_ready"`
}

// AsEnv method returns key=value representation of image refs.
Expand All @@ -122,7 +122,7 @@ func (ir ImageRefs) AsEnv() []string {
vars = append(vars, "ELASTICSEARCH_IMAGE_REF="+ir.Elasticsearch)
vars = append(vars, "KIBANA_IMAGE_REF="+ir.Kibana)
vars = append(vars, "LOGSTASH_IMAGE_REF="+ir.Logstash)
vars = append(vars, "IS_READY_IMAGE_REF="+ir.is_ready)
vars = append(vars, "IsReady_IMAGE_REF="+ir.IsReady)
return vars
}

Expand All @@ -133,7 +133,7 @@ func (ac *ApplicationConfiguration) StackImageRefs() ImageRefs {
refs.Elasticsearch = stringOrDefault(refs.Elasticsearch, fmt.Sprintf("%s:%s", elasticsearchImageName, ac.stackVersion))
refs.Kibana = stringOrDefault(refs.Kibana, fmt.Sprintf("%s:%s", kibanaImageName, ac.stackVersion))
refs.Logstash = stringOrDefault(refs.Logstash, fmt.Sprintf("%s:%s", logstashImageName, ac.stackVersion))
refs.is_ready = stringOrDefault(refs.is_ready, isreadyImageName)
refs.IsReady = stringOrDefault(refs.IsReady, isreadyImageName)
return refs
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
ports:
- "127.0.0.1:9200:9200"

elasticsearch_is_ready:
elasticsearch_IsReady:
image: tianon/true:multiarch
depends_on:
elasticsearch:
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
ports:
- "127.0.0.1:5601:5601"

kibana_is_ready:
kibana_IsReady:
image: tianon/true:multiarch
depends_on:
kibana:
Expand Down Expand Up @@ -77,7 +77,7 @@ services:
- "127.0.0.1:8080:8080"
- "127.0.0.1:9000:9000"

package-registry_is_ready:
package-registry_IsReady:
image: tianon/true:multiarch
depends_on:
package-registry:
Expand Down Expand Up @@ -115,7 +115,7 @@ services:
- "127.0.0.1:8220:8220"


fleet-server_is_ready:
fleet-server_IsReady:
image: tianon/true:multiarch
depends_on:
fleet-server:
Expand Down Expand Up @@ -147,7 +147,7 @@ services:
source: ../../../tmp/service_logs/
target: /run/service_logs/

elastic-agent_is_ready:
elastic-agent_IsReady:
image: tianon/true:multiarch
depends_on:
elastic-agent:
Expand Down
24 changes: 12 additions & 12 deletions internal/stack/_static/docker-compose-stack.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ services:
ports:
- "127.0.0.1:9200:9200"

elasticsearch_is_ready:
image: "${IS_READY_IMAGE_REF}"
elasticsearch_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down Expand Up @@ -56,8 +56,8 @@ services:
ports:
- "127.0.0.1:5601:5601"

kibana_is_ready:
image: "${IS_READY_IMAGE_REF}"
kibana_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
kibana:
condition: service_healthy
Expand Down Expand Up @@ -88,8 +88,8 @@ services:
- "127.0.0.1:8080:8080"
- "127.0.0.1:9000:9000"

package-registry_is_ready:
image: "${IS_READY_IMAGE_REF}"
package-registry_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
package-registry:
condition: service_healthy
Expand Down Expand Up @@ -129,8 +129,8 @@ services:
- "127.0.0.1:8200:8200"
{{ end }}

fleet-server_is_ready:
image: "${IS_READY_IMAGE_REF}"
fleet-server_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
fleet-server:
condition: service_healthy
Expand Down Expand Up @@ -161,8 +161,8 @@ services:
source: ../../../tmp/service_logs/
target: /run/service_logs/

elastic-agent_is_ready:
image: "${IS_READY_IMAGE_REF}"
elastic-agent_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
elastic-agent:
condition: service_healthy
Expand Down Expand Up @@ -194,8 +194,8 @@ services:
- ELASTIC_PASSWORD=changeme
- ELASTIC_HOSTS=https://127.0.0.1:9200

logstash_is_ready:
image: "${IS_READY_IMAGE_REF}"
logstash_IsReady:
image: "${IsReady_IMAGE_REF}"
depends_on:
logstash:
condition: service_healthy
Expand Down
6 changes: 3 additions & 3 deletions internal/stack/_static/local-services-docker-compose.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"

fleet-server_is_ready:
fleet-server_IsReady:
image: tianon/true:multiarch
depends_on:
fleet-server:
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"

elastic-agent_is_ready:
elastic-agent_IsReady:
image: tianon/true:multiarch
depends_on:
elastic-agent:
Expand Down Expand Up @@ -108,7 +108,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"

logstash_is_ready:
logstash_IsReady:
image: tianon/true:multiarch
depends_on:
logstash:
Expand Down
2 changes: 1 addition & 1 deletion internal/stack/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type ServiceStatus struct {
Version string
}

const readyServicesSuffix = "is_ready"
const readyServicesSuffix = "IsReady"

const (
// projectLabelDockerCompose is the label with the project name created by docker-compose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
volumes:
- ${SERVICE_LOGS_DIR}/sql_input:/var/log/mysql
- mysqldata:/var/lib/mysql
sql_input_is_ready:
sql_input_IsReady:
image: tianon/true:multiarch
depends_on:
sql_input:
Expand Down