Single infra agent (#91)

Author: darkleaf

examples/pilot/compose.yaml

@@ -32,6 +32,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
+    ports:
+      - 127.0.0.1:5432:5432
     <<: *logging
 
   redis:
@@ -42,6 +44,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
+    ports:
+      - 127.0.0.1:6379:6379
     <<: *logging
 
   grafana:
@@ -153,6 +157,7 @@ services:
     ports:
       - 80:80
       - 443:443
+      - 127.0.0.1:8080:8080
     environment:
       GRAFANA_DOMAIN: ${GRAFANA_DOMAIN}
       COLLECTOR_DOMAIN: ${COLLECTOR_DOMAIN}
@@ -167,7 +172,7 @@ services:
           - ${COLLECTOR_DOMAIN}
     <<: *logging
 
-  infra_host:
+  infra:
     restart: unless-stopped
     container_name: newrelic-infra
     image: newrelic/infrastructure-bundle:latest
@@ -184,40 +189,24 @@ services:
     volumes:
       - "/:/host:ro"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - ./infra_host:/etc/newrelic-infra/integrations.d
+      - ./infra:/etc/newrelic-infra/integrations.d
       - ./ssl:/gmonit/ssl
     environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+
       # NRIA_LOG_LEVEL: debug
+
       NRIA_ENABLE_PROCESS_METRICS: 'true'
 
       NRIA_LICENSE_KEY: "0123456789012345678901234567890123456789"
-      NRIA_COLLECTOR_URL: https://${COLLECTOR_DOMAIN}/infra/infra-api
-      NRIA_COMMAND_CHANNEL_URL: https://${COLLECTOR_DOMAIN}/infra/command-api
-      NRIA_IDENTITY_URL: https://${COLLECTOR_DOMAIN}/infra/identity-api
+      NRIA_COLLECTOR_URL:       https://${COLLECTOR_DOMAIN}/infra2/infra-api
+      NRIA_COMMAND_CHANNEL_URL: https://${COLLECTOR_DOMAIN}/infra2/command-api
+      NRIA_IDENTITY_URL:        https://${COLLECTOR_DOMAIN}/infra2/identity-api
       NRIA_CA_BUNDLE_FILE: ${CA_FILE}
 
-      # не работает на самоподписанных сертификатах
-      # NRIA_SELF_INSTRUMENTATION: newrelic
-      # NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
-    <<: *logging
-
-  infra_services:
-    restart: unless-stopped
-    image: newrelic/infrastructure-bundle:latest
-    volumes:
-      - ./infra_services:/etc/newrelic-infra/integrations.d
-      - ./ssl:/gmonit/ssl
-    environment:
-      # NRIA_LOG_LEVEL: debug
-      NRIA_IS_FORWARD_ONLY: 'true'
-
-      NRIA_LICENSE_KEY: "0123456789012345678901234567890123456789"
-      NRIA_COLLECTOR_URL: https://${COLLECTOR_DOMAIN}/infra/infra-api
-      NRIA_COMMAND_CHANNEL_URL: https://${COLLECTOR_DOMAIN}/infra/command-api
-      NRIA_IDENTITY_URL: https://${COLLECTOR_DOMAIN}/infra/identity-api
-      NRIA_CA_BUNDLE_FILE: ${CA_FILE}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      # не работает на самоподписанных сертификатах
-      # NRIA_SELF_INSTRUMENTATION: newrelic
-      # NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
+      NEW_RELIC_APP_NAME: '[GMonit] Infrastructure Agent'
+      NEW_RELIC_LABELS: "environment:gmonit"
+      NRIA_SELF_INSTRUMENTATION: newrelic
+      NRIA_SELF_INSTRUMENTATION_APM_HOST: ${COLLECTOR_DOMAIN}
+      SSL_CERT_FILE: ${CA_FILE}
     <<: *logging

…mples/pilot/infra_host/docker-config.yml examples/pilot/infra/docker-config.ymlexamples/pilot/infra_host/docker-config.yml renamed to examples/pilot/infra/docker-config.yml examples/pilot/infra_host/docker-config.yml renamed to examples/pilot/infra/docker-config.yml

@@ -3,7 +3,7 @@ integrations:
   env:
     METRICS: "true"
     # If you're using ngx_http_api_module be certain to use the full path up to and including the version number
-    STATUS_URL: http://nginx:8080/status
+    STATUS_URL: http://localhost:8080/status
     # Name of Nginx status module OHI is to query against. discover | ngx_http_stub_status_module | ngx_http_status_module | ngx_http_api_module
     STATUS_MODULE: discover
 

…amples/pilot/infra_host/nginx-config.yml examples/pilot/infra/nginx-config.ymlexamples/pilot/infra_host/nginx-config.yml renamed to examples/pilot/infra/nginx-config.yml examples/pilot/infra_host/nginx-config.yml renamed to examples/pilot/infra/nginx-config.yml

@@ -7,7 +7,7 @@ integrations:
     PASSWORD: {{POSTGRES_PASSWORD}}
 
     # The hostname for the postgres instance. Defaults to localhost.
-    HOSTNAME: postgres
+    HOSTNAME: localhost
 
     # The database to connect to on the postgres instance. Defaults to postgres.
     DATABASE: postgres

…lot/infra_services/postgresql-config.yml …amples/pilot/infra/postgresql-config.ymlexamples/pilot/infra_services/postgresql-config.yml renamed to examples/pilot/infra/postgresql-config.yml examples/pilot/infra_services/postgresql-config.yml renamed to examples/pilot/infra/postgresql-config.yml

@@ -2,7 +2,7 @@ integrations:
   - name: nri-redis
     env:
       METRICS: true
-      HOSTNAME: redis
+      HOSTNAME: localhost
       PORT: 6379
       # KEYS: '{"0":["<KEY_1>"],"1":["<KEY_2>"]}'
 
@@ -48,7 +48,7 @@ integrations:
   - name: nri-redis
     env:
       INVENTORY: true
-      HOSTNAME: redis
+      HOSTNAME: localhost
       PORT: 6379
 
       # New users should leave this property as `true`, to identify the