diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59e26b307..63525088b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,9 @@ include: file: '/salt-deploy/helper.yml' - project: 'pluralsight/experience/gitlab-helpers' file: '/helm-deploy/helper.yml' + - project: 'pluralsight/Technology/adapt/data-platform/gitlab-fragments/snyk' + ref: main + file: 'snyk-check.yml' image: openjdk:8 @@ -30,6 +33,11 @@ variables: Version: *[[BUILD_VERSION]]* [[PIPELINE_LINK]] SLACK_USERNAME: 'GITLAB' + SNYK_SLACK_CHANNEL: '#dataops-snyk-vulnerability-alerts' + SNYK_SLACK_ICON_EMOJI: ":snyk:" + SNYK_ORG_ID: "d8094638-7a37-413f-b1b4-ad840fb9e239" + SNYK_PROJECT_ID: "d243a0e6-4ced-4efe-83fc-169d03b40cc7" + SNYK_PROJECT_URL: "https://app.snyk.io/org/ps-data-services" before_script: - apt-get update -yqq @@ -43,6 +51,7 @@ before_script: stages: - build + - code-analysis - package - publish - deploy_dev diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 000000000..120fdfebc --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,20 @@ +apiVersion: pluralsight/v1 +kind: BC +metadata: + name: adapt-dvs +spec: + lifecycle: production + owner: exp_adapt_dvs + responsibilities: + - Shared component for hydra + systems: + - adapt-dvs +--- +apiVersion: backstage.io/v1alpha1 +kind: System +metadata: + name: adapt-dvs + tags: [] +spec: + lifecycle: production + owner: exp_adapt_dvs diff --git a/ingest/src/main/resources/log4j2.xml b/ingest/src/main/resources/log4j2.xml index c5d7947f7..4b59d7556 100644 --- a/ingest/src/main/resources/log4j2.xml +++ b/ingest/src/main/resources/log4j2.xml @@ -14,12 +14,15 @@ ~ limitations under the License. --> + + /var/log/hydra + - + %d{yyyy-MM-dd HH:mm:ss} %-5p (%C:%L) - %m%n @@ -28,25 +31,41 @@ + + + %d{yyyy-MM-dd HH:mm:ss} %-5p (%C:%L) - %m%n + + + + + + + + + + + +