Fix bug related to MergerFS filesystems.

Signed-off-by: Volker Theile <votdev@gmx.de>
openmediavault · Oct 31, 2019 · 59ac3fd · 59ac3fd
1 parent b8d1f60
commit 59ac3fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/deb/openmediavault-diskstats/debian/changelog b/deb/openmediavault-diskstats/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-diskstats (5.0.2-1) stable; urgency=low
+
+  * Fix bug related to MergerFS filesystems.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Thu, 31 Oct 2019 12:46:02 +0100
+
 openmediavault-diskstats (5.0.1-1) stable; urgency=low
 
   * Install missing srv/ directory.

diff --git a/deb/openmediavault-diskstats/srv/salt/omv/deploy/collectd/plugins/disk.sls b/deb/openmediavault-diskstats/srv/salt/omv/deploy/collectd/plugins/disk.sls
@@ -25,7 +25,8 @@
 # Get the configured mount points.
 {% set mountpoints = salt['omv_conf.get_by_filter'](
   'conf.system.filesystem.mountpoint',
-  {'operator': 'not', 'arg0': {'operator': 'stringContains', 'arg0': 'opts', 'arg1': 'bind'}}) %}
+  {'operator': 'and', 'arg0': {'operator': 'equals', 'arg0': 'hidden', 'arg1': '0'}, 'arg1': {'operator': 'not', 'arg0': {'operator': 'stringContains', 'arg0': 'opts', 'arg1': 'bind'}}}) %}
+
 # Filter mounted file systems.
 {% for mountpoint in mountpoints %}
   # Example:
@@ -51,6 +52,7 @@
     {% set _ = disks.append(disk[5:]) %}
   {% endif %}
 {% endfor %}
+
 # Append the root filesystem.
 {% set root_fs = salt['omv_utils.get_root_filesystem']() %}
 {% set disk = salt['omv_utils.get_fs_parent_device_file'](root_fs) %}
@@ -63,4 +65,4 @@ configure_collectd_conf_disk_plugin:
       - salt://{{ slspath }}/files/collectd-disk.j2
     - template: jinja
     - context:
-        disks: {{ disks | json }}
+        disks: {{ disks | unique | json }}