From a0a5de7f1133a72cdf59d95e64db7ec6df95a75f Mon Sep 17 00:00:00 2001
From: yeasy <yangbaohua@gmail.com>
Date: Mon, 9 Mar 2026 18:08:43 -0700
Subject: [PATCH] Upgrade EFK stack and cAdvisor versions

---
 19_observability/19.1_prometheus.md               |  2 +-
 19_observability/19.2_elk.md                      |  7 ++++---
 19_observability/19.3_performance_optimization.md | 10 ++--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/19_observability/19.1_prometheus.md b/19_observability/19.1_prometheus.md
index 86c6e45..44bc1f8 100644
--- a/19_observability/19.1_prometheus.md
+++ b/19_observability/19.1_prometheus.md
@@ -89,7 +89,7 @@ services:
       - monitoring
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:latest
+    image: ghcr.io/google/cadvisor:latest
     ports:
       - "8080:8080"
     volumes:
diff --git a/19_observability/19.2_elk.md b/19_observability/19.2_elk.md
index 2ed866c..27f71bf 100644
--- a/19_observability/19.2_elk.md
+++ b/19_observability/19.2_elk.md
@@ -22,10 +22,11 @@ ELK (Elasticsearch，Logstash，Kibana) 是目前业界最流行的开源日志
 ```yaml
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
     container_name: elasticsearch
     environment:
       - "discovery.type=single-node"
+      - "xpack.security.enabled=false"
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ports:
       - "9200:9200"
@@ -35,7 +36,7 @@ services:
       - logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.0
+    image: docker.elastic.co/kibana/kibana:8.17.0
     container_name: kibana
     environment:
       - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
@@ -47,7 +48,7 @@ services:
       - logging
 
   fluentd:
-    image: fluent/fluentd-kubernetes-daemonset:v1.14.3-debian-elasticsearch7-1.0
+    image: fluent/fluentd-kubernetes-daemonset:v1.17-debian-elasticsearch8-1
     container_name: fluentd
     environment:
       - "FLUENT_ELASTICSEARCH_HOST=elasticsearch"
diff --git a/19_observability/19.3_performance_optimization.md b/19_observability/19.3_performance_optimization.md
index 094f1db..2c9c10f 100644
--- a/19_observability/19.3_performance_optimization.md
+++ b/19_observability/19.3_performance_optimization.md
@@ -101,11 +101,9 @@ cAdvisor 是 Google 开发的容器监控工具，提供比 `docker stats` 更
 **Docker Compose 部署 cAdvisor：**
 
 ```yaml
-version: '3.9'
-
 services:
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.47.0
+    image: ghcr.io/google/cadvisor:v0.51.0
     container_name: cadvisor
     ports:
       - "8080:8080"
@@ -165,8 +163,6 @@ scrape_configs:
 **完整监控栈部署：**
 
 ```yaml
-version: '3.9'
-
 services:
   prometheus:
     image: prom/prometheus:latest
@@ -200,7 +196,7 @@ services:
       - monitoring
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.47.0
+    image: ghcr.io/google/cadvisor:v0.51.0
     container_name: cadvisor
     ports:
       - "8080:8080"
@@ -376,7 +372,6 @@ docker run -m 512m --memory-swap 1g myapp:latest
 # 如果不设置 --memory-swap，则等于 --memory 值
 
 # Docker Compose 配置
-version: '3.9'
 services:
   app:
     image: myapp:latest
@@ -395,7 +390,6 @@ services:
 # limits：绝不能超过的最大值
 # reservations：Compose 排期时的参考值
 
-version: '3.9'
 services:
   web:
     memory: 512M  # 限制