From 04c0d29f40d6d931fa58c0b63510358c3b205ce7 Mon Sep 17 00:00:00 2001 From: "Makar Oleg Y." Date: Mon, 17 Mar 2025 14:47:20 +0300 Subject: [PATCH 1/2] docs java apm fix --- agent_installation_guide/APM/java.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/agent_installation_guide/APM/java.md b/agent_installation_guide/APM/java.md index 6a60d45..f65993b 100644 --- a/agent_installation_guide/APM/java.md +++ b/agent_installation_guide/APM/java.md @@ -37,6 +37,14 @@ sudo unzip newrelic-java.zip -d /opt/newrelic NEW_RELIC_HOST=gmonit-collector..ru #Домен коллектора GMonit NEW_RELIC_APP_NAME="MY_AWESOME_APP" #Название приложения - замените на своё ``` + Или в `newrelic.yml` (блок common): + + ```yaml + log_file_path: stdout + license_key: '0123456789-123456789-123456789-123456789' + app_name: MY_AWESOME_APP + host: gmonit-collector..ru + ``` 2. **Если используются самоподписанные сертификаты** Необходимо явно указать путь до бандла сертификатов (через `newrelic.yml` или переменную окружения): @@ -44,7 +52,7 @@ sudo unzip newrelic-java.zip -d /opt/newrelic ```bash NEW_RELIC_CA_BUNDLE_PATH=/gmonit/ssl/rootCA.crt #Путь до файла с бандлом сертификатов ``` - Или в `newrelic.yml`: + Или в `newrelic.yml` (блок common): ```yaml ca_bundle_path: /gmonit/ssl/rootCA.crt From 19916efd437e07480a7d88483553122239942758 Mon Sep 17 00:00:00 2001 From: "Makar Oleg Y." Date: Mon, 21 Apr 2025 15:28:10 +0300 Subject: [PATCH 2/2] Fix clickhouse version --- examples/pilot-letsencrypt/compose.yaml | 2 +- examples/pilot/compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pilot-letsencrypt/compose.yaml b/examples/pilot-letsencrypt/compose.yaml index 4e11f68..4b342bb 100644 --- a/examples/pilot-letsencrypt/compose.yaml +++ b/examples/pilot-letsencrypt/compose.yaml @@ -8,7 +8,7 @@ x-loggin: &logging services: clickhouse: restart: unless-stopped - image: clickhouse/clickhouse-server:23.3 + image: clickhouse/clickhouse-server:24.8 environment: CLICKHOUSE_USER: gmonit CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD} diff --git a/examples/pilot/compose.yaml b/examples/pilot/compose.yaml index 2806704..40d6e40 100644 --- a/examples/pilot/compose.yaml +++ b/examples/pilot/compose.yaml @@ -8,7 +8,7 @@ x-loggin: &logging services: clickhouse: restart: unless-stopped - image: clickhouse/clickhouse-server:23.3 + image: clickhouse/clickhouse-server:24.8 environment: CLICKHOUSE_USER: gmonit CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD}