diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 0d0f887..d406b68 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -79,8 +79,7 @@ defaults = {
         'disk_io',
         'disk_usage',
         'net_io',
-        'proc_cpu',
-        'proc_ram',
+        'proc_cpu_ram',
         'proc_io',
     },
     'sudoers': {
diff --git a/data/grafana/rows/proc_cpu.py b/data/grafana/rows/proc_cpu.py
deleted file mode 100644
index 819914a..0000000
--- a/data/grafana/rows/proc_cpu.py
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    'process_cpu': {
-        'stacked': True,
-        'queries': {
-            'cpu': {
-                'filters': {
-                    '_measurement': 'procstat',
-                    '_field': [
-                        'cpu_usage',
-                    ],
-                },
-                'minimum': 0.2,
-            },
-        },
-        'unit': 'percent',
-        'display_name': '__field.labels.process_name',
-        'legend': {
-            'displayMode': 'table',
-            'placement': 'right',
-            'calcs': [
-                'mean',
-                'max',
-            ],
-        },
-    },
-}
diff --git a/data/grafana/rows/proc_cpu_ram.py b/data/grafana/rows/proc_cpu_ram.py
new file mode 100644
index 0000000..1447b10
--- /dev/null
+++ b/data/grafana/rows/proc_cpu_ram.py
@@ -0,0 +1,50 @@
+{
+    'cpu': {
+        'stacked': True,
+        'queries': {
+            'cpu': {
+                'filters': {
+                    '_measurement': 'procstat',
+                    '_field': [
+                        'cpu_usage',
+                    ],
+                },
+                'minimum': 0.2,
+            },
+        },
+        'unit': 'percent',
+        'display_name': '__field.labels.process_name',
+        'legend': {
+            'displayMode': 'table',
+            'placement': 'right',
+            'calcs': [
+                'mean',
+                'max',
+            ],
+        },
+    },
+    'ram': {
+        'stacked': True,
+        'queries': {
+            'ram': {
+                'filters': {
+                    '_measurement': 'procstat',
+                    '_field': [
+                        'memory_rss',
+                    ],
+                },
+                'minimum': 10*(10**6),
+            },
+        },
+        'unit': 'bytes',
+        'display_name': '__field.labels.process_name',
+        'legend': {
+            'displayMode': 'table',
+            'placement': 'right',
+            'calcs': [
+                'mean',
+                'max',
+            ],
+        },
+    },
+}
diff --git a/data/grafana/rows/proc_ram.py b/data/grafana/rows/proc_ram.py
deleted file mode 100644
index 32d3ba3..0000000
--- a/data/grafana/rows/proc_ram.py
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    'process_ram': {
-        'stacked': True,
-        'queries': {
-            'ram': {
-                'filters': {
-                    '_measurement': 'procstat',
-                    '_field': [
-                        'memory_rss',
-                    ],
-                },
-                'minimum': 10*(10**6),
-            },
-        },
-        'unit': 'bytes',
-        'display_name': '__field.labels.process_name',
-        'legend': {
-            'displayMode': 'table',
-            'placement': 'right',
-            'calcs': [
-                'mean',
-                'max',
-            ],
-        },
-    },
-}