Skip to content

Reverse merge of 2026-Apr release into dev - #434

Merged
markmac99 merged 15 commits into
devfrom
master
Apr 23, 2026
Merged

Reverse merge of 2026-Apr release into dev#434
markmac99 merged 15 commits into
devfrom
master

Conversation

@markmac99

Copy link
Copy Markdown
Collaborator

No description provided.

markmac99 and others added 15 commits December 11, 2025 23:46
and avoid doing yearly plots every day
Merging in most recent dev changes
rename samfunctions folder to lambdas
* remove disused code

* update livestream to accept normal RMS filenames

* search dialog - fix bug and set default date range

* small change to explain default dates

* improvement in live image search

* remove redundant file

* update deployment scripts

* improvements in routine to convert GMN report to pandas

* more analysis of gmn data
* remove disused code

* update livestream to accept normal RMS filenames

* search dialog - fix bug and set default date range

* small change to explain default dates

* improvement in live image search

* remove redundant file

* update deployment scripts

* improvements in routine to convert GMN report to pandas

* more analysis of gmn data

* Update the terraform a little

* remove hardcoded reference to ec2-user

* add SERVERUSERID env /ssm variable for calcserver user id

* update container for new distrib-processing method

* use calcserver SERVERUSERID variable

* support for test ECS containers

* fix paths in deployment scripts

* remove unused file

* missed some templates

* update dev/test env settings

* remove disused file

* make sure paths are expanded

* fixing various config issues

* updates to makeConfig

* updates to distributed processing to align with newest wmpl

* add a comment to explain what the code does

* remove json db

* update consolidation to handle sqlite dbs

* remove unused function

* create data for daily report

* remove unused file

* update to call new version of reportOfLatestMatches

* add test variables

* mildly improve doco

* put test logs in the right CW log group

* handle missing log groups better

* extra value in TrajQualityParams

* bugfixes revealed in testing

* fix issues in reportOfLatestMatches

* put container dbs in a sensible place

* catch logging errors

* tidy up file locations

* simplify calcserver start up

* sorting out errors in container logging

* update container logging info

* avoid unnecessary error

* fix bugs in log capture process

* add MAX_STNS so i can experiement with limits

* add logging.
Add max_stns to constraints and set to 9999
push logs to s3
copy calcserver logs to ukmonhelper

* don't pull or push the databases from S3 during distribution
but do back them up after consolidation

* catch error if trajpickle can't be found

* set rundate more safely
move some processes into nightlyJob to make testing easier

* tidy up backup file names and housekeep backup folder

* move some processes from findAllMatches to nightlyJob to make testing easier

* support for testing of createExecReplot

* pass testmode to createExecReplot

* ensure logs are unique and capture container logs

* realigning createFireballPage with prod. Updating gitignore

* remove verbosity flag from one tar operation

* fixup to handle new style log with datestamps

* get privip after restarting calcserver

* temporarily don't run rerunFailedLambdas in test

* update to work in a test env too

* add 'period' to the match summary api

* add period to match summary api

* re-enabling rerunFailedLambdas

* quieten an S3 transfer

* include the foldername when reporting on container progress

* put daily trajdb in a safe place

* be more specific when finding the daily log

* only tar the current container logs

* save daily obsdb in the right place

* rename ec2.tf to calcserver.tf

* quieten some s3 transfers

* rename ec2.tf in my acct to ukmonhelper_ec2.tf to make it clearer what it is

* update SSM params to reflect new serverid

* bugfix in distributeCandidates - using wrong path

* add newline to getCostMetrics

* weird bug in statsToMqtt

* bugfix in update_wmpl.sh for traj container

* Script to create an AMI for the calcengine

* exclude test data when syncing from s3

* writing databases and logs to the wrong target

* bad test on istest

* typo in serveruserid

* adding to server migration notes

* purge old rawcsvs and fullcsvs older than 180 days

* improved housekeeping of old data

* make sure we scoop up data for 31/12

* stop creation of an unused set of files

* change default locations for container data

* put container logs in the right place

* update dockerfile syntax

* change locations of test container data and output

* remove incorrect comments

* Add script to clean up deleted/duplicate trajs

* simplify the stats gathering and move to python
fix bug in getMatchStats

* comment out unused files

* update reportOfLatestMatches to exclude deleted trajectories

* add scp to requirements

* add SQL database maintenance to dataMaintenance

* incorrect default for datadir

* update call to pymysql.connect

* ensure consolidateOutput rerunnable for prior years

* upgrading WMPL

* update gitignore a bit

