fixing bug and adding prometheus slurm exporter

naps-product-sa · Oct 30, 2023 · 9fb81cd · 9fb81cd
1 parent aadc1a3
commit 9fb81cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -30,5 +30,5 @@ jobs:
 
     - name: Build image - login
       run: |
-        docker build slurm/images/login --tag ghcr.io/${{ github.repository }}:login-latest
+        docker build slurm/images/login --tag ghcr.io/${{ github.repository }}/login:latest
         docker push ghcr.io/${{ github.repository }}/login:latest
diff --git a/slurm/images/slurm/Dockerfile b/slurm/images/slurm/Dockerfile
@@ -24,6 +24,14 @@ RUN curl -LO https://download.schedmd.com/slurm/slurm-${SLURM_VERSION}.tar.bz2 &
     make && \
     make install
 
+FROM docker.io/golang:1.21 as build-exporter
+
+WORKDIR /usr/src/app
+
+RUN git clone https://github.com/vpenso/prometheus-slurm-exporter.git && \
+    cd prometheus-slurm-exporter && \
+    make
+
 FROM scratch as tmp
 
 # libjwt
@@ -39,6 +47,9 @@ COPY --from=build /usr/bin/s* /usr/bin/
 COPY --from=build /usr/sbin/slurm* /usr/sbin/
 COPY --from=build /usr/share/man/ /usr/share/man/
 
+#prometheus 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
 
 COPY --from=tmp / /