diff --git a/changelog/3.fixed b/changelog/3.fixed new file mode 100644 index 0000000..863731a --- /dev/null +++ b/changelog/3.fixed @@ -0,0 +1 @@ +Fix textfile output to view None result as success diff --git a/src/saltext/prometheus/returners/prometheus_textfile.py b/src/saltext/prometheus/returners/prometheus_textfile.py index bc29b07..63ae8ac 100644 --- a/src/saltext/prometheus/returners/prometheus_textfile.py +++ b/src/saltext/prometheus/returners/prometheus_textfile.py @@ -255,10 +255,10 @@ def returner(ret): for data in ret.get("return", {}).values(): total += 1 duration += data.get("duration", 0) - if data["result"]: - success += 1 - else: + if data["result"] is False: failure += 1 + else: + success += 1 if data.get("changes"): changed += 1 @@ -331,7 +331,7 @@ def returner(ret): if opts["show_failed_states"]: for state_id, state_return in ret["return"].items(): - if not state_return["result"]: + if state_return["result"] is False: key = ( 'salt_failed{state_id="' + state_id.split("_|-")[1] diff --git a/tests/unit/returners/test_prometheus_textfile_return.py b/tests/unit/returners/test_prometheus_textfile_return.py index c838429..21dbf48 100644 --- a/tests/unit/returners/test_prometheus_textfile_return.py +++ b/tests/unit/returners/test_prometheus_textfile_return.py @@ -48,7 +48,7 @@ def job_ret(): "stdout": "applyme", "stderr": "", }, - "result": True, + "result": None, "comment": 'Command "echo applyme" run', "__sls__": "applyme", "__run_num__": 1,