diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index dd1246d7cc..4e7734bc0c 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -342,6 +342,7 @@ fi AMP_element_sequence="$AMP_element_sequence rebind-sshd" AMP_element_sequence="$AMP_element_sequence no-resolvconf" AMP_element_sequence="$AMP_element_sequence amphora-agent" +AMP_element_sequence="$AMP_element_sequence sos" if [ "$AMP_ENABLE_FULL_MAC_SECURITY" -ne 1 ]; then # SELinux systems diff --git a/elements/sos/README.rst b/elements/sos/README.rst new file mode 100644 index 0000000000..46e3ef3152 --- /dev/null +++ b/elements/sos/README.rst @@ -0,0 +1,11 @@ +Element to install sosreport. + +sosreport is a tool that collects information about a system. + +The sos plugin for Octavia can gather information of installed packages, log +and configuration files for Octavia controller components and amphora agent. +The result is a generated report that can be used for troubleshooting. The +plugin redacts confidential data such as passwords, certificates and secrets. + +At present sos only installs in Red Hat family images as the plugin does not +support other distributions. diff --git a/elements/sos/element-deps b/elements/sos/element-deps new file mode 100644 index 0000000000..73015c249e --- /dev/null +++ b/elements/sos/element-deps @@ -0,0 +1,2 @@ +package-installs +pkg-map diff --git a/elements/sos/package-installs.yaml b/elements/sos/package-installs.yaml new file mode 100644 index 0000000000..d3caa1ee36 --- /dev/null +++ b/elements/sos/package-installs.yaml @@ -0,0 +1 @@ +sos: diff --git a/elements/sos/pkg-map b/elements/sos/pkg-map new file mode 100644 index 0000000000..126ce07727 --- /dev/null +++ b/elements/sos/pkg-map @@ -0,0 +1,10 @@ +{ + "family": { + "redhat": { + "sos": "sos" + } + }, + "default": { + "sos": "" + } +} diff --git a/releasenotes/notes/add-sos-element-5d6677471341e7f2.yaml b/releasenotes/notes/add-sos-element-5d6677471341e7f2.yaml new file mode 100644 index 0000000000..8ca8ccb19c --- /dev/null +++ b/releasenotes/notes/add-sos-element-5d6677471341e7f2.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add sos element to amphora images (Red Hat family only).