* bugfix to catch data from 31/12 each year

* add paramiko to dependencies for matchPickle to support wmpl upgrade

* update getpickle to newest WMPL

* bugfix in api tests
* remove disused code

* update livestream to accept normal RMS filenames

* search dialog - fix bug and set default date range

* small change to explain default dates

* improvement in live image search

* remove redundant file

* update deployment scripts

* improvements in routine to convert GMN report to pandas

* more analysis of gmn data

* Update the terraform a little

* remove hardcoded reference to ec2-user

* add SERVERUSERID env /ssm variable for calcserver user id

* update container for new distrib-processing method

* use calcserver SERVERUSERID variable

* support for test ECS containers

* fix paths in deployment scripts

* remove unused file

* missed some templates

* update dev/test env settings

* remove disused file

* make sure paths are expanded

* fixing various config issues

* updates to makeConfig

* updates to distributed processing to align with newest wmpl

* add a comment to explain what the code does

* remove json db

* update consolidation to handle sqlite dbs

* remove unused function

* create data for daily report

* remove unused file

* update to call new version of reportOfLatestMatches

* add test variables

* mildly improve doco

* put test logs in the right CW log group

* handle missing log groups better

* extra value in TrajQualityParams

* bugfixes revealed in testing

* fix issues in reportOfLatestMatches

* put container dbs in a sensible place

* catch logging errors

* tidy up file locations

* simplify calcserver start up

* sorting out errors in container logging

* update container logging info

* avoid unnecessary error

* fix bugs in log capture process

* add MAX_STNS so i can experiement with limits

* add logging.
Add max_stns to constraints and set to 9999
push logs to s3
copy calcserver logs to ukmonhelper

* don't pull or push the databases from S3 during distribution
but do back them up after consolidation

* catch error if trajpickle can't be found

* set rundate more safely
move some processes into nightlyJob to make testing easier

* tidy up backup file names and housekeep backup folder

* move some processes from findAllMatches to nightlyJob to make testing easier

* support for testing of createExecReplot

* pass testmode to createExecReplot

* ensure logs are unique and capture container logs

* realigning createFireballPage with prod. Updating gitignore

* remove verbosity flag from one tar operation

* fixup to handle new style log with datestamps

* get privip after restarting calcserver

* temporarily don't run rerunFailedLambdas in test

* update to work in a test env too

* add 'period' to the match summary api

* add period to match summary api

* re-enabling rerunFailedLambdas

* quieten an S3 transfer

* include the foldername when reporting on container progress

* put daily trajdb in a safe place

* be more specific when finding the daily log

* only tar the current container logs

* save daily obsdb in the right place

* rename ec2.tf to calcserver.tf

* quieten some s3 transfers

* rename ec2.tf in my acct to ukmonhelper_ec2.tf to make it clearer what it is

* update SSM params to reflect new serverid

* bugfix in distributeCandidates - using wrong path

* add newline to getCostMetrics

* weird bug in statsToMqtt

* bugfix in update_wmpl.sh for traj container

* Script to create an AMI for the calcengine

* exclude test data when syncing from s3

* writing databases and logs to the wrong target

* bad test on istest

* typo in serveruserid

* adding to server migration notes

* purge old rawcsvs and fullcsvs older than 180 days

* improved housekeeping of old data

* make sure we scoop up data for 31/12

* stop creation of an unused set of files

* change default locations for container data

* put container logs in the right place

* update dockerfile syntax

* change locations of test container data and output

* remove incorrect comments

* Add script to clean up deleted/duplicate trajs

* simplify the stats gathering and move to python
fix bug in getMatchStats

* comment out unused files

* update reportOfLatestMatches to exclude deleted trajectories

* add scp to requirements

* add SQL database maintenance to dataMaintenance

* incorrect default for datadir

* update call to pymysql.connect

* ensure consolidateOutput rerunnable for prior years

* upgrading WMPL

* update gitignore a bit

* bugfix to catch data from 31/12 each year

* add paramiko to dependencies for matchPickle to support wmpl upgrade

* update getpickle to newest WMPL

* bugfix in api tests

* bugfix - changes to dailydb not saved

* improvements to process to cleanup deleted trajs

* after merging, check and remove any duplicate trajectories from the sqlite db and disk

* Adding version

* bump version 2025.11.1 -> 2026.04.0

* update files containing vesion

* bump version 2026.04.0 -> 2026.04.1

* unmangling side effets of automerge

* correct usage message
@markmac99
markmac99 merged commit fe38a04 into dev Apr 23, 2026
2 checks passed
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.

1 participant