node is host

2022-11-29 16:22:35 +00:00
parent 2b20a33133
commit b938dd0ffd
105 changed files with 687 additions and 704 deletions
@@ -1,11 +0,0 @@
-APM_SERVER_SERVICE_8200_TAGS=urlprefix-apm.${APP_DOMAIN}/
-CURATOR_LOGFORMAT=default
-CURATOR_LOGLEVEL=INFO
-CURATOR_MASTER_ONLY=False
-CURATOR_TIMEOUT=30
-CURATOR_USE_SSL=False
-ELASTICSEARCH_HOST=elasticsearch
-ELASTICSEARCH_PORT=9200
-ELASTICSEARCH_PROTOCOL=http
-ELASTICSEARCH_SERVICE_9200_TAGS=urlprefix-elasticsearch.${APP_DOMAIN}/
-KIBANA_SERVICE_5601_TAGS=urlprefix-kibana.${APP_DOMAIN}/
@@ -8,11 +8,11 @@ services:
      context: ../..
      dockerfile: docker/elastic/apm-server-oss/Dockerfile
    image: ${DOCKER_REPOSITORY}/apm-server-oss:${DOCKER_IMAGE_TAG}
-    command: -c apm-server.yml --strict.perms=false -e -E output.elasticsearch.hosts=["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"] -E output.elasticsearch.protocol=${ELASTICSEARCH_PROTOCOL} -E output.elasticsearch.username=${ELASTICSEARCH_USERNAME} -E output.elasticsearch.password=${ELASTICSEARCH_PASSWORD} -E apm-server.register.ingest.pipeline.enabled=false
+    command: -c apm-server.yml --strict.perms=false -e -E output.elasticsearch.hosts=["${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"] -E output.elasticsearch.protocol=${ELASTICSEARCH_PROTOCOL:-http} -E output.elasticsearch.username=${ELASTICSEARCH_USERNAME} -E output.elasticsearch.password=${ELASTICSEARCH_PASSWORD} -E apm-server.register.ingest.pipeline.enabled=false
    labels:
    - SERVICE_8200_CHECK_HTTP=/
    - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server-oss-8200
-    - SERVICE_8200_TAGS=${APM_SERVER_SERVICE_8200_TAGS}
+    - SERVICE_8200_TAGS=${APM_SERVER_OSS_SERVICE_8200_TAGS}
    networks:
    - private
    - public
@@ -3,7 +3,7 @@ version: '3.6'
 services:
  apm-server:
    image: docker.elastic.co/apm/apm-server:7.4.2
-    command: -c apm-server.yml --strict.perms=false -e -E output.elasticsearch.hosts=["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"] -E output.elasticsearch.protocol=${ELASTICSEARCH_PROTOCOL} -E output.elasticsearch.username=${ELASTICSEARCH_USERNAME} -E output.elasticsearch.password=${ELASTICSEARCH_PASSWORD}
+    command: -c apm-server.yml --strict.perms=false -e -E output.elasticsearch.hosts=["${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"] -E output.elasticsearch.protocol=${ELASTICSEARCH_PROTOCOL:-http} -E output.elasticsearch.username=${ELASTICSEARCH_USERNAME} -E output.elasticsearch.password=${ELASTICSEARCH_PASSWORD}
    labels:
    - SERVICE_8200_CHECK_HTTP=/
    - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server-8200
@@ -12,7 +12,6 @@ services:
      private:
        aliases:
        - apm.${DOCKER_NETWORK_PRIVATE}
-        - apm.elastic.${DOCKER_NETWORK_PRIVATE}
      public:
    ports:
    - 8200
@@ -8,14 +8,14 @@ services:
      context: ../..
      dockerfile: docker/elastic/curator/Dockerfile
    environment:
-    - DEPLOY=${DEPLOY}
-    - HOSTS=${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}
-    - LOGFORMAT=${CURATOR_LOGFORMAT}
-    - LOGLEVEL=${CURATOR_LOGLEVEL}
-    - MASTER_ONLY=${CURATOR_MASTER_ONLY}
-    - PORT=${ELASTICSEARCH_PORT}
-    - TIMEOUT=${CURATOR_TIMEOUT}
-    - USE_SSL=${CURATOR_USE_SSL}
+    - DEPLOY=${DEPLOY:-}
+    - HOSTS=${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-9200}
+    - LOGFORMAT=${CURATOR_LOGFORMAT:-default}
+    - LOGLEVEL=${CURATOR_LOGLEVEL:-INFO}
+    - MASTER_ONLY=${CURATOR_MASTER_ONLY:-False}
+    - PORT=${ELASTICSEARCH_PORT:-9200}
+    - TIMEOUT=${CURATOR_TIMEOUT:-30}
+    - USE_SSL=${CURATOR_USE_SSL:-False}
    networks:
    - private
    restart: always
