Skip to content

Commit

Permalink
use singluar advisor
Browse files Browse the repository at this point in the history
  • Loading branch information
@idoqo
idoqo committed Mar 11, 2024
1 parent 8a66c6d commit 47c31c6
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion agent/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- PMM_DEBUG=1
- PERCONA_TEST_CHECKS_INTERVAL=10s
# for local development
- PMM_ADVISORS_CHECKS_FILE=/srv/checks/custom-checks.yml
- PMM_TEST_ADVISOR_CHECKS_FILE=/srv/checks/custom-checks.yml
# for check-dev
# - PMM_TEST_PERCONA_PLATFORM_ADDRESS=check-dev.percona.com:443
# - PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX
Expand Down
2 changes: 1 addition & 1 deletion api-tests/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- PMM_DEBUG=1
- PERCONA_TEST_CHECKS_INTERVAL=10s
# for local development
# - PMM_ADVISORS_CHECKS_FILE=/srv/checks/custom-checks.yml
# - PMM_TEST_ADVISOR_CHECKS_FILE=/srv/checks/custom-checks.yml
# for check-dev
- PMM_TEST_PERCONA_PLATFORM_ADDRESS=check-dev.percona.com
- PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
# - PMM_CLICKHOUSE_BLOCK_SIZE=10000
# - PMM_CLICKHOUSE_POOL_SIZE=2
# - PMM_DEBUG=1
# - PMM_ADVISORS_CHECKS_FILE=/srv/checks/local-checks.yml
# - PMM_TEST_ADVISOR_CHECKS_FILE=/srv/checks/local-checks.yml
# - PMM_POSTGRES_ADDR=pg
# - PMM_POSTGRES_DBNAME=pmm-managed
# - PMM_POSTGRES_USERNAME=pmm-managed
Expand Down
92 changes: 46 additions & 46 deletions docs/process/v2_to_v3_environment_variables.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@
We've renamed some environment variables used by PMM for consistency.
Below is a list of affected variables and their new names.

