From 7d59781075a3250219ce5f1e0faefa6c75b06010 Mon Sep 17 00:00:00 2001
From: Andreas Hamacher <andreas.hamacher@monash.edu>
Date: Thu, 2 Jun 2022 14:12:27 +1000
Subject: [PATCH] fixing slurmstats after changing slurm version
---
roles/telegraf/files/telegraf_slurmstats.py | 2 +-
roles/telegraf/tasks/main.yml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/roles/telegraf/files/telegraf_slurmstats.py b/roles/telegraf/files/telegraf_slurmstats.py
index 2f57b3ad..7fdf895c 100644
--- a/roles/telegraf/files/telegraf_slurmstats.py
+++ b/roles/telegraf/files/telegraf_slurmstats.py
@@ -15,7 +15,7 @@ def print_stats(stats):
def get_stats():
import subprocess
- p = subprocess.Popen(['/opt/slurm-20.02.7/bin/sdiag'],stdout = subprocess.PIPE,stderr=subprocess.PIPE)
+ p = subprocess.Popen(['/opt/slurm-latest/bin/sdiag'],stdout = subprocess.PIPE,stderr=subprocess.PIPE)
(stdout,stderr) = p.communicate()
for l in stdout.decode().splitlines():
if "Total backfilled jobs (since last stats cycle start):" in l:
diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml
index 39bce939..76fb8559 100644
--- a/roles/telegraf/tasks/main.yml
+++ b/roles/telegraf/tasks/main.yml
@@ -57,6 +57,11 @@
become: true
become_user: root
+- name: check if slurm is on the system
+ stat:
+ path: '/opt/slurm-latest/bin/sdiag'
+ register: checkslurmexists
+
- name: copy slurmstats plugin
copy:
mode: 'u=rwx,g=rx,o=rx'
@@ -64,6 +69,7 @@
dest: '/opt/telegraf/bin/telegraf_slurmstats.py'
become: true
become_user: root
+ when: checkslurmexists.stat.exists
- name: copy softnet_stat script
copy:
--
GitLab