From d71c85e052236c360de0a8ba2951e49e0d363bc8 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Wed, 20 Nov 2024 00:28:27 +0800 Subject: [PATCH] misc: finalized config files --- docker-compose.dev.observable.yml | 201 --------------------------- docker-compose.dev.yml | 16 ++- prometheus.yml => prometheus.dev.yml | 0 3 files changed, 15 insertions(+), 202 deletions(-) delete mode 100644 docker-compose.dev.observable.yml rename prometheus.yml => prometheus.dev.yml (100%) diff --git a/docker-compose.dev.observable.yml b/docker-compose.dev.observable.yml deleted file mode 100644 index f2ddf29b17..0000000000 --- a/docker-compose.dev.observable.yml +++ /dev/null @@ -1,201 +0,0 @@ -version: "3.9" - -services: - nginx: - container_name: infisical-dev-nginx - image: nginx - restart: always - ports: - - 8080:80 - volumes: - - ./nginx/default.dev.conf:/etc/nginx/conf.d/default.conf:ro - depends_on: - - backend - - frontend - - db: - image: postgres:14-alpine - ports: - - "5432:5432" - volumes: - - postgres-data:/var/lib/postgresql/data - environment: - POSTGRES_PASSWORD: infisical - POSTGRES_USER: infisical - POSTGRES_DB: infisical - - redis: - image: redis - container_name: infisical-dev-redis - environment: - - ALLOW_EMPTY_PASSWORD=yes - ports: - - 6379:6379 - volumes: - - redis_data:/data - - redis-commander: - container_name: infisical-dev-redis-commander - image: rediscommander/redis-commander - restart: always - depends_on: - - redis - environment: - - REDIS_HOSTS=local:redis:6379 - ports: - - "8085:8081" - - db-test: - profiles: ["test"] - image: postgres:14-alpine - ports: - - "5430:5432" - environment: - POSTGRES_PASSWORD: infisical - POSTGRES_USER: infisical - POSTGRES_DB: infisical-test - - db-migration: - container_name: infisical-db-migration - depends_on: - - db - build: - context: ./backend - dockerfile: Dockerfile.dev - env_file: .env - environment: - - DB_CONNECTION_URI=postgres://infisical:infisical@db/infisical?sslmode=disable - command: npm run migration:latest - volumes: - - ./backend/src:/app/src - - backend: - container_name: infisical-dev-api - build: - context: ./backend - dockerfile: Dockerfile.dev - depends_on: - db: - condition: service_started - redis: - condition: service_started - db-migration: - condition: service_completed_successfully - env_file: - - .env - ports: - - 4000:4000 - - 9464:9464 # for OTEL collection of Prometheus metrics - environment: - - NODE_ENV=development - - DB_CONNECTION_URI=postgres://infisical:infisical@db/infisical?sslmode=disable - - TELEMETRY_ENABLED=false - volumes: - - ./backend/src:/app/src - extra_hosts: - - "host.docker.internal:host-gateway" - - frontend: - container_name: infisical-dev-frontend - restart: unless-stopped - depends_on: - - backend - build: - context: ./frontend - dockerfile: Dockerfile.dev - volumes: - - ./frontend/src:/app/src/ # mounted whole src to avoid missing reload on new files - - ./frontend/public:/app/public - env_file: .env - environment: - - NEXT_PUBLIC_ENV=development - - INFISICAL_TELEMETRY_ENABLED=false - - pgadmin: - image: dpage/pgadmin4 - restart: always - environment: - PGADMIN_DEFAULT_EMAIL: admin@example.com - PGADMIN_DEFAULT_PASSWORD: pass - ports: - - 5050:80 - depends_on: - - db - - smtp-server: - container_name: infisical-dev-smtp-server - image: lytrax/mailhog:latest # https://github.com/mailhog/MailHog/issues/353#issuecomment-821137362 - restart: always - logging: - driver: "none" # disable saving logs - ports: - - 1025:1025 # SMTP server - - 8025:8025 # Web UI - - openldap: # note: more advanced configuration is available - image: osixia/openldap:1.5.0 - restart: always - environment: - LDAP_ORGANISATION: Acme - LDAP_DOMAIN: acme.com - LDAP_ADMIN_PASSWORD: admin - ports: - - 389:389 - - 636:636 - volumes: - - ldap_data:/var/lib/ldap - - ldap_config:/etc/ldap/slapd.d - profiles: [ldap] - - phpldapadmin: # username: cn=admin,dc=acme,dc=com, pass is admin - image: osixia/phpldapadmin:latest - restart: always - environment: - - PHPLDAPADMIN_LDAP_HOSTS=openldap - - PHPLDAPADMIN_HTTPS=false - ports: - - 6433:80 - depends_on: - - openldap - profiles: [ldap] - - otel-collector: - image: otel/opentelemetry-collector-contrib - volumes: - - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml - ports: - - 1888:1888 # pprof extension - - 8888:8888 # Prometheus metrics exposed by the Collector - - 8889:8889 # Prometheus exporter metrics - - 13133:13133 # health_check extension - - 4317:4317 # OTLP gRPC receiver - - 4318:4318 # OTLP http receiver - - 55679:55679 # zpages extension - - prometheus: - image: prom/prometheus - volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml - ports: - - "9090:9090" - command: - - "--config.file=/etc/prometheus/prometheus.yml" - - grafana: - image: grafana/grafana - container_name: grafana - restart: unless-stopped - environment: - - GF_LOG_LEVEL=debug - ports: - - "3000:3000" - volumes: - - "grafana_storage:/var/lib/grafana" -volumes: - postgres-data: - driver: local - redis_data: - driver: local - ldap_data: - ldap_config: - grafana_storage: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3deb20d416..9e1c220d4f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -99,13 +99,27 @@ services: prometheus: image: prom/prometheus volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml + - ./prometheus.dev.yml:/etc/prometheus/prometheus.yml ports: - "9090:9090" command: - "--config.file=/etc/prometheus/prometheus.yml" profiles: [metrics] + otel-collector: + image: otel/opentelemetry-collector-contrib + volumes: + - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml + ports: + - 1888:1888 # pprof extension + - 8888:8888 # Prometheus metrics exposed by the Collector + - 8889:8889 # Prometheus exporter metrics + - 13133:13133 # health_check extension + - 4317:4317 # OTLP gRPC receiver + - 4318:4318 # OTLP http receiver + - 55679:55679 # zpages extension + profiles: [metrics-otel] + grafana: image: grafana/grafana container_name: grafana diff --git a/prometheus.yml b/prometheus.dev.yml similarity index 100% rename from prometheus.yml rename to prometheus.dev.yml