Deprecate cpu_usage_raw from Stats event

Breaking change. No known Qubes OS code uses. A better value is
"cpu_usage".

Author: ben-grande

qubes/api/admin.py

@@ -2524,7 +2524,6 @@ def _send_stats_single(self, info_time, info, only_vm, filters):
                 "memory_with_swap_used": int(vm_info["memory_with_swap_used"]),
                 "cpu_time": int(vm_info["cpu_time"] / 1000000),
                 "cpu_usage": int(vm_info["cpu_usage"]),
-                "cpu_usage_raw": int(vm_info["cpu_usage_raw"]),
                 "online_vcpus": int(vm_info["online_vcpus"]),
             }
 

qubes/app.py

@@ -470,10 +470,6 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
            - Description: Amount memory assigned that is usable in the qube.
              Will be deprecated in a future release due to its ambiguous name.
              Prefer the equivalent ``memory_assigned_usable``.
-        - ``cpu_usage_raw``:
-          - Type: ``int``, percentage.
-          - Description: CPU usage. Will be deprecated as it can be calculated
-            on the client.
 
         This function requires Xen hypervisor for detailed overview.
 

qubes/tests/api_admin.py

@@ -4090,7 +4090,6 @@ def test_630_vm_stats(self):
                 "swap_used": 0,
                 "cpu_time": 243951379111104 // 8,
                 "cpu_usage": 0,
-                "cpu_usage_raw": 0,
                 "online_vcpus": 16,
             },
             1: {
@@ -4103,16 +4102,13 @@ def test_630_vm_stats(self):
                 "swap_used": 0,
                 "cpu_time": 2849496569205,
                 "cpu_usage": 0,
-                "cpu_usage_raw": 0,
                 "online_vcpus": 2,
             },
         }
         stats2 = copy.deepcopy(stats1)
         stats2[0]["cpu_time"] += 100000000
         stats2[0]["cpu_usage"] = 10
-        stats2[0]["cpu_usage_raw"] = 10
         stats2[1]["cpu_usage"] = 5
-        stats2[1]["cpu_usage_raw"] = 5
         self.app.host.get_vm_stats = unittest.mock.Mock()
         self.app.host.get_vm_stats.side_effect = [
             (0, stats1),
@@ -4173,7 +4169,6 @@ def name(self):
                 swap_used=stats1[0]["swap_used"],
                 cpu_time=stats1[0]["cpu_time"] // 1000000,
                 cpu_usage=stats1[0]["cpu_usage"],
-                cpu_usage_raw=stats1[0]["cpu_usage_raw"],
                 online_vcpus=stats1[0]["online_vcpus"],
             ),
             unittest.mock.call(
@@ -4186,7 +4181,6 @@ def name(self):
                 swap_used=stats1[1]["swap_used"],
                 cpu_time=stats1[1]["cpu_time"] // 1000000,
                 cpu_usage=stats1[1]["cpu_usage"],
-                cpu_usage_raw=stats1[1]["cpu_usage_raw"],
                 online_vcpus=stats1[1]["online_vcpus"],
             ),
             unittest.mock.call(
@@ -4199,7 +4193,6 @@ def name(self):
                 swap_used=stats2[0]["swap_used"],
                 cpu_time=stats2[0]["cpu_time"] // 1000000,
                 cpu_usage=stats2[0]["cpu_usage"],
-                cpu_usage_raw=stats2[0]["cpu_usage_raw"],
                 online_vcpus=stats2[0]["online_vcpus"],
             ),
             unittest.mock.call(
@@ -4212,7 +4205,6 @@ def name(self):
                 swap_used=stats2[1]["swap_used"],
                 cpu_time=stats2[1]["cpu_time"] // 1000000,
                 cpu_usage=stats2[1]["cpu_usage"],
-                cpu_usage_raw=stats2[1]["cpu_usage_raw"],
                 online_vcpus=stats2[1]["online_vcpus"],
             ),
         ]
@@ -4233,7 +4225,6 @@ def test_631_vm_stats_single_vm(self):
                 "swap_used": 0,
                 "cpu_time": 2849496569205,
                 "cpu_usage": 0,
-                "cpu_usage_raw": 0,
                 "online_vcpus": 2,
                 "cpu_time_internal": 2849496569205,
                 "cpu_usage_internal": 0.0,
@@ -4242,7 +4233,6 @@ def test_631_vm_stats_single_vm(self):
         }
         stats2 = copy.deepcopy(stats1)
         stats2[2]["cpu_usage"] = 5
-        stats2[2]["cpu_usage_raw"] = 5
         self.app.host.get_vm_stats = unittest.mock.Mock()
         self.app.host.get_vm_stats.side_effect = [
             (0, stats1),
@@ -4302,7 +4292,6 @@ def name(self):
                 swap_used=stats1[2]["swap_used"],
                 cpu_time=stats1[2]["cpu_time"] // 1000000,
                 cpu_usage=stats1[2]["cpu_usage"],
-                cpu_usage_raw=stats1[2]["cpu_usage_raw"],
                 online_vcpus=stats1[2]["online_vcpus"],
                 cpu_time_internal=stats1[2]["cpu_time_internal"] // 1000000,
                 cpu_usage_internal=stats1[2]["cpu_usage_internal"],
@@ -4318,7 +4307,6 @@ def name(self):
                 swap_used=stats2[2]["swap_used"],
                 cpu_time=stats2[2]["cpu_time"] // 1000000,
                 cpu_usage=stats2[2]["cpu_usage"],
-                cpu_usage_raw=stats2[2]["cpu_usage_raw"],
                 online_vcpus=stats2[2]["online_vcpus"],
                 cpu_time_internal=stats2[2]["cpu_time_internal"] // 1000000,
                 cpu_usage_internal=stats2[2]["cpu_usage_internal"],