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

Merging From DEV to MAIN #575

Merged
merged 50 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0fca0ad
openshift build config for debezium-jdbc
jaise-aot Oct 26, 2023
fc08c79
parameterized env vars
jaise-aot Oct 26, 2023
0c90d82
fix for version format
jaise-aot Oct 27, 2023
61ed7b3
fix format issue
jaise-aot Oct 27, 2023
02469ee
try with hard coded var
jaise-aot Oct 27, 2023
09417d2
hard code version
jaise-aot Oct 27, 2023
f0f2ed2
build config for postgis
jaise-aot Oct 27, 2023
8147541
path correction
jaise-aot Oct 27, 2023
ff6770f
adding the template files-backupcontainers (#558)
sakthi-aot Oct 30, 2023
e2651c3
update fix the nom/nir form
midhun-aot Oct 31, 2023
1d7cd54
Merge pull request #560 from bcgov/fix-nir-nom
nikhila-aot Oct 31, 2023
4a8e554
fix visibility column displayed for site-owner
midhun-aot Oct 31, 2023
4067551
removed stamp section in DERA form
midhun-aot Oct 31, 2023
7bab7a7
Merge pull request #561 from bcgov/SRS-148
nikhila-aot Oct 31, 2023
3758c52
Merge pull request #562 from bcgov/SRS-120
nikhila-aot Oct 31, 2023
1595b39
fixed cssa-mgr notes vibility issue
midhun-aot Oct 31, 2023
4b6e6e9
Merge pull request #563 from bcgov/SRS-149
jaise-aot Oct 31, 2023
62361ad
rename build files
jaise-aot Nov 1, 2023
fb9589b
deploy files for kafka and zookeeper
jaise-aot Nov 1, 2023
f337b26
deploy config for postgis
jaise-aot Nov 2, 2023
0fcb48d
deploy config for oracle jdbc
jaise-aot Nov 2, 2023
c5ecfcc
visibility column fix for srcr form
midhun-aot Nov 2, 2023
b5794a0
Merge pull request #564 from bcgov/srs-148-srcr
jaise-aot Nov 2, 2023
73e3cc5
Email fix in SRCR individual form
midhun-aot Nov 2, 2023
49c92e3
Merge pull request #565 from bcgov/SRS-108-fix
jaise-aot Nov 2, 2023
04325a9
fixed notes visible for site-owner in sir
midhun-aot Nov 3, 2023
8961aee
fixed notes section for cssa manager
midhun-aot Nov 3, 2023
348df09
Merge pull request #566 from bcgov/srs-153
jaise-aot Nov 3, 2023
1fbc2b7
Merge pull request #567 from bcgov/SRS-154
jaise-aot Nov 3, 2023
55ee74c
removed email after cssa manager action and added proper role in note…
midhun-aot Nov 3, 2023
255c522
Merge pull request #568 from bcgov/SRS-155
jaise-aot Nov 3, 2023
dbe5240
execute permission to initdb.d
jaise-aot Nov 7, 2023
b948c2c
issue fix for 121
nikhila-aot Nov 7, 2023
da81763
fix for volume mount issue
jaise-aot Nov 7, 2023
370e496
unit test issue fix
nikhila-aot Nov 8, 2023
3faa995
Merge branch 'dev' into feat/srs-121
nikhila-aot Nov 8, 2023
d621a6d
Merge pull request #569 from bcgov/feat/srs-121
jaise-aot Nov 8, 2023
fc6c4b3
updated workflow to not to sent email for CSAP and CSAP society
midhun-aot Nov 10, 2023
8941e5d
Merge pull request #570 from bcgov/SRS-159
jaise-aot Nov 10, 2023
a7428dc
port and resource configurations
jaise-aot Nov 10, 2023
b794724
fixed next reviewer button not displayed for caseworker
midhun-aot Nov 15, 2023
82e348b
srs-164 changes to reduce debezium logs
jaise-aot Nov 15, 2023
7cccbe9
Merge pull request #572 from bcgov/SRS-161
jaise-aot Nov 15, 2023
5f70a6b
fixed lat/long validation and updated calender component
midhun-aot Nov 15, 2023
207ad45
Fixed site-owner not able to submit form
midhun-aot Nov 15, 2023
e97e5dc
Merge pull request #573 from bcgov/SRS-139-140
midhun-aot Nov 15, 2023
bdbd216
removed unused routes
jaise-aot Nov 16, 2023
810b4c7
cleanup build time files
jaise-aot Nov 16, 2023
e924081
fix: use i18next's hook to fetch translated content (#574)
eric-bcps Nov 16, 2023
66e0595
Merge pull request #571 from bcgov/feat/srs-26
jaise-aot Nov 16, 2023
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
6 changes: 4 additions & 2 deletions etl/debezium-jdbc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ WORKDIR /app/
COPY ./ ./
RUN mvn clean install

RUN echo "DEBEZIUM_VERSION is $DEBEZIUM_VERSION"


FROM debezium/connect:$DEBEZIUM_VERSION
FROM debezium/connect:1.9

ARG ORACLE_JDBC_VERSION
ARG ORACLE_JDBC_MD5
Expand All @@ -34,6 +34,8 @@ COPY --from=builder /app/target/*.jar $KAFKA_CONNECT_JDBC_DIR/
COPY --from=builder /app/lib/*.jar $KAFKA_CONNECT_JDBC_DIR/
COPY InstallCert.class .
COPY "InstallCert\$SavingTrustManager.class" .
COPY connect-log4j.properties /kafka/config/
COPY log4j.properties /kafka/config/

RUN java InstallCert --quiet "${ORACLE_DB_HOST}:${ORACLE_DB_PORT}"
RUN keytool -exportcert -alias "$ORACLE_DB_HOST-1" -keystore jssecacerts -storepass changeit -file oracle.cer
Expand Down
42 changes: 42 additions & 0 deletions etl/debezium-jdbc/connect-log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

log4j.rootLogger=ERROR, stdout, connectAppender

# Send the logs to the console.
#
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

# Send the logs to a file, rolling the file at midnight local time. For example, the `File` option specifies the
# location of the log files (e.g. ${kafka.logs.dir}/connect.log), and at midnight local time the file is closed
# and copied in the same directory but with a filename that ends in the `DatePattern` option.
#
log4j.appender.connectAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.connectAppender.DatePattern='.'yyyy-MM-dd-HH
log4j.appender.connectAppender.File=${kafka.logs.dir}/connect.log
log4j.appender.connectAppender.layout=org.apache.log4j.PatternLayout

# The `%X{connector.context}` parameter in the layout includes connector-specific and task-specific information
# in the log messages, where appropriate. This makes it easier to identify those log messages that apply to a
# specific connector.
#
connect.log.pattern=[%d] %p %X{connector.context}%m (%c:%L)%n

log4j.appender.stdout.layout.ConversionPattern=${connect.log.pattern}
log4j.appender.connectAppender.layout.ConversionPattern=${connect.log.pattern}

log4j.logger.org.apache.zookeeper=ERROR
log4j.logger.org.reflections=ERROR
23 changes: 23 additions & 0 deletions etl/debezium-jdbc/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
kafka.logs.dir=logs

log4j.rootLogger=INFO, stdout, appender

# Disable excessive reflection warnings - KAFKA-5229
log4j.logger.org.reflections=ERROR

# Disable excessive logging by consumers and producers.
log4j.logger.org.apache.kafka=ERROR
log4j.logger.org.apache.kafka.clients.consumer=WARN

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.threshold=INFO
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %X{dbz.connectorType}|%X{dbz.connectorName}|%X{dbz.connectorContext} %m [%c]%n


log4j.appender.appender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.appender.DatePattern='.'yyyy-MM-dd-HH
log4j.appender.appender.File=${kafka.logs.dir}/connect-service.log
log4j.appender.appender.layout=org.apache.log4j.PatternLayout
log4j.appender.appender.layout.ConversionPattern=%d{ISO8601} %-5p %X{dbz.connectorType}|%X{dbz.connectorName}|%X{dbz.connectorContext} %m [%c]%n

5 changes: 0 additions & 5 deletions etl/debezium-jdbc/target/classes/META-INF/MANIFEST.MF

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 3 additions & 1 deletion etl/debezium-postgis/15-3.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@ COPY --from=build /usr/share/postgresql/$PG_MAJOR/extension/decoderbufs.control
COPY postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample

# Copy the script which will initialize the replication permissions
COPY /docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
COPY /docker-entrypoint-initdb.d/init-permissions.sh /docker-entrypoint-initdb.d/init-permissions.sh

RUN chmod +x /docker-entrypoint-initdb.d/init-permissions.sh
2 changes: 1 addition & 1 deletion etl/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
build:
context: debezium-postgis/15-3.3
ports:
- "5432:5432"
- "7432:5432"
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
Expand Down
Loading
Loading