From 007662a57a38c23950bae142532f176550b9b87f Mon Sep 17 00:00:00 2001
From: yuki-takagi-66 <yuki.takagi@tier4.jp>
Date: Tue, 26 Nov 2024 15:48:51 +0900
Subject: [PATCH 1/5] change diag dir

Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp>
---
 autoware_launch/launch/autoware.launch.xml                    | 2 +-
 .../launch/components/tier4_system_component.launch.xml       | 4 ++--
 autoware_launch/launch/logging_simulator.launch.xml           | 2 +-
 autoware_launch/launch/planning_simulator.launch.xml          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml
index 29378cc0c8..4bf18af889 100644
--- a/autoware_launch/launch/autoware.launch.xml
+++ b/autoware_launch/launch/autoware.launch.xml
@@ -37,7 +37,7 @@
   <arg name="system_run_mode" default="online" description="run mode in system"/>
   <arg name="launch_system_monitor" default="true" description="launch system monitor"/>
   <arg name="launch_dummy_diag_publisher" default="false" description="launch dummy diag publisher"/>
-  <arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostic_graph_aggregator/autoware-main.yaml" description="diagnostic graph config"/>
+  <arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml" description="diagnostic graph config"/>
   <!-- Tools -->
   <arg name="rviz" default="true" description="launch rviz"/>
   <arg name="rviz_config_name" default="autoware.rviz" description="rviz config name"/>
diff --git a/autoware_launch/launch/components/tier4_system_component.launch.xml b/autoware_launch/launch/components/tier4_system_component.launch.xml
index 5bb8403dc2..31cc739683 100644
--- a/autoware_launch/launch/components/tier4_system_component.launch.xml
+++ b/autoware_launch/launch/components/tier4_system_component.launch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <launch>
   <arg name="diagnostic_graph_aggregator_param_path" default="$(find-pkg-share diagnostic_graph_aggregator)/config/default.param.yaml"/>
-  <arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostic_graph_aggregator/autoware-main.yaml"/>
+  <arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
 
   <include file="$(find-pkg-share tier4_system_launch)/launch/system.launch.xml">
     <arg name="run_mode" value="$(var system_run_mode)"/>
@@ -14,7 +14,7 @@
     <arg name="processing_time_checker_param_path" value="$(find-pkg-share autoware_launch)/config/system/processing_time_checker/processing_time_checker.param.yaml"/>
     <arg name="mrm_comfortable_stop_operator_param_path" value="$(find-pkg-share autoware_launch)/config/system/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator.param.yaml"/>
     <arg name="mrm_emergency_stop_operator_param_path" value="$(find-pkg-share autoware_launch)/config/system/mrm_emergency_stop_operator/mrm_emergency_stop_operator.param.yaml"/>
-    <arg name="dummy_diag_publisher_param_path" value="$(find-pkg-share autoware_launch)/config/system/dummy_diag_publisher/dummy_diag_publisher.param.yaml"/>
+    <arg name="dummy_diag_publisher_param_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/dummy_diag_publisher.param.yaml"/>
     <arg name="system_monitor_cpu_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/cpu_monitor.param.yaml"/>
     <arg name="system_monitor_gpu_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/gpu_monitor.param.yaml"/>
     <arg name="system_monitor_hdd_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/hdd_monitor.param.yaml"/>
diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml
index f1a9ad5fab..123bd01ed3 100644
--- a/autoware_launch/launch/logging_simulator.launch.xml
+++ b/autoware_launch/launch/logging_simulator.launch.xml
@@ -65,7 +65,7 @@
       <arg name="system_run_mode" value="logging_simulation"/>
       <arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
       <arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
-      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostic_graph_aggregator/autoware-main.yaml"/>
+      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
       <!-- Map -->
       <arg name="lanelet2_map_file" value="$(var lanelet2_map_file)"/>
       <arg name="pointcloud_map_file" value="$(var pointcloud_map_file)"/>
diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml
index be175553b7..3c56e11412 100644
--- a/autoware_launch/launch/planning_simulator.launch.xml
+++ b/autoware_launch/launch/planning_simulator.launch.xml
@@ -70,7 +70,7 @@
       <arg name="system_run_mode" value="planning_simulation"/>
       <arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
       <arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
-      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostic_graph_aggregator/autoware-main.yaml"/>
+      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
       <!-- Map -->
       <arg name="lanelet2_map_file" value="$(var lanelet2_map_file)"/>
       <arg name="pointcloud_map_file" value="$(var pointcloud_map_file)"/>

From 4275b53233c29c9d94524a8b7dfd58c5c56f824c Mon Sep 17 00:00:00 2001
From: yuki-takagi-66 <yuki.takagi@tier4.jp>
Date: Tue, 26 Nov 2024 15:54:09 +0900
Subject: [PATCH 2/5] change file dir

Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp>
---
 .../autoware-awsim.yaml                                           | 0
 .../{system_diagnostic_monitor => diagnostics}/autoware-main.yaml | 0
 .../{system_diagnostic_monitor => diagnostics}/control.yaml       | 0
 .../dummy_diag_publisher.param.yaml                               | 0
 .../{system_diagnostic_monitor => diagnostics}/hardware.yaml      | 0
 .../{system_diagnostic_monitor => diagnostics}/localization.yaml  | 0
 .../system/{system_diagnostic_monitor => diagnostics}/map.yaml    | 0
 .../{system_diagnostic_monitor => diagnostics}/perception.yaml    | 0
 .../{system_diagnostic_monitor => diagnostics}/planning.yaml      | 0
 .../system/{system_diagnostic_monitor => diagnostics}/system.yaml | 0
 .../{system_diagnostic_monitor => diagnostics}/vehicle.yaml       | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename autoware_launch/config/system/{diagnostic_graph_aggregator => diagnostics}/autoware-awsim.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/autoware-main.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/control.yaml (100%)
 rename autoware_launch/config/system/{dummy_diag_publisher => diagnostics}/dummy_diag_publisher.param.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/hardware.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/localization.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/map.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/perception.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/planning.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/system.yaml (100%)
 rename autoware_launch/config/system/{system_diagnostic_monitor => diagnostics}/vehicle.yaml (100%)

diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml b/autoware_launch/config/system/diagnostics/autoware-awsim.yaml
similarity index 100%
rename from autoware_launch/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml
rename to autoware_launch/config/system/diagnostics/autoware-awsim.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/autoware-main.yaml b/autoware_launch/config/system/diagnostics/autoware-main.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/autoware-main.yaml
rename to autoware_launch/config/system/diagnostics/autoware-main.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/control.yaml b/autoware_launch/config/system/diagnostics/control.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/control.yaml
rename to autoware_launch/config/system/diagnostics/control.yaml
diff --git a/autoware_launch/config/system/dummy_diag_publisher/dummy_diag_publisher.param.yaml b/autoware_launch/config/system/diagnostics/dummy_diag_publisher.param.yaml
similarity index 100%
rename from autoware_launch/config/system/dummy_diag_publisher/dummy_diag_publisher.param.yaml
rename to autoware_launch/config/system/diagnostics/dummy_diag_publisher.param.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/hardware.yaml b/autoware_launch/config/system/diagnostics/hardware.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/hardware.yaml
rename to autoware_launch/config/system/diagnostics/hardware.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/localization.yaml b/autoware_launch/config/system/diagnostics/localization.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/localization.yaml
rename to autoware_launch/config/system/diagnostics/localization.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/map.yaml b/autoware_launch/config/system/diagnostics/map.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/map.yaml
rename to autoware_launch/config/system/diagnostics/map.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/perception.yaml b/autoware_launch/config/system/diagnostics/perception.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/perception.yaml
rename to autoware_launch/config/system/diagnostics/perception.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/planning.yaml b/autoware_launch/config/system/diagnostics/planning.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/planning.yaml
rename to autoware_launch/config/system/diagnostics/planning.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/system.yaml b/autoware_launch/config/system/diagnostics/system.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/system.yaml
rename to autoware_launch/config/system/diagnostics/system.yaml
diff --git a/autoware_launch/config/system/system_diagnostic_monitor/vehicle.yaml b/autoware_launch/config/system/diagnostics/vehicle.yaml
similarity index 100%
rename from autoware_launch/config/system/system_diagnostic_monitor/vehicle.yaml
rename to autoware_launch/config/system/diagnostics/vehicle.yaml

From 01202499cfef7ee975226c53e34d789718cccc97 Mon Sep 17 00:00:00 2001
From: yuki-takagi-66 <yuki.takagi@tier4.jp>
Date: Tue, 26 Nov 2024 15:56:43 +0900
Subject: [PATCH 3/5] delete link file

Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp>
---
 .../system/diagnostic_graph_aggregator/autoware-main.yaml       | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml

diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml b/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml
deleted file mode 100644
index c96dd5ed46..0000000000
--- a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-files:
-  - { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml }

From 8b700025204fcb222a6523f1fd78abd912f34090 Mon Sep 17 00:00:00 2001
From: yuki-takagi-66 <yuki.takagi@tier4.jp>
Date: Tue, 26 Nov 2024 15:58:26 +0900
Subject: [PATCH 4/5] change link form

Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp>
---
 autoware_launch/config/system/diagnostics/autoware-awsim.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoware_launch/config/system/diagnostics/autoware-awsim.yaml b/autoware_launch/config/system/diagnostics/autoware-awsim.yaml
index 937cfdeb65..4abae34a31 100644
--- a/autoware_launch/config/system/diagnostics/autoware-awsim.yaml
+++ b/autoware_launch/config/system/diagnostics/autoware-awsim.yaml
@@ -1,5 +1,5 @@
 files:
-  - { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml }
+  - { path: $(dirname)/autoware-main.yaml }
 
 edits:
   - { type: remove, path: /autoware/system/duplicated_node_checker }

From 56012ea4be9b9f911fe7e8cd8d4ea32b100a0ea2 Mon Sep 17 00:00:00 2001
From: yuki-takagi-66 <yuki.takagi@tier4.jp>
Date: Wed, 27 Nov 2024 12:02:51 +0900
Subject: [PATCH 5/5] set awsim

Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp>
---
 autoware_launch/launch/e2e_simulator.launch.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoware_launch/launch/e2e_simulator.launch.xml b/autoware_launch/launch/e2e_simulator.launch.xml
index 3237754c48..c4fd15b41c 100644
--- a/autoware_launch/launch/e2e_simulator.launch.xml
+++ b/autoware_launch/launch/e2e_simulator.launch.xml
@@ -71,7 +71,7 @@
       <!-- System -->
       <arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
       <arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
-      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml"/>
+      <arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-awsim.yaml"/>
       <!-- Sensing -->
       <arg name="launch_sensing_driver" value="$(var launch_sensing_driver)"/>
       <!-- Perception-->