Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync develop to master #258

Merged
merged 51 commits into from
Sep 11, 2024
Merged

Sync develop to master #258

merged 51 commits into from
Sep 11, 2024

Conversation

SaikrishnaBairamoni
Copy link
Contributor

PR Details

Sync the develop branch with the master branch after completing the Neon WFD release.

Description

Related GitHub Issue

Related Jira Key

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

abey-yoseph and others added 30 commits March 31, 2023 12:40
Fix UI confirm topics send the old topic list
* initial queue implementation cc bridge

* add some comments

* cc bridge simplify logic
* init

* add comments

* fix warning

* update text
…alues prevents writing to influx (#140)

<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
Data type conflict on message fields with intermittent alphanumeric
values prevents writing to influx
<!--- Describe your changes in detail -->

## Related Issue
#138
<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. -->
# PR Details
## Description
Updating log levels in vehicle nats bridge, and update docker log size
parameter in docker.compose.units.yml

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context
WFD Verification testing 
<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
Local
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x ] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. -->
# PR Details
## Description
Need to update the log size parameter on the messaging server images

<!--- Describe your changes in detail -->

## Related Issue
#137 

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context
WFD Data Analysis
<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
Local
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
There are a few more fields that were stored as string, but the incoming
message is of type float.

<!--- Describe your changes in detail -->

![image](https://user-images.githubusercontent.com/62157949/235765847-eb3fe9f9-1bda-44b7-b632-f5b3012bd9c2.png)

## Related Issue
#138
#145

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
NA
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
drop fields with NaN values
update messaging server local deployment service name
dan-du-car and others added 19 commits July 22, 2024 11:12
* init

* init

* update variable name
* update env variables

* update local influxdb retention policy

* address comments
remove thread interrupts
* fix script

* update readme

* remove comments

* update

* Update README.md

* Update README.md

* add next line

* update

* remove branch specific instruction

* address comments

* address comments

* update readme

* update readme
* add script for historical data processing log parser

* address comments

* address comments

* add comments

* update README
* initial queue implementation cc bridge

* add some comments

* fix unsub logic (#126)

* init

* cc bridge simplify logic

* Cloud bridge investigation (#131)

* initial queue implementation cc bridge

* add some comments

* cc bridge simplify logic

* back to queue, add in file listener

* Fix unit status and UI notification and event live status (#129)

* init

* add comments

* fix warning

* update text

* Remove credentials (#134)

* updating log levels, docker compose log size parameter

* revert local changes

* init

* remove hardcoded values

* add analysis scripts

* messaging server log size parameter

* init

* add nan

* Fix json key value convertor logic (#146)

fix comparison

* Fix/drop nan value fields (#148)

drop fields with NaN values

* clean up readme.md

* fix merge conflicts

* fix - revert change

* revert imports

---------

Co-authored-by: Abey <abey.yoseph@leidos.com>
Co-authored-by: dan-du-car <dan.du@leidos.com>
Co-authored-by: abey-yoseph <59704440+abey-yoseph@users.noreply.github.com>
Co-authored-by: dan-du-car <62157949+dan-du-car@users.noreply.github.com>
Co-authored-by: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com>
Co-authored-by: Cody Garver <codygarver@users.noreply.github.com>
* initial queue implementation cc bridge

* add some comments

* fix unsub logic (#126)

* init

* cc bridge simplify logic

* Cloud bridge investigation (#131)

* initial queue implementation cc bridge

* add some comments

* cc bridge simplify logic

* back to queue, add in file listener

* Fix unit status and UI notification and event live status (#129)

* init

* add comments

* fix warning

* update text

* Remove credentials (#134)

* updating log levels, docker compose log size parameter

* revert local changes

* init

* remove hardcoded values

* add analysis scripts

* messaging server log size parameter

* init

* add nan

* Fix json key value convertor logic (#146)

fix comparison

* Fix/drop nan value fields (#148)

drop fields with NaN values

* clean up readme.md

* fix conflict

* revert change - function redefinition

---------

Co-authored-by: Abey <abey.yoseph@leidos.com>
Co-authored-by: dan-du-car <dan.du@leidos.com>
Co-authored-by: abey-yoseph <59704440+abey-yoseph@users.noreply.github.com>
Co-authored-by: dan-du-car <62157949+dan-du-car@users.noreply.github.com>
Co-authored-by: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com>
Co-authored-by: Cody Garver <codygarver@users.noreply.github.com>
@SaikrishnaBairamoni SaikrishnaBairamoni merged commit c028674 into develop Sep 11, 2024
16 checks passed
@SaikrishnaBairamoni SaikrishnaBairamoni deleted the sync-develop-to-master branch September 19, 2024 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants