diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-04-29 14:23:22 +0200 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2022-06-07 15:07:50 +0200 |
| commit | 8abb8ccfafed651b17ed7a1a202eb2655ac16431 (patch) | |
| tree | 8bff64db061a6622c92031c058cef245dbff38ee | |
| parent | a73fe97cea7cd9c42d081cc5ec6c6b36a79eb22e (diff) | |
| download | ironic-python-agent-8abb8ccfafed651b17ed7a1a202eb2655ac16431.tar.gz | |
Collect a full lsblk output in the ramdisk logs
The existing lsblk call is very handy for an overview, but there a lot
more useful pairs to collect. Collect them in a machine-readable format
to be able to use in debugging and further development.
Change-Id: Ib27843524421944ee93de975d275e93276a5597a
(cherry picked from commit 424e649bed3db5d1129b18b7ea4dfba88d552537)
(cherry picked from commit bc74df8bfe89f703880f8a545ce939e9b1cd8651)
(cherry picked from commit c674e567fc3fbf0976b1310763be88ad5a11f7e4)
| -rw-r--r-- | ironic_python_agent/tests/unit/test_utils.py | 8 | ||||
| -rw-r--r-- | ironic_python_agent/utils.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/lsblk-all-956c1df808a169bf.yaml | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py index bfad67f0..48892c07 100644 --- a/ironic_python_agent/tests/unit/test_utils.py +++ b/ironic_python_agent/tests/unit/test_utils.py @@ -442,9 +442,7 @@ class TestUtils(testtools.TestCase): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=[], - io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'df': mock.ANY, 'iptables': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -464,9 +462,7 @@ class TestUtils(testtools.TestCase): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=['/var/log'], - io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'dmesg': mock.ANY, 'df': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) def test_get_ssl_client_options(self): # defaults diff --git a/ironic_python_agent/utils.py b/ironic_python_agent/utils.py index 2fc60ff1..d43de29b 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -69,6 +69,7 @@ COLLECT_LOGS_COMMANDS = { 'ip_addr': ['ip', 'addr'], 'lshw': ['lshw', '-quiet', '-json'], 'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)], + 'lsblk-full': ['lsblk', '--all', '--bytes', '--output-all', '--pairs'], 'mdstat': ['cat', '/proc/mdstat'], } diff --git a/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml b/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml new file mode 100644 index 00000000..d237f834 --- /dev/null +++ b/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + The ramdisk logs now contain an ``lsblk`` output with all pairs in the new + ``lsblk-full`` file. |