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

Pvnet gsp sum #307

Merged
merged 2 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/modules/services/forecast_generic/ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ resource "aws_ecs_task_definition" "ecs-task-definition" {
{"name": "ENVIRONMENT", "value": var.environment},
{"name": "OCF_ENVIRONMENT", "value": var.environment},
{"name": "USE_ADJUSTER", "value": var.use_adjuster},
{"name": "SAVE_GSP_SUM", "value": var.pvnet_gsp_sum},
]

secrets : [
Expand Down
6 changes: 6 additions & 0 deletions terraform/modules/services/forecast_generic/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,10 @@ variable "use_adjuster" {
type = string
description = "Whether to use the adjuster"
default = "true"
}

variable "pvnet_gsp_sum" {
type = string
description = "Whether to make the pvnet_gsp_sum"
default = "false"
}
1 change: 1 addition & 0 deletions terraform/modules/services/internal_ui/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
ENVIRONMENT: $ENVIRONMENT
AUTH0_DOMAIN: $AUTH0_DOMAIN
AUTH0_CLIENT_ID: $AUTH0_CLIENT_ID
SHOW_PVNET_GSP_SUM: ${SHOW_PVNET_GSP_SUM}
container_name: ${EB_APP_NAME}
ports:
- 80:8501
6 changes: 6 additions & 0 deletions terraform/modules/services/internal_ui/eb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ resource "aws_elastic_beanstalk_environment" "eb-env" {
value = var.auth_config.auth0_domain
}

setting {
namespace = "aws:elasticbeanstalk:application:environment"
name = "SHOW_PVNET_GSP_SUM"
value = var.show_pvnet_gsp_sum
}

# =========== EB Settings =========== #

setting {
Expand Down
7 changes: 6 additions & 1 deletion terraform/modules/services/internal_ui/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,9 @@ variable "auth_config" {
auth0_client_id : "Auth0 Client id"
}
EOT
}
}

variable "show_pvnet_gsp_sum" {
description = "If to use the pvnet gsp sum"
default = "false"
}
1 change: 1 addition & 0 deletions terraform/modules/services/metrics/ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ resource "aws_ecs_task_definition" "metrics-task-definition" {

environment : [
{ "name" : "LOGLEVEL", "value" : "DEBUG"},
{ "name" : "USE_PVNET_GSP_SUM", "value" : var.use_pvnet_gsp_sum},
]

secrets : [
Expand Down
6 changes: 6 additions & 0 deletions terraform/modules/services/metrics/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ variable "docker_version" {
description = "The version of the docker that should be used"
default = "0.0.2"
}


variable "use_pvnet_gsp_sum" {
description = "If to use the pvnet gsp sum"
default = "false"
}
4 changes: 3 additions & 1 deletion terraform/nowcasting/development/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ module "metrics" {
database_secret = module.database.forecast-database-secret
docker_version = var.metrics_version
iam-policy-rds-read-secret = module.database.iam-policy-forecast-db-read
use_pvnet_gsp_sum = "true"
}


Expand Down Expand Up @@ -273,7 +274,7 @@ module "forecast_pvnet" {
datadir = "data/latest"
}
loglevel= "INFO"

pvnet_gsp_sum = "true"
}

module "analysis_dashboard" {
Expand All @@ -299,6 +300,7 @@ module "analysis_dashboard" {
auth0_domain = var.auth_domain
auth0_client_id = var.auth_dashboard_client_id
}
show_pvnet_gsp_sum = "true"
}

module "forecast_blend" {
Expand Down