diff --git a/insights/specs/default.py b/insights/specs/default.py index dc7909cbfb..e091606b2b 100644 --- a/insights/specs/default.py +++ b/insights/specs/default.py @@ -181,7 +181,7 @@ def is_ceph_monitor(broker): ceph_osd_tree = simple_command("/usr/bin/ceph osd tree -f json") ceph_s = simple_command("/usr/bin/ceph -s -f json") ceph_v = simple_command("/usr/bin/ceph -v") - certificates_enddate = simple_command("/usr/bin/find /etc/origin/node /etc/origin/master /etc/pki -type f -exec /usr/bin/openssl x509 -noout -enddate -in '{}' \; -exec echo 'FileName= {}' \;") + certificates_enddate = simple_command("/usr/bin/find /etc/origin/node /etc/origin/master /etc/pki /etc/ipa -type f -exec /usr/bin/openssl x509 -noout -enddate -in '{}' \; -exec echo 'FileName= {}' \;") chkconfig = simple_command("/sbin/chkconfig --list") chrony_conf = simple_file("/etc/chrony.conf") chronyc_sources = simple_command("/usr/bin/chronyc sources") diff --git a/insights/specs/insights_archive.py b/insights/specs/insights_archive.py index 5cb5bb809d..64e25782d2 100644 --- a/insights/specs/insights_archive.py +++ b/insights/specs/insights_archive.py @@ -29,7 +29,7 @@ class InsightsArchiveSpecs(Specs): ceph_osd_tree = first_file(["insights_commands/ceph_osd_tree_-f_json-pretty", "insights_commands/ceph_osd_tree_-f_json"]) ceph_s = first_file(["insights_commands/ceph_-s_-f_json-pretty", "insights_commands/ceph_-s_-f_json"]) ceph_v = simple_file("insights_commands/ceph_-v") - certificates_enddate = simple_file("insights_commands/find_.etc.origin.node_.etc.origin.master_.etc.pki_-type_f_-exec_.usr.bin.openssl_x509_-noout_-enddate_-in_-exec_echo_FileName") + certificates_enddate = first_file(["insights_commands/find_.etc.origin.node_.etc.origin.master_.etc.pki_.etc.ipa_-type_f_-exec_.usr.bin.openssl_x509_-noout_-enddate_-in_-exec_echo_FileName", "insights_commands/find_.etc.origin.node_.etc.origin.master_.etc.pki_-type_f_-exec_.usr.bin.openssl_x509_-noout_-enddate_-in_-exec_echo_FileName"]) chkconfig = simple_file("insights_commands/chkconfig_--list") chronyc_sources = simple_file("insights_commands/chronyc_sources") cpupower_frequency_info = simple_file("insights_commands/cpupower_-c_all_frequency-info")