Simplify regex for collectd df plugin instances used by docker

willaerk · willaerk · commit 7d9e75fa56e0 · 2026-01-14T08:51:35.000+01:00
diff --git a/manifests/docker.pp b/manifests/docker.pp
@@ -66,7 +66,7 @@
     plugin  => 'regex',
     options => {
                  'Plugin'         => '^df$',
-                 'PluginInstance' => '^(data-docker-tmp|var-lib-docker-tmp|run-docker-runtime).*'
+                 'PluginInstance' => '^(data-docker-tmp|var-lib-docker-tmp|run-docker).*'
                }
   }
 
diff --git a/spec/classes/docker_spec.rb b/spec/classes/docker_spec.rb
@@ -48,7 +48,7 @@
           'plugin'  => 'regex',
           'options' => {
                          'Plugin'         => '^df$',
-                         'PluginInstance' => '^(data-docker-tmp|var-lib-docker-tmp|run-docker-runtime).*'
+                         'PluginInstance' => '^(data-docker-tmp|var-lib-docker-tmp|run-docker).*'
                        }
         ) }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`plugin => 'regex',`
`67`	`67`	`options => {`
`68`	`68`	`'Plugin' => '^df$',`
`69`		`- 'PluginInstance' => '^(data-docker-tmp\|var-lib-docker-tmp\|run-docker-runtime).*'`
	`69`	`+ 'PluginInstance' => '^(data-docker-tmp\|var-lib-docker-tmp\|run-docker).*'`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`'plugin' => 'regex',`
`49`	`49`	`'options' => {`
`50`	`50`	`'Plugin' => '^df$',`
`51`		`- 'PluginInstance' => '^(data-docker-tmp\|var-lib-docker-tmp\|run-docker-runtime).*'`
	`51`	`+ 'PluginInstance' => '^(data-docker-tmp\|var-lib-docker-tmp\|run-docker).*'`
`52`	`52`	`}`
`53`	`53`	`) }`
`54`	`54`