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.

Sign up for GitHub

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

feat: migrating report generator on Java scheduled job #16

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: migrating report generator on Java scheduled job #16

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a0366e9
fix: refactored generic models
andrea-deri Jan 10, 2025
ae86e99
feat: add first implementation of report generation
andrea-deri Jan 13, 2025
bec7cd1
feat: included weekly and monthly report generation
andrea-deri Jan 13, 2025
bee617d
feat: moved RE's entities
andrea-deri Jan 13, 2025
c96b8a7
feat: definiting cronjob-related deployment in Helm
andrea-deri Jan 13, 2025
65cfcc2
Bump to version 0.3.2-1-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 13, 2025
3e4c162
feat: definiting cronjob-related deployment in Helm
andrea-deri Jan 13, 2025
78317e4
fix: resolved wrong label
andrea-deri Jan 13, 2025
19ae83f
Bump to version 0.3.2-2-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 13, 2025
a5a2c16
fix: resolved wrong variable
andrea-deri Jan 13, 2025
8636d80
Bump to version 0.3.2-3-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 13, 2025
40ff61c
fix: adding log for cron trigger
andrea-deri Jan 13, 2025
950f96c
Bump to version 0.3.2-4-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 13, 2025
b20f86b
fix: removing duplicated param for cronjob
andrea-deri Jan 13, 2025
640afdc
Bump to version 0.3.2-5-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 13, 2025
da99e6f
fix: redefined cron expressions, including seconds
andrea-deri Jan 14, 2025
e62782c
Merge remote-tracking branch 'refs/remotes/origin/feat-migrate-report…
andrea-deri Jan 14, 2025
59d1455
Bump to version 0.3.2-6-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 14, 2025
4152ff7
fix: changed scheduling for cron jobs
andrea-deri Jan 15, 2025
ab87e64
Merge remote-tracking branch 'refs/remotes/origin/feat-migrate-report…
andrea-deri Jan 15, 2025
a140226
fix: updating log in order to made it mode descriptive
andrea-deri Jan 15, 2025
961b259
Bump to version 0.3.2-7-feat-migrate-report-generator [skip ci]
pagopa-github-bot Jan 15, 2025
777ffee
fix: updated comment
andrea-deri Jan 15, 2025
7b76e0b
fix: optimized query on RE events' container
andrea-deri Jan 16, 2025
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
8 changes: 6 additions & 2 deletions helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ apiVersion: v2
name: pagopa-wisp-converter-technical-support
description: A service that permits to handle converted WISP requests for technical support
type: application
version: 0.41.0
appVersion: 0.3.2
version: 0.45.0
appVersion: 0.3.2-4-feat-migrate-report-generator
dependencies:
- name: microservice-chart
version: 3.0.0
repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
- name: microservice-chart
version: 3.0.0
repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
alias: cron
52 changes: 45 additions & 7 deletions helm/values-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
microservice-chart:
microservice-chart: &microservice-chart
namespace: "nodo"
nameOverride: ""
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter-technical-support
tag: "0.3.2"
tag: "0.3.2-4-feat-migrate-report-generator"
pullPolicy: Always
livenessProbe:
httpGet:
Expand All @@ -27,7 +27,7 @@ microservice-chart:
type: ClusterIP
ports:
- 8080
ingress:
ingress: &ingress
create: true
host: "weudev.nodo.internal.dev.platform.pagopa.it"
path: /pagopa-wisp-converter-technical-support(/|$)(.*)
Expand All @@ -42,14 +42,14 @@ microservice-chart:
type: RuntimeDefault
securityContext:
allowPrivilegeEscalation: false
resources:
resources: &resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "768Mi"
cpu: "0.50"
autoscaling:
autoscaling: &autoscaling
enable: true
minReplica: 1
maxReplica: 1
Expand All @@ -61,7 +61,7 @@ microservice-chart:
# Required
type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
value: "75"
envConfig:
envConfig: &envConfig
WEBSITE_SITE_NAME: 'pagopawispconverterts' # required to show cloud role name in application insights
ENV: 'aks-dev'
APP_LOGGING_LEVEL: 'DEBUG'
Expand All @@ -73,7 +73,7 @@ microservice-chart:
DATAEXPLORER_URL: "https://pagopaddataexplorer.westeurope.kusto.windows.net"
secretProvider:
create: true
envSecrets:
envSecrets: &envSecret
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
Expand Down Expand Up @@ -112,3 +112,41 @@ microservice-chart:
pullPolicy: Always
envConfig: {}
envSecret: {}
# 1 - Standard service application
app:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
resources:
!!merge <<: *resources
envConfig:
!!merge <<: *envConfig
envSecret:
!!merge <<: *envSecret
# 2 - Only-cronjob application
cron:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
path: /pagopa-wisp-converter-technical-support-jobs(/|$)(.*)
resources:
!!merge <<: *resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "768Mi"
cpu: "0.50"
autoscaling:
!!merge <<: *autoscaling
enable: false
minReplica: 1
maxReplica: 1
envConfig:
!!merge <<: *envConfig
CRONJOB_REPORTGENERATION_ENABLED: 'false'
CRONJOB_REPORTGENERATION_DAILY_SCHEDULE: '00 01 * * *'
CRONJOB_REPORTGENERATION_WEEKLY_SCHEDULE: '00 06 * * 1'
CRONJOB_REPORTGENERATION_MONTHLY_SCHEDULE: '30 06 1 * *'
envSecret:
!!merge <<: *envSecret
54 changes: 47 additions & 7 deletions helm/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
microservice-chart:
microservice-chart: &microservice-chart
namespace: "nodo"
nameOverride: ""
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter-technical-support
tag: "0.3.2"
tag: "0.3.2-4-feat-migrate-report-generator"
pullPolicy: Always
livenessProbe:
httpGet:
Expand All @@ -27,7 +27,7 @@ microservice-chart:
type: ClusterIP
ports:
- 8080
ingress:
ingress: &ingress
create: true
host: "weuprod.nodo.internal.platform.pagopa.it"
path: /pagopa-wisp-converter-technical-support(/|$)(.*)
Expand All @@ -42,14 +42,14 @@ microservice-chart:
type: RuntimeDefault
securityContext:
allowPrivilegeEscalation: false
resources:
resources: &resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "768Mi"
cpu: "0.50"
autoscaling:
autoscaling: &autoscaling
enable: true
minReplica: 1
maxReplica: 2
Expand All @@ -61,7 +61,7 @@ microservice-chart:
# Required
type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
value: "75"
envConfig:
envConfig: &envConfig
WEBSITE_SITE_NAME: 'pagopawispconverterts' # required to show cloud role name in application insights
ENV: 'aks-prod'
APP_LOGGING_LEVEL: 'INFO'
Expand All @@ -71,9 +71,11 @@ microservice-chart:
COSMOS_URI: "https://pagopa-p-weu-nodo-wispconv-cosmos-account.documents.azure.com:443/"
COSMOS_READ_REGION: "North Europe"
DATAEXPLORER_URL: "https://pagopapdataexplorer.westeurope.kusto.windows.net"
CRONJOB_REPORTGENERATION_ENABLED: true
CRONJOB_REPORTGENERATION_DAILY_SCHEDULE: '00 01 * * *'
secretProvider:
create: true
envSecrets:
envSecrets: &envSecret
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
Expand Down Expand Up @@ -112,3 +114,41 @@ microservice-chart:
pullPolicy: Always
envConfig: {}
envSecret: {}
# 1 - Standard service application
app:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
resources:
!!merge <<: *resources
envConfig:
!!merge <<: *envConfig
envSecret:
!!merge <<: *envSecret
# 2 - Only-cronjob application
cron:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
path: /pagopa-wisp-converter-technical-support-jobs(/|$)(.*)
resources:
!!merge <<: *resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "1024Mi"
cpu: "0.50"
autoscaling:
!!merge <<: *autoscaling
enable: false
minReplica: 1
maxReplica: 1
envConfig:
!!merge <<: *envConfig
CRONJOB_REPORTGENERATION_ENABLED: 'true'
CRONJOB_REPORTGENERATION_DAILY_SCHEDULE: '00 01 * * *'
CRONJOB_REPORTGENERATION_WEEKLY_SCHEDULE: '00 06 * * 1'
CRONJOB_REPORTGENERATION_MONTHLY_SCHEDULE: '30 06 1 * *'
envSecret:
!!merge <<: *envSecret
52 changes: 45 additions & 7 deletions helm/values-uat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
microservice-chart:
microservice-chart: &microservice-chart
namespace: "nodo"
nameOverride: ""
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter-technical-support
tag: "0.3.2"
tag: "0.3.2-4-feat-migrate-report-generator"
pullPolicy: Always
livenessProbe:
httpGet:
Expand All @@ -27,7 +27,7 @@ microservice-chart:
type: ClusterIP
ports:
- 8080
ingress:
ingress: &ingress
create: true
host: "weuuat.nodo.internal.uat.platform.pagopa.it"
path: /pagopa-wisp-converter-technical-support(/|$)(.*)
Expand All @@ -42,14 +42,14 @@ microservice-chart:
type: RuntimeDefault
securityContext:
allowPrivilegeEscalation: false
resources:
resources: &resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "768Mi"
cpu: "0.50"
autoscaling:
autoscaling: &autoscaling
enable: true
minReplica: 1
maxReplica: 2
Expand All @@ -61,7 +61,7 @@ microservice-chart:
# Required
type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
value: "75"
envConfig:
envConfig: &envConfig
WEBSITE_SITE_NAME: 'pagopawispconverterts' # required to show cloud role name in application insights
ENV: 'aks-uat'
APP_LOGGING_LEVEL: 'INFO'
Expand All @@ -73,7 +73,7 @@ microservice-chart:
DATAEXPLORER_URL: "https://pagopaudataexplorer.westeurope.kusto.windows.net"
secretProvider:
create: true
envSecrets:
envSecrets: &envSecret
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
Expand Down Expand Up @@ -112,3 +112,41 @@ microservice-chart:
pullPolicy: Always
envConfig: {}
envSecret: {}
# 1 - Standard service application
app:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
resources:
!!merge <<: *resources
envConfig:
!!merge <<: *envConfig
envSecret:
!!merge <<: *envSecret
# 2 - Only-cronjob application
cron:
!!merge <<: *microservice-chart
ingress:
!!merge <<: *ingress
path: /pagopa-wisp-converter-technical-support-jobs(/|$)(.*)
resources:
!!merge <<: *resources
requests:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "1024Mi"
cpu: "0.50"
autoscaling:
!!merge <<: *autoscaling
enable: false
minReplica: 1
maxReplica: 1
envConfig:
!!merge <<: *envConfig
CRONJOB_REPORTGENERATION_ENABLED: 'true'
CRONJOB_REPORTGENERATION_DAILY_SCHEDULE: '00 01 * * *'
CRONJOB_REPORTGENERATION_WEEKLY_SCHEDULE: '00 06 * * 1'
CRONJOB_REPORTGENERATION_MONTHLY_SCHEDULE: '30 06 1 * *'
envSecret:
!!merge <<: *envSecret
2 changes: 1 addition & 1 deletion openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "A service that permits to handle converted WISP requests for technical support",
"termsOfService": "https://www.pagopa.gov.it/",
"title": "wisp-converter-technical-support",
"version": "0.3.2"
"version": "0.3.2-4-feat-migrate-report-generator"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>it.gov.pagopa</groupId>
<artifactId>wisp-converter-technical-support</artifactId>
<version>0.3.2</version>
<version>0.3.2-4-feat-migrate-report-generator</version>
<name>pagoPA WISP Converter Technical support</name>
<description>A service that permits to handle converted WISP requests for technical support</description>

Expand Down
Loading
Loading