diff options
Diffstat (limited to 'docker-compose')
| -rw-r--r-- | docker-compose/config/nginx/nginx.conf | 4 | ||||
| -rw-r--r-- | docker-compose/config/prometheus.yml | 16 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yml | 6 |
3 files changed, 12 insertions, 14 deletions
diff --git a/docker-compose/config/nginx/nginx.conf b/docker-compose/config/nginx/nginx.conf index 7d6b997f77..6e9d102fed 100644 --- a/docker-compose/config/nginx/nginx.conf +++ b/docker-compose/config/nginx/nginx.conf @@ -21,9 +21,7 @@ http { # Add more server entries here for scaling or load balancing upstream cps-and-ncmp { least_conn; - server docker-compose-cps-and-ncmp-1:8080; - ### DEBUG: Disable next line for easier debugging on 1 instance (see also docker-compose.yml) - server docker-compose-cps-and-ncmp-2:8080; + server cps-and-ncmp:8080; } server { diff --git a/docker-compose/config/prometheus.yml b/docker-compose/config/prometheus.yml index 89af4a6800..e1aa4763d9 100644 --- a/docker-compose/config/prometheus.yml +++ b/docker-compose/config/prometheus.yml @@ -3,10 +3,12 @@ global: evaluation_interval: 5s scrape_configs: - - job_name: 'cps-and-ncmp' - metrics_path: '/actuator/prometheus' - scrape_interval: 5s - static_configs: - - targets: - - 'docker-compose-cps-and-ncmp-1:8080' - - 'docker-compose-cps-and-ncmp-2:8080' +- job_name: 'cps-and-ncmp' + metrics_path: '/actuator/prometheus' + scrape_interval: 5s + static_configs: + # If you want to inject Prometheus into particular containers, the targets should be provided similar to the following examples: + # - 'docker-compose-cps-and-ncmp-1:8080' + # - 'docker-compose-cps-and-ncmp-2:8080' + - targets: + - 'cps-and-ncmp:8080'
\ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index fd1df38147..e7703d8d68 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -62,6 +62,7 @@ services: ONAP_OTEL_EXPORTER_ENDPOINT: http://jaeger-service:4317 POLICY_SERVICE_ENABLED: 'false' POLICY_SERVICE_DEFAULT_DECISION: 'deny from env' + JAVA_TOOL_OPTIONS: "-XX:InitialRAMPercentage=75.0 -XX:MaxRAMPercentage=75.0" ### DEBUG: Uncomment next line to enable java debugging ### DEBUG: JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 restart: unless-stopped @@ -71,12 +72,9 @@ services: ### DEBUG: For easier debugging use just 1 instance (also update docker-compose/config/nginx/nginx.conf !) replicas: 2 resources: - reservations: - cpus: '2' - memory: 2G limits: cpus: '3' - memory: 3G + memory: 2G ### DEBUG: Uncomment next 2 lines to enable java debugging (ensure 'ports' aligns with 'deploy') ### DEBUG ports: ### DEBUG - ${CPS_CORE_DEBUG_PORT:-5005}:5005 |