Merge branch 'ros2' into fix/fixing_launchtest

README.md

@@ -37,7 +37,11 @@ Diagnostics messages that are not aggregated can be visualized by [`rqt_runtime_
 The [`ros2` branch](https://github.com/ros/diagnostics/tree/ros2) targets
 
 - *Humble Hawksbill*
-- *Iron Irwini* and
+- *Iron Irwini*
+
+The [`ros2-jazzy` branch](https://github.com/ros/diagnostics/tree/ros2-jazzy) targets
+
+- *Jazzy Jalisco*
 - *Rolling Ridley*
 
 # License

diagnostic_aggregator/CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog for package diagnostic_aggregator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.2.0 (2024-03-22)
+------------------
+* Avoid rolling up an ERROR state when empty GenericAnalyzer blocks are marked discard_stale, or when all of their items are STALE. (`#315 <https://github.com/ros/diagnostics/issues/315>`_)
+* formatting fixes from PR324 (`#327 <https://github.com/ros/diagnostics/issues/327>`_)
+* Debugging instability introduced by `#317 <https://github.com/ros/diagnostics/issues/317>`_  (`#323 <https://github.com/ros/diagnostics/issues/323>`_)
+* feat: publish top level msg when error is received (`#317 <https://github.com/ros/diagnostics/issues/317>`_)
+* Empty default aggregator base_path (`#305 <https://github.com/ros/diagnostics/issues/305>`_)
+* using defined state for stale (`#298 <https://github.com/ros/diagnostics/issues/298>`_)
+* Contributors: Andrew Symington, Christian Henkel, outrider-jhulas
+
 3.1.2 (2023-03-24)
 ------------------
 

diagnostic_aggregator/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>diagnostic_aggregator</name>
-  <version>3.1.2</version>
+  <version>3.2.0</version>
   <description>diagnostic_aggregator</description>
   <maintainer email="[email protected]">Austin Hendrix</maintainer>
   <maintainer email="[email protected]">Brice Rebsamen</maintainer>

diagnostic_common_diagnostics/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package diagnostic_common_diagnostics
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.2.0 (2024-03-22)
+------------------
+* Port cpu_monitor to ROS2 (`#326 <https://github.com/ros/diagnostics/issues/326>`_)
+* Debugging instability introduced by `#317 <https://github.com/ros/diagnostics/issues/317>`_  (`#323 <https://github.com/ros/diagnostics/issues/323>`_)
+* not testing on foxy any more (`#310 <https://github.com/ros/diagnostics/issues/310>`_)
+* Iron support (`#304 <https://github.com/ros/diagnostics/issues/304>`_)
+* Contributors: Christian Henkel, Richard
+
 3.1.2 (2023-03-24)
 ------------------
 * replacing ntpdate with ntplib (`#289 <https://github.com/ros/diagnostics/issues/289>`_)

diagnostic_common_diagnostics/CMakeLists.txt

@@ -8,6 +8,7 @@ find_package(ament_cmake_python REQUIRED)
 ament_python_install_package(${PROJECT_NAME})
 
 install(PROGRAMS
+    ${PROJECT_NAME}/cpu_monitor.py
     ${PROJECT_NAME}/ntp_monitor.py
     DESTINATION lib/${PROJECT_NAME}
 )
@@ -17,10 +18,14 @@ if(BUILD_TESTING)
     ament_lint_auto_find_test_dependencies()
 
     find_package(ament_cmake_pytest REQUIRED)
+    ament_add_pytest_test(
+        test_cpu_monitor
+        test/systemtest/test_cpu_monitor.py
+        TIMEOUT 10)
     ament_add_pytest_test(
         test_ntp_monitor
         test/systemtest/test_ntp_monitor.py
         TIMEOUT 10)
 endif()
 
-ament_package()
+ament_package()

diagnostic_common_diagnostics/README.md

@@ -7,8 +7,31 @@ Currently only the NTP monitor is ported to ROS2.
 
 # Nodes
 
+## cpu_monitor.py
+The `cpu_monitor` module allows users to monitor the CPU usage of their system in real-time.
+It publishes the usage percentage in a diagnostic message.
+
+* Name of the node is "cpu_monitor_" + hostname.
+* Uses the following args:
+  * warning_percentage: If the CPU usage is > warning_percentage, a WARN status will be publised.
+  * window: the maximum length of the used collections.deque for queuing CPU readings.
+
+### Published Topics
+#### /diagnostics
+diagnostic_msgs/DiagnosticArray
+The diagnostics information.
+
+### Parameters
+#### warning_percentage
+(default: 90)
+warning percentage threshold.
+
+#### window
+(default: 1)
+Length of CPU readings queue.
+
 ## ntp_monitor.py
-Runs 'ntpdate' to check if the system clock is synchronized with the NTP server. 
+Runs 'ntpdate' to check if the system clock is synchronized with the NTP server.
 * If the offset is smaller than `offset-tolerance`, an `OK` status will be published.
 * If the offset is larger than the configured `offset-tolerance`, a `WARN` status will be published,
 * if it is bigger than `error-offset-tolerance`, an `ERROR` status will be published.
@@ -20,7 +43,7 @@ diagnostic_msgs/DiagnosticArray
 The diagnostics information.
 
 ### Parameters
-#### ntp_hostname 
+#### ntp_hostname
 (default: "pool.ntp.org")
 Hostname of NTP server.
 
@@ -46,14 +69,11 @@ Disable self test.
 ## hd_monitor.py
 **To be ported**
 
-## cpu_monitor.py
-**To be ported**
-
 ## ram_monitor.py
 **To be ported**
 
 ## sensors_monitor.py
 **To be ported**
 
 ## tf_monitor.py
-**To be ported**
+**To be ported**

diagnostic_common_diagnostics/diagnostic_common_diagnostics/cpu_monitor.py

@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Software License Agreement (BSD License)
+#
+# Copyright (c) 2017, TNO IVS, Helmond, Netherlands
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the TNO IVS nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# \author Rein Appeldoorn
+
+from collections import deque
+import socket
+import traceback
+
+from diagnostic_msgs.msg import DiagnosticStatus
+
+from diagnostic_updater import DiagnosticTask, Updater
+
+import psutil
+
+import rclpy
+from rclpy.node import Node
+
+
+class CpuTask(DiagnosticTask):
+
+    def __init__(self, warning_percentage=90, window=1):
+        DiagnosticTask.__init__(self, 'CPU Information')
+
+        self._warning_percentage = int(warning_percentage)
+        self._readings = deque(maxlen=window)
+
+    def _get_average_reading(self):
+        def avg(lst):
+            return float(sum(lst)) / len(lst) if lst else float('nan')
+
+        return [avg(cpu_percentages)
+                for cpu_percentages in zip(*self._readings)]
+
+    def run(self, stat):
+        self._readings.append(psutil.cpu_percent(percpu=True))
+        cpu_percentages = self._get_average_reading()
+        cpu_average = sum(cpu_percentages) / len(cpu_percentages)
+
+        stat.add('CPU Load Average', f'{cpu_average:.2f}')
+
+        warn = False
+        for idx, cpu_percentage in enumerate(cpu_percentages):
+            stat.add(f'CPU {idx} Load', f'{cpu_percentage:.2f}')
+            if cpu_percentage > self._warning_percentage:
+                warn = True
+
+        if warn:
+            stat.summary(DiagnosticStatus.WARN,
+                         f'At least one CPU exceeds {self._warning_percentage} percent')
+        else:
+            stat.summary(DiagnosticStatus.OK,
+                         f'CPU Average {cpu_average:.2f} percent')
+
+        return stat
+
+
+def main(args=None):
+    rclpy.init(args=args)
+
+    # Create the node
+    hostname = socket.gethostname()
+    node = Node(f'cpu_monitor_{hostname.replace("-", "_")}')
+
+    # Declare and get parameters
+    node.declare_parameter('warning_percentage', 90)
+    node.declare_parameter('window', 1)
+
+    warning_percentage = node.get_parameter(
+        'warning_percentage').get_parameter_value().integer_value
+    window = node.get_parameter('window').get_parameter_value().integer_value
+
+    # Create diagnostic updater with default updater rate of 1 hz
+    updater = Updater(node)
+    updater.setHardwareID(hostname)
+    updater.add(CpuTask(warning_percentage=warning_percentage, window=window))
+
+    rclpy.spin(node)
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    except Exception:
+        traceback.print_exc()

diagnostic_common_diagnostics/mainpage.dox

@@ -4,6 +4,7 @@
 
 \b diagnostic_common_diagnostics contains a few common diagnostic nodes
 
+- cpu_monitor publishes diagnostic messages with the CPU usage of the system.
 - ntp_monitor publishes diagnostic messages for how well the NTP time sync is working.
 - tf_monitor used to publish diagnostic messages reporting on the health of
 the TF tree. It is based on tfwtf. It is not ported to ROS2.

diagnostic_common_diagnostics/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>diagnostic_common_diagnostics</name>
-  <version>3.1.2</version>
+  <version>3.2.0</version>
   <description>diagnostic_common_diagnostics</description>
   <maintainer email="[email protected]">Austin Hendrix</maintainer>
   <maintainer email="[email protected]">Brice Rebsamen</maintainer>
@@ -18,20 +18,20 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
 
-  <exec_depend>rclpy</exec_depend>
   <exec_depend>diagnostic_updater</exec_depend>
   <exec_depend>python3-ntplib</exec_depend>
+  <exec_depend>python3-psutil</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <!-- Usage of ament_lint_common is locked by https://github.com/ament/ament_lint/issues/423
   For now, enable the linters that do support exlusions.
-  Once all files are migrated to ROS2, all linters can be 
+  Once all files are migrated to ROS2, all linters can be
   enabled vi ament_lint_common as the files are cleaned up. -->
   <!-- <test_depend>ament_cmake_flake8</test_depend> -->
   <!-- <test_depend>ament_cmake_pep257</test_depend> -->
   <test_depend>ament_cmake_xmllint</test_depend>
   <test_depend>ament_cmake_lint_cmake</test_depend>
-  
+
   <test_depend>ament_cmake_pytest</test_depend>
 
   <export>