Fix for prometheus scraping of cAdvisor metrics (#957)

loujar · jdpleiness · web-flow · commit fb6dc7eb0c14 · 2023-11-20T06:33:34.000-10:00
* exposing cadvisor metrics on port 48080 for prometheus scraping

* update comment

---------

Co-authored-by: Jacob Pleiness &lt;jdpleiness@users.noreply.github.com&gt;
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -486,7 +486,7 @@ services:
   # Description: Publishes Prometheus metrics about Docker containers.
   #
   # Disk: none
-  # Ports exposed to other Sourcegraph services: 8080/TCP
+  # Ports exposed to other Sourcegraph services: 48080/TCP
   # Ports exposed to the public internet: none
   #
   cadvisor:
@@ -513,8 +513,8 @@ services:
     networks:
       - sourcegraph
     restart: always
-    command:
-      - --port=8080
+    expose:
+      - 48080
 
   # Description: Publishes Prometheus metrics about the machine's hardware / operating system.
   #
diff --git a/prometheus/prometheus_targets.yml b/prometheus/prometheus_targets.yml
@@ -3,7 +3,7 @@
     nodename: "sourcegraph-docker-compose-host"
     job: node
   targets:
-    - cadvisor:8080
+    - cadvisor:48080
     - sourcegraph-frontend-internal:6060
 - labels:
     nodename: "sourcegraph-docker-compose-host"

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ services:`
`486`	`486`	`# Description: Publishes Prometheus metrics about Docker containers.`
`487`	`487`	`#`
`488`	`488`	`# Disk: none`
`489`		`- # Ports exposed to other Sourcegraph services: 8080/TCP`
	`489`	`+ # Ports exposed to other Sourcegraph services: 48080/TCP`
`490`	`490`	`# Ports exposed to the public internet: none`
`491`	`491`	`#`
`492`	`492`	`cadvisor:`
`@@ -513,8 +513,8 @@ services:`
`513`	`513`	`networks:`
`514`	`514`	`- sourcegraph`
`515`	`515`	`restart: always`
`516`		`- command:`
`517`		`- - --port=8080`
	`516`	`+ expose:`
	`517`	`+ - 48080`
`518`	`518`
`519`	`519`	`# Description: Publishes Prometheus metrics about the machine's hardware / operating system.`
`520`	`520`	`#`