diff --git a/Makefile b/Makefile index c5815098..6ee63818 100644 --- a/Makefile +++ b/Makefile @@ -37,15 +37,13 @@ poetry-fallback: python3 -m pip install --user pipx python3 -m pipx ensurepath pipx install poetry - pipx upgrade poetry poetry: ifeq ($(OS),Windows) -powershell (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | py - - poetry self update else - -curl -sSL https://install.python-poetry.org | python3 - - poetry self update || $(MAKE) poetry-fallback + -curl -sSL https://install.python-poetry.org | python3 - --version 1.5.0 + $(MAKE) poetry-fallback endif .PHONY: gen diff --git a/docs/en/setup/advanced/LogReporter.md b/docs/en/setup/advanced/LogReporter.md index e08e65f6..64c7b485 100644 --- a/docs/en/setup/advanced/LogReporter.md +++ b/docs/en/setup/advanced/LogReporter.md @@ -9,7 +9,7 @@ Log reporter supports all three protocols including `grpc`, `http` and `kafka`, If chosen `http` protocol, the logs will be batch-reported to the collector REST endpoint `oap/v3/logs`. If chosen `kafka` protocol, please make sure to config -[kafka-fetcher](https://skywalking.apache.org/docs/main/v9.1.0/en/setup/backend/kafka-fetcher/) +[kafka-fetcher](https://skywalking.apache.org/docs/main/next/en/setup/backend/kafka-fetcher/) on the OAP side, and make sure Python agent config `kafka_bootstrap_servers` points to your Kafka brokers. **Please make sure OAP is consuming the same Kafka topic as your agent produces to, `kafka_namespace` must match OAP side configuration `plugin.kafka.namespace`** diff --git a/poetry.lock b/poetry.lock index d0983077..adcdbf49 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "aiofiles"