Harmonized DeviceConfiguration and MonitoringData; #5

Refactored "hardware" and "resources" sections in "DeviceConfiguration" and "MonitoringData", which are now compatible and can be mixed if needed.
netjson · Dec 27, 2014 · 10fe26b · 10fe26b
1 parent 93f53b3
commit 10fe26b
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 50 deletions.
diff --git a/README.rst b/README.rst
@@ -95,6 +95,7 @@ The object should be composed of the following members:
 * ``general``
 * ``hardware``
 * ``operating_system``
+* ``resources``
 * ``interfaces``
 * ``physical_devices``
 * ``routing_protocols``

diff --git a/examples/device-configuration.json b/examples/device-configuration.json
@@ -8,11 +8,8 @@
     "hardware": {
         "manufacturer": "Example inc.",
         "model": "Example model",
-        "model_revision": 1,
-        "ram": 67108864,
-        "cpu": "Atheros AR2317",
-        "cpu_frequency": 400000000,
-        "flash_memory": 8388608
+        "revision": 1,
+        "cpu": "Atheros AR2317"
     },
     "operating_system": {
         "name": "OpenWRT",
@@ -21,6 +18,23 @@
         "revision": "r43321",
         "description": "OpenWrt Barrier Breaker 14.07"
     },
+    "resources": {
+        "memory": {
+            "total": 67108864
+        },
+        "swap": {
+            "total": 0
+        },
+        "cpu": {
+            "frequency": 400000000
+        },
+        "flash": {
+            "total": 8388608
+        },
+        "storage": {
+            "total": null
+        }
+    },
     "interfaces": [
         {
             "type": "wireless",

diff --git a/examples/monitoring-data.json b/examples/monitoring-data.json
@@ -4,6 +4,59 @@
         "local_time": 1414305354,
         "uptime": 3501937,
     },
+    "resources": {
+        "load_average": [
+           "0.08",
+           "0.04",
+           "0.05"
+        ],
+        "memory": {
+            "total": 67108864,
+            "free": 3156,
+            "buffered": 2072,
+            "cache": 6884
+        },
+        "swap": {
+            "total": 0,
+            "free": 0
+        },
+        "connections": {
+            "ipv4": {
+                "tcp": 4,
+                "udp": 18
+            },
+            "ipv6": {
+                "tcp": 2,
+                "udp": 1
+            }
+        },
+        "processes": {
+            "running": 2,
+            "sleeping": 36,
+            "blocked": 0,
+            "zombie": 0,
+            "stopped": 0,
+            "paging": 0
+        },
+        "cpu": {
+            "frequency": 400000000,
+            "user": 13,
+            "system": 0,
+            "nice": 4,
+            "idle": 83,
+            "iowait": 0,
+            "irq": 0,
+            "softirq": 0
+        },
+        "flash": {
+            "total": 8388608,
+            "free": 1388608,
+        },
+        "storage": {
+            "total": null,
+            "free": null,
+        }
+    },
     "interfaces": [
         {
             "name": "lo",
@@ -92,49 +145,5 @@
                 "tx_carrier_errors": 0
             }
         }
-    ],
-    "resources": {
-        "load_average": [
-           "0.08",
-           "0.04",
-           "0.05"
-        ],
-        "memory": {
-            "total": 28980,
-            "free": 3156,
-            "buffered": 2072,
-            "cache": 6884
-        },
-        "swap": {
-            "total": 0,
-            "free": 0
-        },
-        "connections": {
-            "ipv4": {
-                "tcp": 4,
-                "udp": 18
-            },
-            "ipv6": {
-                "tcp": 2,
-                "udp": 1
-            }
-        },
-        "processes": {
-            "running": 2,
-            "sleeping": 36,
-            "blocked": 0,
-            "zombie": 0,
-            "stopped": 0,
-            "paging": 0
-        },
-        "cpu": {
-            "user": 13,
-            "system": 0,
-            "nice": 4,
-            "idle": 83,
-            "iowait": 0,
-            "irq": 0,
-            "softirq": 0
-        }
-    }
+    ]
 }