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

Deployment issue fixes for OCI - secor & Druid #1636

Merged
merged 56 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1394e66
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 20, 2023
a6fe4af
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 20, 2023
16fe19c
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 20, 2023
f6a9ce2
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 20, 2023
03a8bd5
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
6f6213e
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
fda6588
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
56661bf
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
661b05a
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
01858fa
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
33c89a3
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 21, 2023
23cb2f8
added cloud_storage_privatereports_bucketname variable
SadanandGowda Nov 21, 2023
b806412
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 22, 2023
521e900
Merge pull request #1 from SadanandGowda/csp_migration
sowmya-dixit Nov 22, 2023
d78959f
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 22, 2023
0e03d1b
Merge branch 'release-5.2.0' of github.com:sowmya-dixit/sunbird-data-…
sowmya-dixit Nov 22, 2023
e2208fb
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Nov 22, 2023
7719246
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 4, 2023
7927433
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 4, 2023
a558861
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 4, 2023
cd1fac6
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 4, 2023
5b2ad02
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 7, 2023
9493def
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 11, 2023
72d858c
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 12, 2023
1148923
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
f84ee02
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
4c85ce9
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
9d9f233
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
90fcbe1
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
c2c6b01
Merge branch 'release-5.2.0' of github.com:Sunbird-Obsrv/sunbird-data…
sowmya-dixit Dec 12, 2023
638b54d
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Dec 12, 2023
44a167b
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
5eb55a9
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
b0a8e26
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
eeb7318
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
983f7c0
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
9cdb8a1
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
fac5796
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
e0c98b0
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
224a28d
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
8d9bf15
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
eea48ed
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
38fa220
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
aaa4d9c
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
c0b1257
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 14, 2023
7816ef7
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 15, 2023
c7485ee
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 15, 2023
01c76bb
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 15, 2023
8a3ca37
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Dec 18, 2023
b55b126
Merge branch 'release-5.2.0' of github.com:Sunbird-Obsrv/sunbird-data…
sowmya-dixit Dec 18, 2023
db1a38b
Merge branch 'release-5.2.0' of github.com:Sunbird-Obsrv/sunbird-data…
sowmya-dixit Dec 19, 2023
cb3a1df
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Jan 30, 2024
6a7b72b
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Feb 6, 2024
7899b10
#OB-553 fix: Deployment issue fixes for OCI - Secor
sowmya-dixit Feb 6, 2024
bf76ef3
Merge branch 'release-5.2.0' of github.com:Sunbird-Obsrv/sunbird-data…
sowmya-dixit Feb 8, 2024
cfde6df
#OB-553 fix: Deployment issue fixes for OCI
sowmya-dixit Feb 8, 2024
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
2 changes: 1 addition & 1 deletion ansible/inventory/env/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ postgres:
db_port: 5432
db_admin_user: analytics
db_admin_password: "{{dp_vault_pgdb_admin_password}}"
dp_ssl: ""
dp_ssl: false
dp_db_name: analytics

postgres_address_space: 0.0.0.0/0 # Postgres trust address space
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/analytics-druid/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ default_druid_configs:
s3_bucket: "{{ cloud_storage_telemetry_bucketname }}"
s3_endpoint: "{{ cloud_private_storage_endpoint }}"
s3_segment_dir: "druid/raw/segments"
s3_path_like_access: "{{ cloud_storage_pathstyle_access }}"
s3_path_like_access: "{{ s3_path_style_access }}"
s3_v4_sign_region: "{{ cloud_private_storage_region }}"
#Logging the indexing logs to s3
s3_logging_bucket: "{{ cloud_storage_telemetry_bucketname }}"
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/helm_charts/secor/config/secor.common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ cloud.service={{ $.Values.storage_type }}

# AWS authentication credentials.
# Leave empty if using IAM role-based authentication with s3a filesystem.
aws.access.key=
aws.secret.key=
#aws.access.key=
#aws.secret.key=
aws.role=

# Optional Proxy Setting. Set to true to enable proxy
Expand All @@ -51,8 +51,8 @@ aws.proxy.http.port=
# secor.upload.manager.class.
#
# http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
aws.region=
aws.endpoint=
#aws.region=
#aws.endpoint=

# Toggle the AWS S3 client between virtual host style access and path style
# access. See http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ secor.kafka.group={{ get (get $.Values.secor_jobs $.Release.Name) "consumer_grou
secor.message.parser.class={{ get (get $.Values.secor_jobs $.Release.Name) "message_parser" }}

# S3 path where sequence files are stored.
secor.s3.path=
#secor.s3.path=

# Swift path where sequence files are stored.
secor.swift.path=secor_dev/partition
Expand Down Expand Up @@ -67,6 +67,6 @@ secor.max.file.age.policy=oldest
# currentTime - Time of upload in HH-mm format
# currentDate - Time of upload in YYYYMMDD format
# folder - Folder to use based on message id map lookup
secor.s3.output_file_pattern=
#secor.s3.output_file_pattern=

secor.partition.message.channel.identifier={{ get (get $.Values.secor_jobs $.Release.Name) "message_channel_identifier" }}
2 changes: 1 addition & 1 deletion kubernetes/helm_charts/secor/config/secor.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include=secor.common.properties
###############

# Name of the s3 bucket where log files are stored.
secor.s3.bucket=
#secor.s3.bucket=

###############
# Using Swift #
Expand Down
Loading