Skip to content

Commit

Permalink
Add monitor service status topic (#207)
Browse files Browse the repository at this point in the history
* Temporary commit

Signed-off-by: Jesus Perez <[email protected]>

* Incompatible QoS on_problem_reported

Signed-off-by: Jesus Perez <[email protected]>

* Entity status graph update fix

Signed-off-by: Jesus Perez <[email protected]>

* Monitor service data process_sample code refactoring

Signed-off-by: Jesus Perez <[email protected]>

* Fix functions sharing resources

Signed-off-by: Jesus Perez <[email protected]>

* expose MonitorServiceSample

Signed-off-by: Jesus Perez <[email protected]>

* Incompatible QoS get_data()

Signed-off-by: Jesus Perez <[email protected]>

* Included remaining monitor service status data implementations

Signed-off-by: Jesus Perez <[email protected]>

* Apply feature/discovery_physical_data PR changes

Signed-off-by: Jesus Perez <[email protected]>

* New generated types

Signed-off-by: Jesus Perez <[email protected]>

* Fix test build

Signed-off-by: Jesus Perez <[email protected]>

* [19607] Set specific  monitor service reader Qos & get_entity_kind_by_guid test

Signed-off-by: Jesus Perez <[email protected]>

* [19607] Added new functionalities tests

Signed-off-by: Jesus Perez <[email protected]>

* Added status logic tests

Signed-off-by: Jesus Perez <[email protected]>

* Monitor service status topic is metatraffic

Signed-off-by: Jesus Perez <[email protected]>

* Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

* Added remaining include files

Signed-off-by: Jesus Perez <[email protected]>

* Change on_problem_reported->on_status_reported

Signed-off-by: Jesus Perez <[email protected]>

* Domain graph view doc

Signed-off-by: Jesus Perez <[email protected]>

* Added app data to get_info return and updated json tags

Signed-off-by: Jesus Perez <[email protected]>

* Status data docs

Signed-off-by: Jesus Perez <[email protected]>

* Docs format review, new words appended to wordlist and MONITOR_SERVICE_DATAREADER_QOS profile

Signed-off-by: Jesus Perez <[email protected]>

* Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

* Empty physical entities named Unknown & set app_id/metadata from proxy info

Signed-off-by: Jesus Perez <[email protected]>

* App names test

Signed-off-by: Jesus Perez <[email protected]>

* Add endpoint app data

Signed-off-by: Jesus Perez <[email protected]>

* get_info and graph endpoint's app data

Signed-off-by: Jesus Perez <[email protected]>

* Apply suggestions & update app_names

Signed-off-by: Jesus Perez <[email protected]>

* New generated types fastCDR v1 & v2

Signed-off-by: Jesus Perez <[email protected]>

* Rename the include to make it accessible to the monitor

Signed-off-by: Jesus Perez <[email protected]>

* Uncrustify (except for new types)

Signed-off-by: Jesus Perez <[email protected]>

* Update status_level variables name after rebase

Signed-off-by: Jesus Perez <[email protected]>

* Fix asan tests

Signed-off-by: Jesus Perez <[email protected]>

* Fix windows tests

Signed-off-by: Jesus Perez <[email protected]>

* Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Fix windows templates issue

Signed-off-by: Jesus Perez <[email protected]>

* Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

* Apply remaining suggestions

Signed-off-by: Jesus Perez <[email protected]>

* Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

---------

Signed-off-by: Jesus Perez <[email protected]>
  • Loading branch information
jepemi authored Dec 18, 2023
1 parent d6c92ba commit dc99fec
Show file tree
Hide file tree
Showing 122 changed files with 23,248 additions and 5,087 deletions.
268 changes: 139 additions & 129 deletions docs/code/StatisticsBackendTests.cpp

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions docs/code/datareader_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"name": "datareader_name",
"alias": "datareader_alias",
"alive": false,
"status": 0,
"metatraffic": false,
"status": "OK",
"guid": "01.0f.22.cd.59.64.04.00.05.00.00.00|00.00.01.04",
"qos":
{
Expand Down Expand Up @@ -133,5 +134,7 @@
"prevent_type_widening": false
},
"user_data": "ff00"
}
},
"app_id": "UNKNOWN_APP",
"app_metadata": ""
}
7 changes: 5 additions & 2 deletions docs/code/datawriter_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"name": "datawriter_name",
"alias": "datawriter_alias",
"alive": true,
"status": 0,
"metatraffic": false,
"status": "OK",
"guid": "01.0f.22.cd.59.64.04.00.02.00.00.00|00.00.01.03",
"qos":
{
Expand Down Expand Up @@ -132,5 +133,7 @@
},
"topic_data": "5b33419a",
"user_data": "ff00"
}
},
"app_id": "UNKNOWN_APP",
"app_metadata": ""
}
3 changes: 2 additions & 1 deletion docs/code/domain_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"name": "0",
"alias": "domain_alias",
"alive": true,
"status": 0
"metatraffic": false,
"status": "OK"
}
8 changes: 6 additions & 2 deletions docs/code/dump_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
"name": "participant_0",
"guid": "01.0f.00.00.00.00.00.00.00.00.00.00|00.00.00.00",
"qos": {"qos": "empty"},
"app_id": "UNKNOWN_APP",
"app_metadata": "",

