Skip to content

Feature/v2x prometheus counts#233

Draft
Michael7371 wants to merge 237 commits into
developfrom
Feature/v2x-prometheus-counts
Draft

Feature/v2x prometheus counts#233
Michael7371 wants to merge 237 commits into
developfrom
Feature/v2x-prometheus-counts

Conversation

@Michael7371

Copy link
Copy Markdown
Collaborator

DRAFT PR

PR Details

Description

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:

  • My changes require new environment variables:
    • I have updated the docker-compose, K8s YAML, and all dependent deployment configuration files.
  • My changes require updates to the documentation:
    • I have updated the documentation accordingly.
  • My changes require updates and/or additions to the unit tests:
    • I have modified/added tests to cover my changes.
  • All existing tests pass.

John-Wiens and others added 30 commits March 14, 2025 10:43
This change moves the keycloak port and prefix into the .env file instead of assigning it in the docker-compose scripts. This allows greater configurability for deploying with https or at different ports.
Moving http and port of API to the .env file instead of the docker compose file. This allows greater flexibility when deploying with certificates or on alternate ports.
Replaced local MongoDB container definition with shared MongoDB configuration from `docker-compose-mongo.yml`. Updated dependencies and profiles to align with the new setup, simplifying and unifying service management.
The MongoDB initialization, index management, and volume management scripts were removed, along with the related Dockerfile and keyfile.
Changed `CM_MONGO_AUTH_DB` and `CM_DATABASE_NAME` values from `ConflictMonitor` to `CV` in the environment file.
Changed `CM_MONGO_AUTH_DB` to use the `admin` database. Updated default MongoDB usernames and passwords.
Changed the MongoDB database name from 'ConflictMonitor' to 'CV' and the authentication database from 'ConflictMonitor' to 'admin' in the application.yaml file.
Added the `SPRING_DATA_MONGODB_DATABASE` variable to the docker-compose file to configure the database name. This ensures proper connection setup for Spring Data MongoDB within the application.
Renamed the MongoDB database from `ConflictMonitor` to `CV` and updated the authentication database to `admin`.
Replaced hardcoded MongoDB auth database and database name with environment variables (`CM_MONGO_AUTH_DB` and `CM_DATABASE_NAME`) for better flexibility and configurability. Updated `connect_start.sh` and `docker-compose-conflictmonitor.yml` to reflect these changes.
Replaced hardcoded database name with an environment variable `${CM_DATABASE_NAME}` in both `application.yaml` and `application-test.yaml`.
Updated the documentation to include information about the `mongo` and `mongo-setup` services for the intersection API. Clarified that these services are provided by the jpo-utils repository and require the `mongo_full` profile to be enabled.
Modifying Standalone Deployment - Adding Endpoint/Keycloak/IP Distinctions
Replaced MongoDB credential variables with `MONGO_READ_WRITE_USER` and `MONGO_READ_WRITE_PASS` for consistency and clarity. Updated all relevant scripts, configuration files, and environment references to reflect.
Included instructions to generate a secure MongoDB keyfile string using OpenSSL.
jacob6838 and others added 27 commits July 23, 2025 12:46
Removing Unused Webapp Dependencies
Re-generating Sample Intersection Data
…n repository and controller, introduce LimitedGeoJsonResponse, and update tests accordingly.
…sentation, remove GeoJsonGeometry class, and update related tests for new structure.
…ometheus, add organization-level message count endpoint, and update related models and tests. Introduce MAX_QUERY_DURATION_DAYS environment variable to limit query duration. Update webapp to handle new message count structure.
…ountsRepository and related services. Update Prometheus queries for improved accuracy and introduce new PrometheusResponse model. Modify CountsController and tests to accommodate changes in message type handling.
@Michael7371 Michael7371 changed the base branch from develop to email-templating August 14, 2025 15:50
@Michael7371 Michael7371 changed the base branch from email-templating to develop August 14, 2025 15:51
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.

8 participants