Revert "Change to newer prom slurm exporter"

This reverts commit e723d66.
naps-product-sa · Nov 8, 2023 · e6a5fc0 · e6a5fc0
1 parent e723d66
commit e6a5fc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/slurm/images/slurm/Dockerfile b/slurm/images/slurm/Dockerfile
@@ -26,7 +26,10 @@ RUN curl -LO https://download.schedmd.com/slurm/slurm-${SLURM_VERSION}.tar.bz2 &
 
 FROM docker.io/golang:1.21 as build-exporter
 
-RUN go install github.com/rivosinc/[email protected]
+WORKDIR /usr/src/app
+
+RUN git clone https://github.com/vpenso/prometheus-slurm-exporter.git /usr/src/app && \
+    make bin/prometheus-slurm-exporter
 
 FROM scratch as tmp
 
@@ -44,7 +47,7 @@ COPY --from=build /usr/sbin/slurm* /usr/sbin/
 COPY --from=build /usr/share/man/ /usr/share/man/
 
 #prometheus exporter
-COPY --from=build-exporter /go/bin/prometheus-slurm-exporter /usr/bin/prometheus-slurm-exporter
+COPY --from=build-exporter /usr/src/app/bin/prometheus-slurm-exporter /usr/bin/prometheus-slurm-exporter
 
 FROM ghcr.io/naps-product-sa/openshift-batch/munge:latest
 

diff --git a/slurm/manifests/service.yaml b/slurm/manifests/service.yaml
@@ -8,7 +8,7 @@ spec:
   ports:
   - port: 6817
     name: slurmctld
-  - port: 9092
+  - port: 8080
     name: scrape
   selector:
     app: slurm