add api for descriptor to root domain, tidying things up

files/api/Components.py

@@ -272,6 +272,7 @@ class System:
             print(f"System initializing, name {self.name}")
         # system contains an array of component objects
         self.components = []
+        self.component_class_tree = component_class_tree
         # initialize system properties and metrics dicts
         self._properties: Dict[str, str] = {}
         self._metrics: Dict[str, str] = {}
@@ -385,6 +386,9 @@ class System:
     def check_system_timer(self):
         time_lapsed = time.time() - float(self.recent_check)
         return time_lapsed < 30.0
+    
+    def get_component_class_tree(self):
+        return self.component_class_tree
 
     ########################################################
     # static metrics redis data functions

files/api/app.py

@@ -125,6 +125,11 @@ def php_summary():
 def info():
     return jsonify(get_info())
 
+# system info
+@app.route('/descriptor', methods=['GET'])
+def descriptor():
+    return jsonify(get_descriptor())
+
 # socket timer
 @app.route('/start_timer', methods=['GET'])
 def start_timer():
@@ -239,6 +244,9 @@ def get_php_summary():
 
     return result
 
+def get_descriptor():
+    return cosmostat_system.get_component_class_tree()
+
 #######################################################################
 ### Other Functions
 #######################################################################

files/api/component_descriptors.json

@@ -36,22 +36,6 @@
       "RAM Voltage"
     ]
   },
-  {
-    "name": "STOR",
-    "description": "{Device Path} is of type {Drive Type} with capacity of {Total Capacity}.",
-    "multi_check": "True",
-    "device_list": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{print $1}'",
-    "properties": {
-      "Device Name": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{{print $1}}' | grep {this_device}",    
-      "Device Path": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{{print \"/dev/\"$1}}' | grep {this_device}",    
-      "Drive Type": "lsblk -d -o NAME,TRAN | grep {this_device} | awk '{{print $2}}'",
-      "Total Capacity": "lsblk -d -o NAME,SIZE | grep {this_device} | awk '{{print $2}}'",
-      "SMART Check": "sudo /usr/sbin/smartctl -x --json /dev/{this_device} | jq -r .smart_status.passed"
-    },
-    "metrics": {
-      "placeholder": ""
-    }
-  },
   {
     "name": "LAN",
     "description": "{Device ID} - {Device Name} - {MAC Address}",
@@ -67,7 +51,7 @@
       "Data Transmitted": "ifconfig {this_device} | grep RX | grep bytes | cut -d '(' -f2 | tr -d ')'",
       "Data Received": "ifconfig {this_device} | grep TX | grep bytes | cut -d '(' -f2 | tr -d ')'",
       "Link State": "cat /sys/class/net/{this_device}/operstate",
-      "Link Speed": "cat /sys/class/net/{this_device}/speed"
+      "Link Speed": "cat /sys/class/net/{this_device}/speed || true"
     },  
     "multi_metrics": [
         "IP Address"
@@ -82,7 +66,7 @@
       "Device Model": "nvidia-smi --id={this_device} --query-gpu=name --format=csv,noheader,nounits",
       "Device ID": "echo NVGPU{this_device}",
       "Driver Version": "nvidia-smi --id={this_device} --query-gpu=driver_version --format=csv,noheader,nounits",
-      "Maximum Power": "nvidia-smi --id={this_device} --query-gpu=power.draw --format=csv,noheader,nounits",
+      "Maximum Power": "nvidia-smi --id={this_device} --query-gpu=power.limit --format=csv,noheader,nounits",
       "Memory Size": "nvidia-smi --id={this_device} --query-gpu=memory.total --format=csv,noheader,nounits"
 
     },
@@ -94,5 +78,21 @@
 
     },
     "precheck": "lspci | grep NV | wc -l"
+  },
+  {
+    "name": "STOR",
+    "description": "{Device Path} is of type {Drive Type} with capacity of {Total Capacity}.",
+    "multi_check": "True",
+    "device_list": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{print $1}'",
+    "properties": {
+      "Device Name": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{{print $1}}' | grep {this_device}",    
+      "Device Path": "lsblk -d -o NAME,SIZE | grep -v -e 0B -e NAME | awk '{{print \"/dev/\"$1}}' | grep {this_device}",    
+      "Drive Type": "lsblk -d -o NAME,TRAN | grep {this_device} | awk '{{print $2}}'",
+      "Total Capacity": "lsblk -d -o NAME,SIZE | grep {this_device} | awk '{{print $2}}'",
+      "SMART Check": "sudo /usr/sbin/smartctl -x --json /dev/{this_device} | jq -r .smart_status.passed"
+    },
+    "metrics": {
+      "placeholder": ""
+    }
   }
 ]