Merge "[ansible] Add unixsock to config_files role"

diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml
index eab356d..9b24189 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@ -92,6 +92,12 @@
 - name: enable ipmi plugin
   include: ipmi.yml
 
+- name: Enable unixsock plugin
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['unixsock']) | unique }}"
+  tags:
+    - unixsock
+
 - name: enable uuid plugin
   include: uuid.yml
 

diff --git a/docs/release/release-notes/notes/add_unix_sock-e29efe16156c5c8e.yaml b/docs/release/release-notes/notes/add_unix_sock-e29efe16156c5c8e.yaml
new file mode 100644 (file)
index 0000000..7ba83af
--- /dev/null
+++ b/docs/release/release-notes/notes/add_unix_sock-e29efe16156c5c8e.yaml
@@ -0,0 +1,11 @@
+release_summary: >
+    Added unixsock plugin to one-click install.
+ansible:
+  - |
+    Added `unixsock <https://collectd.org/documentation/manpages/collectd-unixsock.5.shtml>`_
+    plugin to one-click install, which allows the user to interact with collectd using the
+    ``collectdctl`` command in the bar-collectd-* containers.
+    The unixsock plugin is useful for debugging issues in collectd, and can
+    be used to verify that metrics are being collected without having to
+    create CSV files or log into the container.
+

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index 9007874..d236b5b 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -382,7 +382,7 @@ List of available tags:
   ``contextswitch``, ``cpu``, ``cpufreq``, ``df``, ``disk,`` ``ethstat``,
   ``ipc``, ``irq``, ``load``, ``memory``, ``numa``, ``processes``, ``swap``,
   ``turbostat``, ``uptime``, ``exec``, ``hugepages``, ``ipmi``, ``kafka``,
-  ``logfile``, ``mcelogs``, ``network``, ``pmu``, ``rdt``, ``rrdtool``,
-  ``snmp``, ``syslog``, ``virt``, ``ovs_stats``, ``ovs_events``, ``uuid``,
-  ``dpdkevents``, ``dpdkstat``, ``dpdk_telemetry``.
+  ``logfile``, ``mcelog``, ``network``, ``pmu``, ``rdt``, ``rrdtool``,
+  ``snmp``, ``syslog``, ``unixsock``, ``virt``, ``ovs_stats``, ``ovs_events``,
+  ``uuid``, ``dpdkevents``, ``dpdkstat``, ``dpdk_telemetry``.