Skip to content

Add environment #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikolaev-roman-a wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add environment #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions examples/lite/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ x-loggin: &logging
max-size: 100m
max-file: 5

x-labels: &labels
labels:
environment: "gmonit"
Comment thread
darkleaf marked this conversation as resolved.

volumes:
grafana_data:

services:
clickhouse:
<<: *logging
<<: [*logging, *labels]
restart: unless-stopped
image: clickhouse/clickhouse-server:25.3
pull_policy: always
Expand All @@ -30,7 +34,7 @@ services:
# - CAP_SYS_NICE # https://github.com/ClickHouse/ClickHouse/issues/68747

grafana:
<<: *logging
<<: [*logging, *labels]
restart: unless-stopped
image: cr.yandex/crpih7d63vpcj5dfn8jj/grafana:v3
pull_policy: always
Expand Down Expand Up @@ -58,7 +62,7 @@ services:
- grafana_data:/var/lib/grafana

collector:
<<: *logging
<<: [*logging, *labels]
restart: unless-stopped
image: cr.yandex/crpih7d63vpcj5dfn8jj/collector:v4
pull_policy: always
Expand Down Expand Up @@ -88,7 +92,7 @@ services:
condition: service_healthy

nginx:
<<: *logging
<<: [*logging, *labels]
restart: unless-stopped
image: umputun/nginx-le:v1.7.0
pull_policy: always
Expand Down
20 changes: 12 additions & 8 deletions examples/pilot-letsencrypt/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ x-loggin: &logging
max-size: 100m
max-file: 5

x-labels: &labels
labels:
environment: "gmonit"

services:
clickhouse:
restart: unless-stopped
Expand All @@ -20,7 +24,7 @@ services:
volumes:
- ./clickhouse/gmonit.xml:/etc/clickhouse-server/config.d/gmonit.xml
- ./clickhouse/gmonit_system_tables_conf.xml:/etc/clickhouse-server/config.d/gmonit_system_tables_conf.xml
<<: *logging
<<: [*logging, *labels]

postgres:
restart: unless-stopped
Expand All @@ -32,7 +36,7 @@ services:
interval: 10s
timeout: 5s
retries: 10
<<: *logging
<<: [*logging, *labels]

redis:
restart: unless-stopped
Expand All @@ -42,7 +46,7 @@ services:
interval: 10s
timeout: 5s
retries: 10
<<: *logging
<<: [*logging, *labels]

grafana:
restart: unless-stopped
Expand Down Expand Up @@ -93,7 +97,7 @@ services:
condition: service_healthy
volumes:
- ./ssl:/gmonit/ssl
<<: *logging
<<: [*logging, *labels]

collector:
env_file:
Expand Down Expand Up @@ -140,7 +144,7 @@ services:
volumes:
- ./ssl:/gmonit/ssl
- ./***.mmdb:/gmonit/geoip.mmdb
<<: *logging
<<: [*logging, *labels]

nginx:
restart: unless-stopped
Expand All @@ -165,7 +169,7 @@ services:
aliases:
- ${GRAFANA_DOMAIN}
- ${COLLECTOR_DOMAIN}
<<: *logging
<<: [*logging, *labels]

infra_host:
restart: unless-stopped
Expand Down Expand Up @@ -198,7 +202,7 @@ services:
NRIA_SELF_INSTRUMENTATION: newrelic
NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
NEW_RELIC_APP_NAME: '[GMonit] Infrastructure Agent'
<<: *logging
<<: [*logging, *labels]

infra_services:
restart: unless-stopped
Expand All @@ -220,4 +224,4 @@ services:
NEW_RELIC_APP_NAME: '[GMonit] Infrastructure Agent'

POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
<<: *logging
<<: [*logging, *labels]
22 changes: 14 additions & 8 deletions examples/pilot/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ x-loggin: &logging
max-size: 100m
max-file: 5

x-labels: &labels
labels:
environment: "gmonit"

services:
clickhouse:
restart: unless-stopped
Expand All @@ -20,7 +24,7 @@ services:
volumes:
- ./clickhouse/gmonit.xml:/etc/clickhouse-server/config.d/gmonit.xml
- ./clickhouse/gmonit_system_tables_conf.xml:/etc/clickhouse-server/config.d/gmonit_system_tables_conf.xml
<<: *logging
<<: [*logging, *labels]

postgres:
restart: unless-stopped
Expand All @@ -32,7 +36,7 @@ services:
interval: 10s
timeout: 5s
retries: 10
<<: *logging
<<: [*logging, *labels]

redis:
restart: unless-stopped
Expand All @@ -42,7 +46,7 @@ services:
interval: 10s
timeout: 5s
retries: 10
<<: *logging
<<: [*logging, *labels]

grafana:
restart: unless-stopped
Expand Down Expand Up @@ -88,7 +92,7 @@ services:
condition: service_healthy
volumes:
- ./ssl:/gmonit/ssl
<<: *logging
<<: [*logging, *labels]

collector:
env_file:
Expand Down Expand Up @@ -139,7 +143,7 @@ services:
volumes:
- ./ssl:/gmonit/ssl
- ./geoip.mmdb:/gmonit/geoip.mmdb
<<: *logging
<<: [*logging, *labels]

nginx:
restart: unless-stopped
Expand All @@ -164,7 +168,7 @@ services:
aliases:
- ${GRAFANA_DOMAIN}
- ${COLLECTOR_DOMAIN}
<<: *logging
<<: [*logging, *labels]

infra_host:
restart: unless-stopped
Expand Down Expand Up @@ -198,7 +202,8 @@ services:
# не работает на самоподписанных сертификатах
# NRIA_SELF_INSTRUMENTATION: newrelic
# NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
<<: *logging
# NEW_RELIC_LABELS: "environment:gmonit"
<<: [*logging, *labels]

infra_services:
restart: unless-stopped
Expand All @@ -219,4 +224,5 @@ services:
# не работает на самоподписанных сертификатах
# NRIA_SELF_INSTRUMENTATION: newrelic
# NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
<<: *logging
# NEW_RELIC_LABELS: "environment:gmonit"
<<: [*logging, *labels]