"process": "3",
"domain": "4",
Expand Down Expand Up @@ -185,7 +187,8 @@
"name": "datawriter_0",
"guid": "01.0f.00.00.00.00.00.00.00.00.00.00|00.00.00.00",
"qos": {"qos": "empty"},

"app_id": "UNKNOWN_APP",
"app_metadata": "",
"participant": "6",
"topic": "5",
"locators": ["0"],
Expand Down Expand Up @@ -275,7 +278,8 @@
"name": "datareader_0",
"guid": "01.0f.00.00.00.00.00.00.00.00.00.00|00.00.00.00",
"qos": {"qos": "empty"},

"app_id": "UNKNOWN_APP",
"app_metadata": "",
"participant": "6",
"topic": "5",
"locators": ["0"],
Expand Down
236 changes: 85 additions & 151 deletions docs/code/graph_example.json
Original file line number Diff line number Diff line change
@@ -1,168 +1,102 @@
{
"kind": "domain",
"domain": "0",
"topics":
{
"5":
{
"kind": "topic",
"metatraffic": false,
"alias": "HelloWorld"
}
},
"hosts":
[
{
"2":
{
"entity_id": "1",
"name": "example_host",
"kind": "host",
"metatraffic": false,
"alias": "example_host_alias",
"alive": true,
"status": 0,
"status": "OK",
"users":
[
{
"3":
{
"entity_id": "2",
"name": "example_user",
"kind": "user",
"metatraffic": false,
"alias": "example_user_alias",
"alive": true,
"status": 0,
"status": "OK",
"processes":
[
{
"4":
{
"entity_id": "3",
"name": "example_process_1",
"alias": "example_process_1_alias",
"alive": true,
"status": 0,
"pid": "9564",
"kind": "process",
"metatraffic": false,
"alias": "example_process1_alias",
"pid": "1234",
"status": "OK",
"participants":
[
"4"
]
{
"1":
{
"kind": "participant",
"metatraffic": false,
"alias": "example_participant1_alias",
"status": "OK",
"app_id": "UNKNOWN_APP",
"app_metadata": "",
"endpoints":
{
"6":
{
"kind": "datawriter",
"app_id": "UNKNOWN_APP",
"app_metadata": "",
"metatraffic": false,
"alias": "example_publisher_alias",
"status": "OK",
"topic": "5"
}
}
}
}
},
"8":
{
"entity_id": "8",
"name": "example_process_2",
"alias": "example_process_2_alias",
"alive": true,
"status": 0,
"pid": "9565",
"kind": "process",
"metatraffic": false,
"alias": "example_process2_alias",
"pid": "1235",
"status": "OK",
"participants":
[
"9"
]
}
]
}
]
}
],
"locators":
[
{
"entity_id": "7",
"name": "127.0.0.1:7412",
"alias": "localhost_1",
"alive": true,
"status": 0,
"datareaders":
[
],
"datawriters":
[
"6"
]
},
{
"entity_id": "11",
"name": "127.0.0.1:7414",
"alias": "localhost_2",
"alive": true,
"status": 0,
"datareaders":
[
"10"
],
"datawriters":
[
]
}
],
"domains":
[
{
"entity_id": "0",
"name": "0",
"alias": "domain_0_alias",
"alive": true,
"status": 0,
"participants":
[
{
"entity_id": "4",
"name": "participant_1",
"alias": "participant_1_alias",
"alive": true,
"status": 0,
"guid": "01.0f.22.cd.59.64.04.00.02.00.00.00|00.00.01.c1",
"process": "3",
"datareaders":
[
],
"datawriters":
[
{
"entity_id": "6",
"name": "datawriter_1",
"alias": "datawriter_1_alias",
"alive": true,
"status": 0,
"guid": "01.0f.22.cd.59.64.04.00.02.00.00.00|00.00.01.03",
"topic": "5",
"locators":
[
"7"
]
}
]
},
{
"entity_id": "9",
"name": "participant_2",
"alias": "participant_2_alias",
"alive": false,
"status": 0,
"guid": "01.0f.22.cd.59.64.04.00.05.00.00.00|00.00.01.c1",
"process": "8",
"datareaders":
[
{
"entity_id": "10",
"name": "datareader_1",
"alias": "datareader_1_alias",
"alive": false,
"status": 0,
"guid": "01.0f.22.cd.59.64.04.00.05.00.00.00|00.00.01.04",
"topic": "5",
"locators":
[
"11"
]
{
"7":
{
"kind": "participant",
"metatraffic": false,
"alias": "example_participant2_alias",
"status": "OK",
"app_id": "UNKNOWN_APP",
"app_metadata": "",
"endpoints":
{
"9":
{
"kind": "datareader",
"app_id": "UNKNOWN_APP",
"app_metadata": "",
"metatraffic": false,
"alias": "example_subscriber_alias",
"status": "OK",
"topic": "5"
}
}
}
}
}
],
"datawriters":
[
]
}
],
"topics":
[
{
"entity_id": "5",
"name": "example_topic",
"alias": "example_topic_alias",
"alive": true,
"status": 0,
"data_type": "example_data_type",
"datareaders":
[
"10"
],
"datawriters":
[
"6"
]
}
}
]
}
}
]
}
}
3 changes: 2 additions & 1 deletion docs/code/host_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"name": "host_name",
"alias": "host_alias",
"alive": true,
"status": 0
"metatraffic": false,
"status": "OK"
}
4 changes: 3 additions & 1 deletion docs/code/locator_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"kind": "locator",
"name": "127.0.0.1:7412",
"alias": "localhost",
"alive": true
"alive": true,
"metatraffic": false,
"status": "OK"
}
5 changes: 4 additions & 1 deletion docs/code/participant_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"name": "participant_name",
"alias": "participant_alias",
"alive": true,
"status": 0,
"metatraffic": false,
"status": "OK",
"guid": "01.0f.22.cd.59.64.04.00.05.00.00.00|00.00.01.c1",
"qos": {
"available_builtin_endpoints": 3135,
Expand All @@ -27,6 +28,8 @@
"user_data": "656e636c6176653d2f3b00",
"vendor_id": "010f"
},
"app_id": "UNKNOWN_APP",
"app_metadata": "",
"locators":
[
"127.0.0.1:1234"
Expand Down
3 changes: 2 additions & 1 deletion docs/code/process_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "process_name",
"alias": "process_alias",
"alive": true,
"status": 0,
"metatraffic": false,
"status": "OK",
"pid": "9564"
}
3 changes: 2 additions & 1 deletion docs/code/topic_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "topic_name",
"alias": "topic_alias",
"alive": true,
"status": 0,
"metatraffic": false,
"status": "OK",
"data_type": "example_data_type"
}
3 changes: 2 additions & 1 deletion docs/code/user_info_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"name": "user_name",
"alias": "user_alias",
"alive": true,
"status": 0
"metatraffic": false,
"status": "OK"
}
Loading

0 comments on commit dc99fec

Please sign in to comment.