docs: Add 6 and update 11 files

logserver/install.sh

@@ -7,7 +7,7 @@ _check_required_env_vars "CONTAINER_NAME" "ES_VERSION" "LS_VERSION" "KIBANA_VERS
 
 # Check Docker and Docker Compose are available
 _check_docker_installed || _die "Docker test failed"
-which docker-compose >/dev/null 2>&1 || _die "docker-compose is not installed"
+docker compose version >/dev/null 2>&1 || _die "Docker Compose is not installed (requires Docker Compose V2)"
 
 # Check vm.max_map_count for Elasticsearch
 current_max_map_count=$(sysctl -n vm.max_map_count 2>/dev/null || echo 0)
@@ -23,7 +23,7 @@ fi
 bash ./stop.sh || true
 
 # Remove old containers
-docker-compose down --remove-orphans 2>/dev/null || true
+docker compose down --remove-orphans 2>/dev/null || true
 
 # Pull the Docker images
 echo "Pulling ELK stack images..."
@@ -31,17 +31,30 @@ docker pull docker.elastic.co/elasticsearch/elasticsearch:${ES_VERSION} || _die
 docker pull docker.elastic.co/logstash/logstash:${LS_VERSION} || _die "Failed to pull Logstash"
 docker pull docker.elastic.co/kibana/kibana:${KIBANA_VERSION} || _die "Failed to pull Kibana"
 
+# Ensure config directory exists
+mkdir -p "${CONFIG_PATH}"
+
 # Initialize API keys file if it doesn't exist
 if [ ! -f "${CONFIG_PATH}/api-keys.yml" ]; then
     echo "No API keys configured yet."
     echo "Run ./generate-api-key.sh to add client keys"
-    mkdir -p "${CONFIG_PATH}"
     echo "api_keys:" > "${CONFIG_PATH}/api-keys.yml"
 fi
 
+# Copy Logstash configuration if it doesn't exist
+if [ ! -f "${CONFIG_PATH}/logstash.conf" ]; then
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    if [ -f "$SCRIPT_DIR/config/logstash.conf" ]; then
+        cp "$SCRIPT_DIR/config/logstash.conf" "${CONFIG_PATH}/logstash.conf"
+        echo "Copied Logstash configuration to ${CONFIG_PATH}"
+    else
+        echo "WARNING: logstash.conf not found in template"
+    fi
+fi
+
 # Start the ELK stack
 echo "Starting ELK stack..."
-docker-compose up -d --build || _die "Failed to start ELK stack"
+docker compose up -d --build || _die "Failed to start ELK stack"
 
 # Wait for services to be ready
 echo "Waiting for services to start..."
@@ -52,9 +65,15 @@ bash ./status.sh || _die "Services failed to start properly"
 
 echo "Installation of ${CONTAINER_NAME} complete"
 echo ""
-echo "Kibana UI: http://$(hostname -I | awk '{print $1}'):${KIBANA_PORT}"
+echo "========================================="
+echo "Kibana UI: ${SERVER_PUBLICBASEURL:-http://$(hostname -I | awk '{print $1}'):${KIBANA_PORT}}"
 echo "Username: elastic"
-echo "Password: ${KIBANA_PASSWORD}"
+echo "Password: ${ELASTIC_PASSWORD:-changeme}"
+echo "========================================="
+echo ""
+echo "IMPORTANT: Update service.env with:"
+echo "  - Your actual server IP/domain in SERVER_PUBLICBASEURL"
+echo "  - A secure password in ELASTIC_PASSWORD"
 echo ""
 echo "Logstash listening on port ${LOGSTASH_BEATS_PORT} for Filebeat clients"
 echo ""