diff --git a/examples/lite/compose.yaml b/examples/lite/compose.yaml index 7c22086..2d66613 100644 --- a/examples/lite/compose.yaml +++ b/examples/lite/compose.yaml @@ -5,12 +5,16 @@ x-loggin: &logging max-size: 100m max-file: 5 +x-labels: &labels + labels: + environment: "gmonit" + volumes: grafana_data: services: clickhouse: - <<: *logging + <<: [*logging, *labels] restart: unless-stopped image: clickhouse/clickhouse-server:25.3 pull_policy: always @@ -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 @@ -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 @@ -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 diff --git a/examples/pilot-letsencrypt/compose.yaml b/examples/pilot-letsencrypt/compose.yaml index 8e38894..49a94d6 100644 --- a/examples/pilot-letsencrypt/compose.yaml +++ b/examples/pilot-letsencrypt/compose.yaml @@ -5,6 +5,10 @@ x-loggin: &logging max-size: 100m max-file: 5 +x-labels: &labels + labels: + environment: "gmonit" + services: clickhouse: restart: unless-stopped @@ -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 @@ -32,7 +36,7 @@ services: interval: 10s timeout: 5s retries: 10 - <<: *logging + <<: [*logging, *labels] redis: restart: unless-stopped @@ -42,7 +46,7 @@ services: interval: 10s timeout: 5s retries: 10 - <<: *logging + <<: [*logging, *labels] grafana: restart: unless-stopped @@ -93,7 +97,7 @@ services: condition: service_healthy volumes: - ./ssl:/gmonit/ssl - <<: *logging + <<: [*logging, *labels] collector: env_file: @@ -140,7 +144,7 @@ services: volumes: - ./ssl:/gmonit/ssl - ./***.mmdb:/gmonit/geoip.mmdb - <<: *logging + <<: [*logging, *labels] nginx: restart: unless-stopped @@ -165,7 +169,7 @@ services: aliases: - ${GRAFANA_DOMAIN} - ${COLLECTOR_DOMAIN} - <<: *logging + <<: [*logging, *labels] infra_host: restart: unless-stopped @@ -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 @@ -220,4 +224,4 @@ services: NEW_RELIC_APP_NAME: '[GMonit] Infrastructure Agent' POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - <<: *logging + <<: [*logging, *labels] diff --git a/examples/pilot/compose.yaml b/examples/pilot/compose.yaml index b27d8d9..27abc9e 100644 --- a/examples/pilot/compose.yaml +++ b/examples/pilot/compose.yaml @@ -5,6 +5,10 @@ x-loggin: &logging max-size: 100m max-file: 5 +x-labels: &labels + labels: + environment: "gmonit" + services: clickhouse: restart: unless-stopped @@ -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 @@ -32,7 +36,7 @@ services: interval: 10s timeout: 5s retries: 10 - <<: *logging + <<: [*logging, *labels] redis: restart: unless-stopped @@ -42,7 +46,7 @@ services: interval: 10s timeout: 5s retries: 10 - <<: *logging + <<: [*logging, *labels] grafana: restart: unless-stopped @@ -88,7 +92,7 @@ services: condition: service_healthy volumes: - ./ssl:/gmonit/ssl - <<: *logging + <<: [*logging, *labels] collector: env_file: @@ -139,7 +143,7 @@ services: volumes: - ./ssl:/gmonit/ssl - ./geoip.mmdb:/gmonit/geoip.mmdb - <<: *logging + <<: [*logging, *labels] nginx: restart: unless-stopped @@ -164,7 +168,7 @@ services: aliases: - ${GRAFANA_DOMAIN} - ${COLLECTOR_DOMAIN} - <<: *logging + <<: [*logging, *labels] infra_host: restart: unless-stopped @@ -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 @@ -219,4 +224,5 @@ services: # не работает на самоподписанных сертификатах # NRIA_SELF_INSTRUMENTATION: newrelic # NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN} - <<: *logging + # NEW_RELIC_LABELS: "environment:gmonit" + <<: [*logging, *labels]