Merge pull request #5035 from winem/fix-linux-pack-actions

Fix linux pack actions For CentOS 8

CHANGELOG.rst

@@ -167,6 +167,10 @@ Fixed
 
 * Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487
 
+* Fix actions from the contrib/linux pack that fail on CentOS-8 but work on other operating systems and distributions. (bug fix) #4999 #5004
+
+  Reported by @blag and @dove-young contributed by @winem.
+
 * Use byte type lock name which is supported by all tooz drivers. #5529
 
   Contributed by @khushboobhatia01

contrib/linux/README.md

@@ -55,4 +55,5 @@ Example trigger payload:
 
 ## Troubleshooting
 
-* On CentOS7/RHEL7, dig is not installed by default. Run ``sudo yum install bind-utils`` to install.
+* On CentOS7/RHEL7, dig is not installed by default. Run ``sudo yum install bind-utils`` to install.
+* On CentOS8/RHEL8, lsof is not installed by default. Run ``sudo yum install lsof`` to install.

contrib/linux/actions/checks/check_loadavg.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/opt/stackstorm/st2/bin/python
 
 # Copyright 2020 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.

contrib/linux/actions/checks/check_processes.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/opt/stackstorm/st2/bin/python
 
 # Copyright 2020 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.

contrib/linux/actions/service.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/opt/stackstorm/st2/bin/python
 
 # Copyright 2020 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.

contrib/linux/actions/workflows/diag_loadavg.yaml

@@ -7,7 +7,6 @@
         hosts: "{{hostname}}"
         period: "all"
       on-success: "d_state_processes"
-      on-failure: "email_escalation"
     -
       name: "d_state_processes"
       ref: "linux.check_processes"
@@ -17,7 +16,6 @@
         criteria: "D"
         args: "pidlist"
       on-success: "r_state_processes"
-      on-failure: "email_escalation"
     -
       name: "r_state_processes"
       ref: "linux.check_processes"
@@ -27,15 +25,13 @@
         criteria: "R"
         args: "pidlist"
       on-success: "netstat"
-      on-failure: "email_escalation"
     -
       name: "netstat"
       ref: "linux.netstat_grep"
       parameters:
         hosts: "{{hostname}}"
         pids: "{{d_state_processes[hostname].stderr}} {{r_state_processes[hostname].stderr}}"
       on-success: "lsof"
-      on-failure: "email_escalation"
     -
       name: "lsof"
       ref: "linux.lsof_pids"
@@ -47,5 +43,13 @@
       name: "dump_results"
       ref: "core.local"
       parameters:
-        cmd: "echo \"ST2 Workflow\tdiag_loadavg:\t{{__results}}\" >> /tmp/diag_loadavg && echo 'Output written to file /tmp/diag_loadavg'"
+        cmd: >
+          echo "{{__results}}"
+          | python3 -c
+          'import ast, datetime, json, sys;
+          diag_data=ast.literal_eval(sys.stdin.read());
+          diag_data["timestamp"] = str(datetime.datetime.now());
+          print(json.dumps(diag_data))'
+          >> /tmp/diag_loadavg.json
+          && echo 'Output written to file /tmp/diag_loadavg.json'
   default: "check_load"

contrib/linux/pack.yaml

@@ -16,7 +16,7 @@ keywords:
   - open ports
   - processes
   - ps
-version : 1.0.2
+version : 1.1.0
 python_versions:
   - "2"
   - "3"