resolve merge

roles/telegraf/files/telegraf_softnet_stats.awk

+#! /usr/bin/awk -f
+
+{
+    printf("softnet,host=%s,cpu=%d sd_processed=%di,sd_dropped=%di,sd_time_squeeze=%di\n",
+        hostname,
+        NR-1,
+        strtonum("0x"$1),
+        strtonum("0x"$2),
+        strtonum("0x"$3)
+    )
+}
\ No newline at end of file

roles/telegraf/tasks/main.yml

@@ -64,7 +64,15 @@
     dest: '/opt/telegraf/bin/telegraf_slurmstats.py'
   become: true
   become_user: root
-#
+
+- name: copy softnet_stat script
+  copy:
+    mode: 'u=rw,g=r,o=r'
+    src: telegraf_softnet_stats.awk
+    dest: '/opt/telegraf/bin/telegraf_softnet_stats.awk'
+  become: true
+  become_user: root
+
 - name: Install Telegraf config
   template:
     src: telegraf.conf.j2

roles/telegraf/templates/telegraf.conf.j2

@@ -157,6 +157,14 @@
   timeout="4s"
   interval="300s"
 
+[[inputs.exec]]
+  commands = [
+    "awk -v hostname=\"$(hostname)\" -f /opt/telegraf/bin/telegraf_softnet_stats.awk /proc/net/softnet_stat"
+  ]
+  data_format = "influx"
+  timeout="4s"
+  interval="600s"
+
 # Both Slurm ManagementNodes will log sdiag stats, but no Compute or Login nodes will
 {% if 'ManagementNodes' in group_names %}
 [[inputs.exec]]