diff --git a/application-quality-reference-deployment/grafana/dashboards/bandit-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/bandit-dashboard.json index bcd0b79..f59e39f 100644 --- a/application-quality-reference-deployment/grafana/dashboards/bandit-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/bandit-dashboard.json @@ -3,9 +3,6 @@ "overwrite": false, "dashboard": { "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 10, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/grafana/dashboards/eoap-validator-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/eoap-validator-dashboard.json index 62f87fc..890b917 100644 --- a/application-quality-reference-deployment/grafana/dashboards/eoap-validator-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/eoap-validator-dashboard.json @@ -4,9 +4,6 @@ "dashboard": { "description": "Dashboard displaying the report generated by the [EO AP Validation tool](https://github.com/EOEPCA/app-package-validation).", "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 20, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/grafana/dashboards/flake8-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/flake8-dashboard.json index e9b27bd..0940e1e 100644 --- a/application-quality-reference-deployment/grafana/dashboards/flake8-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/flake8-dashboard.json @@ -3,9 +3,6 @@ "overwrite": false, "dashboard": { "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 8, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/grafana/dashboards/notebook-bp-validator-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/notebook-bp-validator-dashboard.json index 5ae587f..256b49c 100644 --- a/application-quality-reference-deployment/grafana/dashboards/notebook-bp-validator-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/notebook-bp-validator-dashboard.json @@ -4,9 +4,6 @@ "dashboard": { "description": "Dashboard for displaying Jupyter notebooks Best Practice Validation Reports", "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 13, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/grafana/dashboards/papermill-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/papermill-dashboard.json index fd49dbb..9e4ce2e 100644 --- a/application-quality-reference-deployment/grafana/dashboards/papermill-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/papermill-dashboard.json @@ -3,9 +3,6 @@ "overwrite": false, "dashboard": { "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 17, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/grafana/dashboards/trivy-dashboard.json b/application-quality-reference-deployment/grafana/dashboards/trivy-dashboard.json index b4efdac..00cfb66 100644 --- a/application-quality-reference-deployment/grafana/dashboards/trivy-dashboard.json +++ b/application-quality-reference-deployment/grafana/dashboards/trivy-dashboard.json @@ -3,9 +3,6 @@ "overwrite": false, "dashboard": { "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 15, "links": [ { "asDropdown": false, diff --git a/application-quality-reference-deployment/values.yaml b/application-quality-reference-deployment/values.yaml index ab416f6..9605115 100644 --- a/application-quality-reference-deployment/values.yaml +++ b/application-quality-reference-deployment/values.yaml @@ -17,7 +17,12 @@ global: application-quality: # Values for deploying the Application Quality Building Block in the EOEPCA Develop cluster. - publicUrl: "https://application-quality.develop.eoepca.org" + app: + name: "EOEPCA - Application Quality Service" + version: "" + date: "" + theme: "default" + debug: false namespace: application-quality @@ -25,14 +30,14 @@ application-quality: # Application Quality backend api: image: - repository: eoepca/eoepca-appquality-backend - tag: 2.0.0-rc5 + repository: nexus.spaceapplications.com/repository/docker-asb-public/eoepca/eoepca-appquality-backend + tag: 2026-08-31a # Application Quality frontend web: image: - repository: eoepca/eoepca-appquality-frontend - tag: 2.0.0-rc5 + repository: nexus.spaceapplications.com/repository/docker-asb-public/eoepca/eoepca-appquality-frontend + tag: 2026-08-19a publicUrl: "https://application-quality.develop.eoepca.org" persistence: @@ -122,6 +127,12 @@ application-quality: automations: enabled: false + github: + enabled: true + statusContext: "EOEPCA Application Quality / Quality Check" + statusDescription: "Application quality metrics met all threshold guidelines." + statusTargetURL: "https://application-quality.develop.eoepca.org" + # https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml grafana: rbac: diff --git a/helm/templates/api-configmap.yaml b/helm/templates/api-configmap.yaml index 8264389..26448d1 100644 --- a/helm/templates/api-configmap.yaml +++ b/helm/templates/api-configmap.yaml @@ -55,6 +55,8 @@ data: OIDC_OP_USER_ENDPOINT: {{ .Values.oidc.realmBaseUrl }}/protocol/openid-connect/userinfo OIDC_OP_JWKS_ENDPOINT: {{ .Values.oidc.realmBaseUrl }}/protocol/openid-connect/certs {{- end }} + + # Sonarqube {{- if .Values.sonarqube.enabled }} SONARQUBE_SERVER: {{ .Values.sonarqube.serverUrl }} SONARQUBE_TOKEN: {{ .Values.sonarqube.accessToken }} @@ -85,3 +87,29 @@ data: NOTIF_RESPONSE_SOURCE: {{ .Values.notifications.responseSource }} NOTIF_RESPONSE_TYPE_PREFIX: {{ .Values.notifications.responseTypePrefix }} {{- end }} + + # GitHub Integration + GITHUB_STATUS_ENABLED: {{ .Values.github.enabled | default false | quote }} + {{- if .Values.github.enabled }} + GITHUB_STATUS_CONTEXT: {{ .Values.github.statusContext }} + GITHUB_STATUS_DESCRIPTION: {{ .Values.github.statusDescription }} + GITHUB_STATUS_TARGET_URL: {{ .Values.github.statusTargetURL }} + {{- end }} + + settings.yaml: | + instance.name: {{ .Values.app.name | default "EOEPCA - Application Quality Service" | quote }} + instance.version: {{ .Values.app.version | default "-" | quote }} + instance.date: {{ .Values.app.date | default "-" | quote }} + instance.theme: {{ .Values.app.theme | default "default" | quote }} + debug.enabled: {{ .Values.app.debug | default false }} + user_manual.url: "https://eoepca.readthedocs.io/projects/application-quality/en/latest/usage/user-manual/" + source.url: "https://github.com/EOEPCA/application-quality/" + deployment_guide.url: "" + design.url: "https://eoepca.readthedocs.io/projects/architecture/en/latest/reference-architecture/application-quality-BB/" + sso.enabled: {{ .Values.oidc.enabled | default false }} + workspace.enabled: {{ .Values.workspace.enabled | default false }} + grafana.enabled: {{ .Values.grafana.enabled | default false }} + grafana.url: "{{ .Values.web.publicUrl }}/dashboards" + grafana.pipeline_executions.path: "/d/pipeline-executions/pipeline-executions?from=now-90d&to=now" + grafana.pipeline_execution.path: "/d/pipeline-execution/pipeline-execution?var-execution_id={execution_id}&var-pipeline_id={pipeline_name}" + grafana.pipeline_execution_report.path: "/d/default-{tool_name}-report/{tool_name}-report?var-pipeline_id={pipeline_name}&var-execution_id={execution_id}&var-report_id={report_id}&var-tool_name={tool_name}" diff --git a/helm/templates/api-deployment.yaml b/helm/templates/api-deployment.yaml index 3613260..8441aa5 100644 --- a/helm/templates/api-deployment.yaml +++ b/helm/templates/api-deployment.yaml @@ -49,6 +49,14 @@ spec: - secretRef: name: application-quality-grafana-dashboards-admin-creds {{- end }} + {{- if .Values.github.enabled }} + - secretRef: + name: application-quality-github-api-tokens + {{- end }} + volumeMounts: + - name: settings-volume + mountPath: /app/settings.yaml # prevents hiding existing /app content + subPath: settings.yaml resources: requests: memory: "256Mi" @@ -56,6 +64,13 @@ spec: limits: memory: "1Gi" cpu: "1000m" + volumes: + - name: settings-volume + configMap: + name: {{ include "application-quality.fullname" . }}-api-env + items: + - key: settings.yaml + path: settings.yaml {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/helm/values.yaml b/helm/values.yaml index 86b8fc4..4fdc8be 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -2,7 +2,12 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -publicUrl: "" +app: + name: "EOEPCA - Application Quality Service" + version: "" + date: "" + theme: "default" + debug: false ingress: enabled: false @@ -145,6 +150,12 @@ sonarqube: serverUrl: "" accessToken: "" +github: + enabled: false + statusContext: "EOEPCA Application Quality / Quality Check" + statusDescription: "Application quality metrics met all threshold guidelines." + statusTargetURL: "" + nodeSelector: {} tolerations: []