| PMM 2 | PMM 3 | Comments |
|----------------------------------------------|----------------------------------------------|---------------------------------------------------------------|
| `CONTAINER` | `PMM_CONTAINER` | |
| `DATA_RETENTION` | `PMM_DATA_RETENTION` | |
| `DISABLE_ALERTING` | `PMM_DISABLE_ALERTING` | |
| `DISABLE_UPDATES` | `PMM_DISABLE_UPDATES` | |
| `DISABLE_TELEMETRY` | `PMM_DISABLE_TELEMETRY` | |
| `PERCONA_PLATFORM_API_TIMEOUT` | `PMM_PERCONA_PLATFORM_API_TIMEOUT` | |
| `DISABLE_BACKUP_MANAGEMENT` | `PMM_DISABLE_BACKUP_MANAGEMENT` | |
| `ENABLE_AZUREDISCOVER` | `PMM_ENABLE_AZURE_DISCOVER` | |
| `ENABLE_RBAC` | `PMM_ENABLE_RBAC` | |
| `ENABLE_RBAC` | `PMM_ENABLE_RBAC` | |
| `LESS_LOG_NOISE` | `PMM_LESS_LOG_NOISE` | |
| `METRICS_RESOLUTION` | `PMM_METRICS_RESOLUTION` | |
| `METRICS_RESOLUTION_HR` | `PMM_METRICS_RESOLUTION_HR` | |
| `METRICS_RESOLUTION_LR` | `PMM_METRICS_RESOLUTION_LR` | |
| `METRICS_RESOLUTION_MR` | `PMM_METRICS_RESOLUTION_MR` | |
| `PERCONA_TEST_AUTH_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_CHECKS_FILE` | `PMM_TEST_ADVISORS_CHECKS_FILE` | |
| `PERCONA_TEST_CHECKS_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_CHECKS_PUBLIC_KEY` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY` |
| `PERCONA_TEST_NICER_API` | `PMM_NICER_API` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_ADDR` | `PMM_CLICKHOUSE_ADDR` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_BLOCK_SIZE` | `PMM_CLICKHOUSE_BLOCK_SIZE` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_DATABASE` | `PMM_CLICKHOUSE_DATABASE` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_POOL_SIZE` | `PMM_CLICKHOUSE_POOL_SIZE` | |
| `PERCONA_TEST_PMM_DISABLE_BUILTIN_POSTGRES` | `PMM_DISABLE_BUILTIN_POSTGRES` | |
| `PERCONA_TEST_INTERFACE_TO_BIND` | `PMM_INTERFACE_TO_BIND` | |
| `PERCONA_TEST_PLATFORM_ADDRESS` | `PMM_TEST_PERCONA_PLATFORM_ADDRESS` | |
| `PERCONA_TEST_PLATFORM_INSECURE` | `PMM_TEST_PERCONA_PLATFORM_INSECURE` | |
| `PERCONA_TEST_PLATFORM_PUBLIC_KEY` | `PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY` | |
| `PERCONA_TEST_POSTGRES_ADDR` | `PMM_POSTGRES_ADDR` | |
| `PERCONA_TEST_POSTGRES_DBNAME` | `PMM_POSTGRES_DBNAME` | |
| `PERCONA_TEST_POSTGRES_SSL_CA_PATH` | `PMM_POSTGRES_SSL_CA_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_CERT_PATH` | `PMM_POSTGRES_SSL_CERT_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_KEY_PATH` | `PMM_POSTGRES_SSL_KEY_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_MODE` | `PMM_POSTGRES_SSL_MODE` | |
| `PERCONA_TEST_POSTGRES_DBPASSWORD` | `PMM_POSTGRES_DBPASSWORD` | |
| `PERCONA_TEST_SAAS_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_POSTGRES_USERNAME` | `PMM_POSTGRES_USERNAME` | |
| `PERCONA_TEST_STARLARK_ALLOW_RECURSION` | `PMM_TEST_ADVISORS_STARLARK_ALLOW_RECURSION` | |
| `PERCONA_TEST_TELEMETRY_DISABLE_START_DELAY` | `PMM_TEST_TELEMETRY_DISABLE_START_DELAY` | |
| `PERCONA_TEST_TELEMETRY_HOST` | `PMM_TEST_TELEMETRY_HOST` | |
| `PERCONA_TEST_TELEMETRY_INTERVAL` | `PMM_TEST_TELEMETRY_INTERVAL` | |
| `PERCONA_TEST_TELEMETRY_RETRY_BACKOFF` | `PMM_TEST_TELEMETRY_RETRY_BACKOFF` | |
| `PERCONA_TEST_VERSION_SERVICE_URL` | `PMM_TEST_VERSION_SERVICE_URL` | |
| PMM 2 | PMM 3 | Comments |
|----------------------------------------------|---------------------------------------------|---------------------------------------------------------------|
| `CONTAINER` | `PMM_CONTAINER` | |
| `DATA_RETENTION` | `PMM_DATA_RETENTION` | |
| `DISABLE_ALERTING` | `PMM_DISABLE_ALERTING` | |
| `DISABLE_UPDATES` | `PMM_DISABLE_UPDATES` | |
| `DISABLE_TELEMETRY` | `PMM_DISABLE_TELEMETRY` | |
| `PERCONA_PLATFORM_API_TIMEOUT` | `PMM_PERCONA_PLATFORM_API_TIMEOUT` | |
| `DISABLE_BACKUP_MANAGEMENT` | `PMM_DISABLE_BACKUP_MANAGEMENT` | |
| `ENABLE_AZUREDISCOVER` | `PMM_ENABLE_AZURE_DISCOVER` | |
| `ENABLE_RBAC` | `PMM_ENABLE_RBAC` | |
| `ENABLE_RBAC` | `PMM_ENABLE_RBAC` | |
| `LESS_LOG_NOISE` | `PMM_LESS_LOG_NOISE` | |
| `METRICS_RESOLUTION` | `PMM_METRICS_RESOLUTION` | |
| `METRICS_RESOLUTION_HR` | `PMM_METRICS_RESOLUTION_HR` | |
| `METRICS_RESOLUTION_LR` | `PMM_METRICS_RESOLUTION_LR` | |
| `METRICS_RESOLUTION_MR` | `PMM_METRICS_RESOLUTION_MR` | |
| `PERCONA_TEST_AUTH_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_CHECKS_FILE` | `PMM_TEST_ADVISOR_CHECKS_FILE` | |
| `PERCONA_TEST_CHECKS_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_CHECKS_PUBLIC_KEY` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY` |
| `PERCONA_TEST_NICER_API` | `PMM_NICER_API` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_ADDR` | `PMM_CLICKHOUSE_ADDR` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_BLOCK_SIZE` | `PMM_CLICKHOUSE_BLOCK_SIZE` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_DATABASE` | `PMM_CLICKHOUSE_DATABASE` | |
| `PERCONA_TEST_PMM_CLICKHOUSE_POOL_SIZE` | `PMM_CLICKHOUSE_POOL_SIZE` | |
| `PERCONA_TEST_PMM_DISABLE_BUILTIN_POSTGRES` | `PMM_DISABLE_BUILTIN_POSTGRES` | |
| `PERCONA_TEST_INTERFACE_TO_BIND` | `PMM_INTERFACE_TO_BIND` | |
| `PERCONA_TEST_PLATFORM_ADDRESS` | `PMM_TEST_PERCONA_PLATFORM_ADDRESS` | |
| `PERCONA_TEST_PLATFORM_INSECURE` | `PMM_TEST_PERCONA_PLATFORM_INSECURE` | |
| `PERCONA_TEST_PLATFORM_PUBLIC_KEY` | `PMM_TEST_PERCONA_PLATFORM_PUBLIC_KEY` | |
| `PERCONA_TEST_POSTGRES_ADDR` | `PMM_POSTGRES_ADDR` | |
| `PERCONA_TEST_POSTGRES_DBNAME` | `PMM_POSTGRES_DBNAME` | |
| `PERCONA_TEST_POSTGRES_SSL_CA_PATH` | `PMM_POSTGRES_SSL_CA_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_CERT_PATH` | `PMM_POSTGRES_SSL_CERT_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_KEY_PATH` | `PMM_POSTGRES_SSL_KEY_PATH` | |
| `PERCONA_TEST_POSTGRES_SSL_MODE` | `PMM_POSTGRES_SSL_MODE` | |
| `PERCONA_TEST_POSTGRES_DBPASSWORD` | `PMM_POSTGRES_DBPASSWORD` | |
| `PERCONA_TEST_SAAS_HOST` | | Removed in PMM v3, use `PMM_TEST_PERCONA_PLATFORM_ADDRESS` |
| `PERCONA_TEST_POSTGRES_USERNAME` | `PMM_POSTGRES_USERNAME` | |
| `PERCONA_TEST_STARLARK_ALLOW_RECURSION` | `PMM_TEST_ADVISOR_STARLARK_ALLOW_RECURSION` | |
| `PERCONA_TEST_TELEMETRY_DISABLE_START_DELAY` | `PMM_TEST_TELEMETRY_DISABLE_START_DELAY` | |
| `PERCONA_TEST_TELEMETRY_HOST` | `PMM_TEST_TELEMETRY_HOST` | |
| `PERCONA_TEST_TELEMETRY_INTERVAL` | `PMM_TEST_TELEMETRY_INTERVAL` | |
| `PERCONA_TEST_TELEMETRY_RETRY_BACKOFF` | `PMM_TEST_TELEMETRY_RETRY_BACKOFF` | |
| `PERCONA_TEST_VERSION_SERVICE_URL` | `PMM_TEST_VERSION_SERVICE_URL` | |
Loading

0 comments on commit 47c31c6

Please sign in to comment.