From a0e663417fdae704563ece5d0da506d2713ed9b5 Mon Sep 17 00:00:00 2001 From: DeepFlow-pengbin <1473371932@qq.com> Date: Wed, 19 Nov 2025 16:06:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?v6.5=20LTS=20=E7=89=88=E6=9C=AC=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=91=A8=E6=9C=9F=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh/10-release-notes/02-release-timeline.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/10-release-notes/02-release-timeline.md b/docs/zh/10-release-notes/02-release-timeline.md index 484e0b7b..ced5c0e0 100644 --- a/docs/zh/10-release-notes/02-release-timeline.md +++ b/docs/zh/10-release-notes/02-release-timeline.md @@ -5,7 +5,7 @@ permalink: /release-notes/release-timeline | Branch | Tag | LTS | Release | End Of Life | | ------ | ------- | ----- | -------------- | ------------------ | -| main | | Y | 2025-12-24 (E) | | +| main | | | 2025-12-24 (E) | | | | 7.1.7 | | 2025-12-10 (E) | | | | 7.1.6 | | 2025-11-26 (E) | | | | 7.1.5 | | 2025-11-12 (E) | | @@ -36,7 +36,7 @@ permalink: /release-notes/release-timeline | | 6.6.2 | | 2024-08-01 | | | | 6.6.1 | | 2024-07-18 | | | | 6.6.0 | | 2024-07-04 | | -| v6.5 | | Y | 2024-06-20 | 2025-06-20 | +| v6.5 | | ~~Y~~ | 2024-06-20 | 2025-06-20 | | | 6.5.9 | | 2024-06-20 | | | | 6.5.8 | | 2024-06-06 | | | | 6.5.7 | | 2024-05-23 | | From 053fd8668e776a1e4b8c4a8719f6c5f44bb97ed7 Mon Sep 17 00:00:00 2001 From: DeepFlow-pengbin <1473371932@qq.com> Date: Thu, 20 Nov 2025 11:37:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20macvlan=20cni=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=20agent-group-config=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../03-special-environment-deployment.md | 79 ++----------------- 1 file changed, 8 insertions(+), 71 deletions(-) diff --git a/docs/zh/04-best-practice/03-special-environment-deployment.md b/docs/zh/04-best-practice/03-special-environment-deployment.md index d3dc4729..4eac5b77 100644 --- a/docs/zh/04-best-practice/03-special-environment-deployment.md +++ b/docs/zh/04-best-practice/03-special-environment-deployment.md @@ -41,80 +41,17 @@ permalink: /best-practice/special-environment-deployment/ ### 仅采集 RootNS 中的网卡流量 -K8s 使用 macvlan CNI 时，在 rootns 下只能看到所有 POD 共用的一个虚拟网卡，此时需要对 deepflow-agent 进行额外的配置： +在 Kubernetes 环境中使用 macvlan CNI 时，由于所有 Pod 在 rootns 下共享同一个虚拟网卡，所以需要对 deepflow-agent 进行相应配置以适配该网络模式。 -1. 创建 agent-group 和 agent-group-config： - - ```bash - deepflow-ctl agent-group create macvlan - deepflow-ctl agent-group-config create macvlan - ``` - -2. 获取 macvlan agent-group ID： - - ```bash - deepflow-ctl agent-group list | grep macvlan - ``` - -3. 新建 agent-group-config 配置文件 `macvlan-agent-group-config.yaml`: +1. 通过 [deepflow-ctl](./agent-advanced-config) 创建 macvlan 模式下使用的 [agent-group-config](../configuration/agent/)： ```yaml - vtap_group_id: g-xxxxxx - ## Regular Expression for TAP (Traffic Access Point) - ## Length: [0, 65535] - ## Default: - ## Localhost: lo - ## Common NIC: eth.*|en[osipx].* - ## QEMU VM NIC: tap.* - ## Flannel: veth.* - ## Calico: cali.* - ## Cilium: lxc.* - ## Kube-OVN: [0-9a-f]+_h$ - ## Note: Regular expression of NIC name for collecting traffic - tap_interface_regex: eth0 - ## Traffic Tap Mode - ## Default: 0, means local. - ## Options: 0, 1 (virtual mirror), 2 (physical mirror, aka. analyzer mode) - ## Note: Mirror mode is used when deepflow-agent cannot directly capture the - ## traffic from the source. For example: - ## - in the K8s macvlan environment, capture the Pod traffic through the Node NIC - ## - in the Hyper-V environment, capture the VM traffic through the Hypervisor NIC - ## - in the ESXi environment, capture traffic through VDS/VSS local SPAN - ## - in the DPDK environment, capture traffic through DPDK ring buffer - ## Use Analyzer mode when deepflow-agent captures traffic through physical switch - ## mirroring. - tap_mode: 1 - ``` - -4. 创建 agent-group-config： - - ```bash - deepflow-ctl agent-group-config create -f macvlan-agent-group-config.yaml - ``` - -5. 修改 deepflow-agent 的 agent-group： - ```bash - kubectl edit cm -n deepflow deepflow-agent - ``` - 添加配置： - ```yaml - vtap-group-id-request: g-xxxxx - ``` - 停止 deepflow-agent： - ```bash - kubectl -n deepflow patch daemonset deepflow-agent -p '{"spec": {"template": {"spec": {"nodeSelector": {"non-existing": "true"}}}}}' - ``` - 通过 deepflow-ctl 删除 macvlan 的 agent： - ```bash - deepflow-ctl agent delete - ``` - 启动 deepflow-agent： - ```bash - kubectl -n deepflow patch daemonset deepflow-agent --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]' - ``` - 查看 deepflow agent list， 确保 agent 加入了 macvlan group： - ```bash - deepflow-ctl agent list + inputs: + cbpf: + af_packet: + interface_regex: eth0 + common: + capture_mode: 1 ``` ### 同时采集 RootNS 和 PodNS 中的网卡流量