diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 195a8bc..3b93098 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -46,12 +46,7 @@ defaults = {
                         'memory_rss',
                     ],
                 }],
-                'diskio': [{
-                    'fieldpass': [
-                        'read_bytes',
-                        'write_bytes',
-                    ],
-                }],
+                'diskio': [{}],
                 'kernel': [{}],
                 'mem': [{}],
                 'processes': [{}],
diff --git a/data/grafana/flux.mako b/data/grafana/flux.mako
index 42de3f6..48dc8ee 100644
--- a/data/grafana/flux.mako
+++ b/data/grafana/flux.mako
@@ -7,8 +7,8 @@ from(bucket: "${bucket}")
 % if function == 'derivative':
   |> derivative(nonNegative: true)
 % endif
-  |> aggregateWindow(every: duration(v: int(v: v.windowPeriod)*${resolution}), fn: mean, createEmpty: false)
 % if negative:
   |> map(fn: (r) => ({r with _value: r._value * - 1.0}))
 % endif
+  |> aggregateWindow(every: duration(v: int(v: v.windowPeriod)*${resolution}), fn: mean, createEmpty: false)
   |> yield(name: "mean")