@@ -0,0 +1,14 @@
+APM_SERVER_SERVICE_8200_TAGS              ?= $(patsubst %,urlprefix-%,$(APM_SERVER_SERVICE_8200_URIS))
+APM_SERVER_SERVICE_8200_URIS              ?= $(patsubst %,apm-server.%,$(APP_URIS))
+ELASTICSEARCH_SERVICE_9200_TAGS           ?= $(patsubst %,urlprefix-%,$(ELASTICSEARCH_SERVICE_9200_URIS))
+ELASTICSEARCH_SERVICE_9200_URIS           ?= $(patsubst %,elasticsearch.%,$(APP_URIS))
+ENV_VARS                                  += APM_SERVER_SERVICE_8200_TAGS ELASTICSEARCH_SERVICE_9200_TAGS KIBANA_SERVICE_5601_TAGS
+KIBANA_SERVICE_5601_TAGS                  ?= $(patsubst %,urlprefix-%,$(KIBANA_SERVICE_5601_URIS))
+KIBANA_SERVICE_5601_URIS                  ?= $(patsubst %,kibana.%,$(APP_URIS))
+
+elastic                                   ?= elastic/curator elastic/elasticsearch elastic/kibana
+
+# target elasticsearch-delete-%: delete elasticsearch index %
+.PHONY: elasticsearch-delete-%
+elasticsearch-delete-%:
+	docker ps |awk '$$NF ~ /$(COMPOSE_PROJECT_NAME)-elasticsearch/' |sed 's/^.*:\([0-9]*\)->9200\/tcp.*$$/\1/' |while read port; do echo -e "DELETE /$* HTTP/1.0\n\n" |nc localhost $$port; done
@@ -8,7 +8,7 @@ services:
    - xpack.monitoring.enabled=false
    - xpack.graph.enabled=false
    - xpack.watcher.enabled=false
-    - cluster.name=elasticsearch-${ENV}
+    - cluster.name=${COMPOSE_SERVICE_NAME}
    - network.host=0.0.0.0
    - http.cors.enabled=true
    - http.cors.allow-credentials=true
@@ -4,6 +4,6 @@ services:
  kibana-oss:
    image: docker.elastic.co/kibana/kibana-oss:7.4.2
    environment:
-    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"
-    - KIBANA_INDEX=.kibana-oss.${ENV}
-    - SERVER_NAME=kibana.${APP_DOMAIN}
+    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"
+    - KIBANA_INDEX=.kibana-oss.${COMPOSE_SERVICE_NAME}
+    - SERVER_NAME=kibana-oss.${APP_HOST}
@@ -4,6 +4,6 @@ services:
  kibana-oss:
    image: docker.elastic.co/kibana/kibana-oss:7.7.1
    environment:
-    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"
-    - KIBANA_INDEX=.kibana-oss.${ENV}
-    - SERVER_NAME=kibana.${APP_DOMAIN}
+    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"
+    - KIBANA_INDEX=.kibana-oss.${COMPOSE_SERVICE_NAME}
+    - SERVER_NAME=kibana-oss.${APP_HOST}
@@ -5,7 +5,7 @@ services:
    labels:
    - SERVICE_5601_CHECK_HTTP=/app/kibana
    - SERVICE_5601_NAME=${COMPOSE_SERVICE_NAME}-kibana-oss-5601
-    - SERVICE_5601_TAGS=${KIBANA_SERVICE_5601_TAGS}
+    - SERVICE_5601_TAGS=${KIBANA_OSS_SERVICE_5601_TAGS}
    networks:
    - private
    - public
@@ -4,4 +4,4 @@ services:
  kibana:
    image: docker.elastic.co/kibana/kibana:5.3.3
    environment:
-    - ELASTICSEARCH_URL="${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"
+    - ELASTICSEARCH_URL="${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"
@@ -4,6 +4,6 @@ services:
  kibana:
    image: docker.elastic.co/kibana/kibana:7.4.2
    environment:
-    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"
-    - KIBANA_INDEX=.kibana.${ENV}
-    - SERVER_NAME=kibana.${APP_DOMAIN}
+    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"
+    - KIBANA_INDEX=.kibana.${COMPOSE_SERVICE_NAME}
+    - SERVER_NAME=kibana.${APP_HOST}
@@ -4,6 +4,6 @@ services:
  kibana:
    image: docker.elastic.co/kibana/kibana:7.7.1
    environment:
-    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"
-    - KIBANA_INDEX=.kibana.${ENV}
-    - SERVER_NAME=kibana.${APP_DOMAIN}
+    - ELASTICSEARCH_HOSTS="${ELASTICSEARCH_PROTOCOL:-http}://${ELASTICSEARCH_HOST:-elasticsearch}:${ELASTICSEARCH_PORT:-9200}"
+    - KIBANA_INDEX=.kibana.${COMPOSE_SERVICE_NAME}
+    - SERVER_NAME=kibana.${APP_HOST}
@@ -0,0 +1,7 @@
+APM_SERVER_OSS_SERVICE_8200_TAGS          ?= $(patsubst %,urlprefix-%,$(APM_SERVER_OSS_SERVICE_8200_URIS))
+APM_SERVER_OSS_SERVICE_8200_URIS          ?= $(patsubst %,apm-server-oss.%,$(APP_URIS))
+ENV_VARS                                  += APM_SERVER_OSS_SERVICE_8200_TAGS KIBANA_OSS_SERVICE_5601_TAGS
+KIBANA_OSS_SERVICE_5601_TAGS              ?= $(patsubst %,urlprefix-%,$(KIBANA_OSS_SERVICE_5601_URIS))
+KIBANA_OSS_SERVICE_5601_URIS              ?= $(patsubst %,kibana-oss.%,$(APP_URIS))
+
+elastic-oss                               ?= elastic/apm-server-oss elastic/curator elastic/elasticsearch elastic/kibana-oss