software/grafana: use new schemas for telegraf inputs

software/grafana/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = b4330fbe0c9c3631f4f477c06d3460b3
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = 64b7015eb7f0a6490c437cb0693d707b
+md5sum = cda6b69dfdd8e5635cfdeaf73b3250e5
 
 
 [influxdb-config-file]

software/grafana/instance-agent.cfg.in

@@ -137,17 +137,6 @@ init =
     "tags": {
       "computer_id": slap_connection['computer-id'],
     },
-    # built-in inputs
-    "cpu": {
-      "drop": ["cpu_time"],
-      "percpu": True,
-      "totalcpu": True,
-    },
-    "disk": {},
-    "io": {},
-    "mem": {},
-    "system": {},
-
     "inputs": inputs,
     "processors": processors,
 
@@ -164,6 +153,19 @@ init =
       },
     },
   }
+  # built-in inputs
+  inputs["cpu"].append(
+    {
+      "drop": ["cpu_time"],
+      "percpu": True,
+      "totalcpu": True,
+    }
+  )
+  inputs["disk"].append({})
+  inputs["io"].append({})
+  inputs["mem"].append({})
+  inputs["system"].append({})
+
   for application in slapparameter_dict.get("applications", []):
     partition_mapping = {}
     partition_root_directory = ''