otel: use sourcegraph image, detach config (#839)

sourcegraph · Jul 21, 2022 · 77331bd · 77331bd
1 parent 88b8a8c
commit 77331bd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 57 deletions.
diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml
@@ -13,7 +13,7 @@ services:
   #
   pgsql:
     container_name: pgsql
-    image: 'index.docker.io/sourcegraph/postgres-12-alpine:161449_2022-07-18_e8a013edc325@sha256:cc79c0db11e07e0a5c1dde27c130384bf2f131ce5c51a4d5cba32820ef69fc1a'
+    image: 'index.docker.io/sourcegraph/postgres-12-alpine:162246_2022-07-20_15dd0e0df1cc@sha256:7e6d298ed592e97c7873d687ced2a75e886441bd7d1a9cfd77a2aa5c868b8f09'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
@@ -30,7 +30,7 @@ services:
 
   codeintel-db:
     container_name: codeintel-db
-    image: 'index.docker.io/sourcegraph/codeintel-db:161449_2022-07-18_e8a013edc325@sha256:61a858e02eb368aa7ffd1264c23db6b1ce5fc94d4cff38921633ff17cf860eff'
+    image: 'index.docker.io/sourcegraph/codeintel-db:162246_2022-07-20_15dd0e0df1cc@sha256:202c609e60f79cd4a8ad10ea92f84324caab6f3cdfdfac19c1226e591ce0208a'
     cpus: 4
     mem_limit: '2g'
     healthcheck:

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   migrator:
     container_name: migrator
-    image: 'index.docker.io/sourcegraph/migrator:161449_2022-07-18_e8a013edc325@sha256:5cc21674ecd4914a11aad157cec2f4a94eef8a71157c89295766fcc384e21b34'
+    image: 'index.docker.io/sourcegraph/migrator:162246_2022-07-20_15dd0e0df1cc@sha256:4eac705cc518e4c19d082dd879eba8e9387f41b56ce3bb5145095e05fe30c65c'
     cpus: 0.5
     mem_limit: '500m'
     command:
@@ -125,7 +125,7 @@ services:
   # service.
   sourcegraph-frontend-0:
     container_name: sourcegraph-frontend-0
-    image: 'index.docker.io/sourcegraph/frontend:161449_2022-07-18_e8a013edc325@sha256:0c5d48081d65fd6b95eb0eb66f8fb0a1155c05768e6bdb2193ed281aef4c4b6b'
+    image: 'index.docker.io/sourcegraph/frontend:162246_2022-07-20_15dd0e0df1cc@sha256:39dc522b0ae267b884f7eec73e915c4b4d879a6a9b4ebe5074aa0b02e8b7a5d9'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -168,7 +168,7 @@ services:
   #
   sourcegraph-frontend-internal:
     container_name: sourcegraph-frontend-internal
-    image: 'index.docker.io/sourcegraph/frontend:161449_2022-07-18_e8a013edc325@sha256:0c5d48081d65fd6b95eb0eb66f8fb0a1155c05768e6bdb2193ed281aef4c4b6b'
+    image: 'index.docker.io/sourcegraph/frontend:162246_2022-07-20_15dd0e0df1cc@sha256:39dc522b0ae267b884f7eec73e915c4b4d879a6a9b4ebe5074aa0b02e8b7a5d9'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -215,7 +215,7 @@ services:
   #
   gitserver-0:
     container_name: gitserver-0
-    image: 'index.docker.io/sourcegraph/gitserver:161449_2022-07-18_e8a013edc325@sha256:57b8b7b61d5394e16c81e8d68064a7413ed4815316be23a23990be4ab25ac450'
+    image: 'index.docker.io/sourcegraph/gitserver:162246_2022-07-20_15dd0e0df1cc@sha256:602a834325cf4e9aabb23edd8e99f5a2614d61e773271c22f75d942cbed4e152'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -238,7 +238,7 @@ services:
   #
   zoekt-indexserver-0:
     container_name: zoekt-indexserver-0
-    image: 'index.docker.io/sourcegraph/search-indexer:161449_2022-07-18_e8a013edc325@sha256:39448b944001e012ac405c25aebaec93f17f73a04866cfb25f4fee6fcbf0c621'
+    image: 'index.docker.io/sourcegraph/search-indexer:162246_2022-07-20_15dd0e0df1cc@sha256:f6e2159c7e91aa5219815ee5aa80d86ac9e59626dfba195016e50b913d3dfc03'
     cpus: 8
     mem_limit: '16g'
     environment:
@@ -259,7 +259,7 @@ services:
   #
   zoekt-webserver-0:
     container_name: zoekt-webserver-0
-    image: 'index.docker.io/sourcegraph/indexed-searcher:161449_2022-07-18_e8a013edc325@sha256:ccce9c20c8ad5c3b738801eb79b7339b0ffe6f23d0eefbc5dc3c613525561908'
+    image: 'index.docker.io/sourcegraph/indexed-searcher:162246_2022-07-20_15dd0e0df1cc@sha256:10d35c62a42099875a0286e6aa147c44d0adc63b565260a8e60abfd54497299e'
     cpus: 8
     mem_limit: '50g'
     environment:
@@ -284,7 +284,7 @@ services:
   #
   searcher-0:
     container_name: searcher-0
-    image: 'index.docker.io/sourcegraph/searcher:161449_2022-07-18_e8a013edc325@sha256:ba5a7ca85c07457f4f7e36afe4bd1026db61e8f7b32b69975ab3f48d91252ccc'
+    image: 'index.docker.io/sourcegraph/searcher:162246_2022-07-20_15dd0e0df1cc@sha256:43bfd9ab694950ab9c52c0ade7e739419fbd8e1d08c0c6396700b5aa9deb2ca4'
     cpus: 2
     mem_limit: '2g'
     environment:
@@ -311,7 +311,7 @@ services:
   #
   github-proxy:
     container_name: github-proxy
-    image: 'index.docker.io/sourcegraph/github-proxy:161449_2022-07-18_e8a013edc325@sha256:7eae3165665fda5aed2b68fabea8291a2176c43892bc71a86dfa09904cea6c19'
+    image: 'index.docker.io/sourcegraph/github-proxy:162246_2022-07-20_15dd0e0df1cc@sha256:2eeac5d034792768629a700263661c106e2899dd69d08943a4c4f3b28f7d094b'
     cpus: 1
     mem_limit: '1g'
     environment:
@@ -328,7 +328,7 @@ services:
   #
   precise-code-intel-worker:
     container_name: precise-code-intel-worker
-    image: 'index.docker.io/sourcegraph/precise-code-intel-worker:161449_2022-07-18_e8a013edc325@sha256:5cca4107afdb22a87433d8c424724615bd7ca5751a6fbdaea133da8402210062'
+    image: 'index.docker.io/sourcegraph/precise-code-intel-worker:162246_2022-07-20_15dd0e0df1cc@sha256:79f0998c5b38eede20731dd07c0c61c02544e7dc1357c8875514cf05697d519f'
     cpus: 2
     mem_limit: '4g'
     environment:
@@ -352,7 +352,7 @@ services:
   #
   repo-updater:
     container_name: repo-updater
-    image: 'index.docker.io/sourcegraph/repo-updater:161449_2022-07-18_e8a013edc325@sha256:e636918befb1f115e468e4ed46bd15e4635d8dd8431deeb33dd210c53e5d4ce4'
+    image: 'index.docker.io/sourcegraph/repo-updater:162246_2022-07-20_15dd0e0df1cc@sha256:0fd6fd4ab5354e78fd24650831aacab07b5774e014e624d3325630e27f6362fe'
     cpus: 4
     mem_limit: '4g'
     environment:
@@ -373,7 +373,7 @@ services:
   #
   worker:
     container_name: worker
-    image: 'index.docker.io/sourcegraph/worker:161449_2022-07-18_e8a013edc325@sha256:96e634a7b01930f97ba281a74751965b28f8baff98c38e944d56744924206e0f'
+    image: 'index.docker.io/sourcegraph/worker:162246_2022-07-20_15dd0e0df1cc@sha256:a5b2b3f1be01cb01e5d4d3792d1a8dc166045e9d303028a23d42d627915ac799'
     cpus: 4
     mem_limit: '4g'
     environment:
@@ -398,7 +398,7 @@ services:
   #
   syntect-server:
     container_name: syntect-server
-    image: 'index.docker.io/sourcegraph/syntax-highlighter:161449_2022-07-18_e8a013edc325@sha256:53c60479f575b1c2eca3cf7c5fd2a500c52244ab024e455a82cb2c7c5811a598'
+    image: 'index.docker.io/sourcegraph/syntax-highlighter:162246_2022-07-20_15dd0e0df1cc@sha256:2a8d53b9071fb24d1f065203491be66f9d5af97393001eb621001a5ad707030c'
     cpus: 4
     mem_limit: '6g'
     healthcheck:
@@ -419,7 +419,7 @@ services:
   #
   symbols-0:
     container_name: symbols-0
-    image: 'index.docker.io/sourcegraph/symbols:161449_2022-07-18_e8a013edc325@sha256:c2d9ebd61b1d73b3324f562ffdcd5d6498b81a7037a2b3e45e7e3c73ad903601'
+    image: 'index.docker.io/sourcegraph/symbols:162246_2022-07-20_15dd0e0df1cc@sha256:f226e01f6420e143d76b579160ba94a19e59767d9887d7a52eb67b57dff6573c'
     cpus: 2
     mem_limit: '4g'
     environment:
@@ -445,7 +445,7 @@ services:
   #
   prometheus:
     container_name: prometheus
-    image: 'index.docker.io/sourcegraph/prometheus:161449_2022-07-18_e8a013edc325@sha256:c51292acfacb1f4c2cdc0196f64c7f90d3f7aca506d59c2456b5b4ccf67f53c0'
+    image: 'index.docker.io/sourcegraph/prometheus:162237_2022-07-20_33a8f764c989@sha256:182ec8927d4c362fda8cdf40922eeddf023d2b2b479ba4a012547d1547c1b940'
     cpus: 4
     mem_limit: '8g'
     volumes:
@@ -472,7 +472,7 @@ services:
   # 'GF_SERVER_ROOT_URL='https://grafana.example.com'
   grafana:
     container_name: grafana
-    image: 'index.docker.io/sourcegraph/grafana:161449_2022-07-18_e8a013edc325@sha256:4dbd1b0b3c555aa6738c155a74b2fae4f87008ef99f981ad9d5b647c3ac39662'
+    image: 'index.docker.io/sourcegraph/grafana:162246_2022-07-20_15dd0e0df1cc@sha256:4599fe6c8d41d47321e373dd3e9e1b8187de202243d338b7643e46cd46e1635b'
     cpus: 1
     mem_limit: '1g'
     volumes:
@@ -493,7 +493,7 @@ services:
   #
   cadvisor:
     container_name: cadvisor
-    image: 'index.docker.io/sourcegraph/cadvisor:161449_2022-07-18_e8a013edc325@sha256:d9a60000963ba5258aea6ab818e2d8b36b8baba51624a60bac30810b9e7822dc'
+    image: 'index.docker.io/sourcegraph/cadvisor:162246_2022-07-20_15dd0e0df1cc@sha256:738541f95b4da554d38dedfc2ad90e3db1ebdcc83065967d78fbc6e4b4cd53d4'
     cpus: 1
     mem_limit: '1g'
     # You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
@@ -528,7 +528,7 @@ services:
   #
   jaeger:
     container_name: jaeger
-    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:161449_2022-07-18_e8a013edc325@sha256:4c7c3c0ca278fc3ae27546025441a1a286d4ab0eafb059e9f1d85aa734fc4aae'
+    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:162246_2022-07-20_15dd0e0df1cc@sha256:e4834a45fef5849c08e97a0ee637e3ad06d2a4e63d7d62e5529830185291a234'
     cpus: 0.5
     mem_limit: '512m'
     ports:
@@ -555,7 +555,7 @@ services:
   #
   pgsql:
     container_name: pgsql
-    image: 'index.docker.io/sourcegraph/postgres-12-alpine:161449_2022-07-18_e8a013edc325@sha256:cc79c0db11e07e0a5c1dde27c130384bf2f131ce5c51a4d5cba32820ef69fc1a'
+    image: 'index.docker.io/sourcegraph/postgres-12-alpine:162246_2022-07-20_15dd0e0df1cc@sha256:7e6d298ed592e97c7873d687ced2a75e886441bd7d1a9cfd77a2aa5c868b8f09'
     cpus: 4
     mem_limit: '4g'
     shm_size: '1g'
@@ -583,7 +583,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   pgsql-exporter:
     container_name: pgsql-exporter
-    image: 'index.docker.io/sourcegraph/postgres_exporter:161449_2022-07-18_e8a013edc325@sha256:b7d11ad87f3aa471659f6ad0620f21f5f7be5070dd86f608b08d81a0f67bb9b7'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:162246_2022-07-20_15dd0e0df1cc@sha256:10cf8f8a0e2a649fb487da8fb3b4f1162d14f1ecfc1c9db87a20b1726b98b324'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -602,7 +602,7 @@ services:
   #
   codeintel-db:
     container_name: codeintel-db
-    image: 'index.docker.io/sourcegraph/codeintel-db:161449_2022-07-18_e8a013edc325@sha256:61a858e02eb368aa7ffd1264c23db6b1ce5fc94d4cff38921633ff17cf860eff'
+    image: 'index.docker.io/sourcegraph/codeintel-db:162246_2022-07-20_15dd0e0df1cc@sha256:202c609e60f79cd4a8ad10ea92f84324caab6f3cdfdfac19c1226e591ce0208a'
     cpus: 4
     mem_limit: '4g'
     shm_size: '1g'
@@ -630,7 +630,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   codeintel-db-exporter:
     container_name: codeintel-db-exporter
-    image: 'index.docker.io/sourcegraph/postgres_exporter:161449_2022-07-18_e8a013edc325@sha256:b7d11ad87f3aa471659f6ad0620f21f5f7be5070dd86f608b08d81a0f67bb9b7'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:162246_2022-07-20_15dd0e0df1cc@sha256:10cf8f8a0e2a649fb487da8fb3b4f1162d14f1ecfc1c9db87a20b1726b98b324'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -649,7 +649,7 @@ services:
   #
   codeinsights-db:
     container_name: codeinsights-db
-    image: 'index.docker.io/sourcegraph/codeinsights-db:161449_2022-07-18_e8a013edc325@sha256:f0708e765064e4421f074c9b0b67d194774d534c8f420155e68368acff2aebe9'
+    image: 'index.docker.io/sourcegraph/codeinsights-db:162246_2022-07-20_15dd0e0df1cc@sha256:a2a1cfb28583a02c0dd44f1eeb9d9aafd5b8d70c5efab15c8df232b7f1f290b2'
     cpus: 4
     mem_limit: '2g'
     shm_size: '1g'
@@ -682,7 +682,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   codeinsights-db-exporter:
     container_name: codeinsights-db-exporter
-    image: 'index.docker.io/sourcegraph/postgres_exporter:161449_2022-07-18_e8a013edc325@sha256:b7d11ad87f3aa471659f6ad0620f21f5f7be5070dd86f608b08d81a0f67bb9b7'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:162246_2022-07-20_15dd0e0df1cc@sha256:10cf8f8a0e2a649fb487da8fb3b4f1162d14f1ecfc1c9db87a20b1726b98b324'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -701,7 +701,7 @@ services:
   #
   minio:
     container_name: minio
-    image: 'index.docker.io/sourcegraph/minio:161449_2022-07-18_e8a013edc325@sha256:d5377e0c6e4ed742c551f253591d4a1a7f3a104ca17c51d46d6324206577f209'
+    image: 'index.docker.io/sourcegraph/minio:162246_2022-07-20_15dd0e0df1cc@sha256:d5377e0c6e4ed742c551f253591d4a1a7f3a104ca17c51d46d6324206577f209'
     cpus: 1
     mem_limit: '1g'
     environment:
@@ -728,7 +728,7 @@ services:
   #
   redis-cache:
     container_name: redis-cache
-    image: 'index.docker.io/sourcegraph/redis-cache:161449_2022-07-18_e8a013edc325@sha256:e7f6df111948765d29dac831a65953bb225d87c0adb28754be688775a12129b6'
+    image: 'index.docker.io/sourcegraph/redis-cache:162246_2022-07-20_15dd0e0df1cc@sha256:8038cae39a503457971f3e61e843e0bd2eefff3d6dd1e357755d27842e0e19e0'
     cpus: 1
     mem_limit: '7g'
     volumes:
@@ -744,7 +744,7 @@ services:
   #
   redis-store:
     container_name: redis-store
-    image: 'index.docker.io/sourcegraph/redis-store:161449_2022-07-18_e8a013edc325@sha256:4300a1869b5ffad3591f7e95fd3f9ca2221599d07e04432f57471c3065abf02f'
+    image: 'index.docker.io/sourcegraph/redis-store:162246_2022-07-20_15dd0e0df1cc@sha256:8873c0867b9956244f97cceb2f66063562b00653e30aa9e4b60fd6fb13b52060'
     cpus: 1
     mem_limit: '7g'
     volumes:

diff --git a/docker-compose/otel/docker-compose.yaml b/docker-compose/otel/docker-compose.yaml
@@ -7,17 +7,15 @@ services:
   # Ports exposed to the public internet: none
   otel-collector:
     container_name: otel-collector
-    image: otel/opentelemetry-collector:0.54.0
-    volumes:
-      - '../otel-collector/config.yaml:/etc/otel-collector/config.yaml'
+    image: 'index.docker.io/sourcegraph/opentelemetry-collector:162246_2022-07-20_15dd0e0df1cc@sha256:3d64a9d20a791ba1c5d717ecb64cc19a10b1e30d2aac277143e773c5a9d28c2f'
     cpus: 0.5
     mem_limit: '512m'
     networks:
       - sourcegraph
     restart: always
     environment:
-      - JAEGER_AGENT_HOST=jaeger
-    command: ['--config', '/etc/otel-collector/config.yaml']
+      - JAEGER_HOST=jaeger
+    command: ['--config', '/etc/otel-collector/configs/jaeger.yaml']
 
   # Apply exporter configuration - to learn more, see:
   # https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options

diff --git a/otel-collector/config.yaml b/otel-collector/config.yaml