This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1565-aws
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1565-aws by this push:
new 131823d [DLAB-1565]: [Aws] - billing on local endpoint updated
131823d is described below
commit 131823d5f5f44cddf2ce4a97e0fdef156211c2d4
Author: bodnarmykola <[email protected]>
AuthorDate: Wed Apr 1 09:51:44 2020 +0300
[DLAB-1565]: [Aws] - billing on local endpoint updated
---
.../terraform/bin/deploy/billing_aws.yml | 1 +
services/billing-aws/billing.yml | 33 +++++++++++-----------
.../billing-aws/src/main/resources/application.yml | 16 +++++------
3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/billing_aws.yml
b/infrastructure-provisioning/terraform/bin/deploy/billing_aws.yml
index adaa501..b3b5150 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/billing_aws.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/billing_aws.yml
@@ -57,6 +57,7 @@ adapterOut:
database: dlabdb
# bufferSize: 10000
upsert: true
+ serviceBaseName: SERVICE_BASE_NAME
# Filter for source and converted data.
filter:
diff --git a/services/billing-aws/billing.yml b/services/billing-aws/billing.yml
index 510411f..9175c98 100644
--- a/services/billing-aws/billing.yml
+++ b/services/billing-aws/billing.yml
@@ -26,10 +26,10 @@
billingEnabled: true
-host: localhost
+host: MONGO_HOST
port: 27017
username: admin
-password: <MONGODB_PASSWORD>
+password: MONGO_PASSWORD
database: dlabdb
scheduler:
@@ -40,30 +40,31 @@ scheduler:
# Adapter for reading source data. Known types: file, s3file
adapterIn:
- type: s3file
- bucket: <BILLING_BUCKET_NAME>
- path: <REPORT_PATH>
- awsJobEnabled: <AWS_JOB_ENABLED>
- accountId: <ACCOUNT_ID>
- accessKeyId: <ACCESS_KEY_ID>
- secretAccessKey: <SECRET_ACCESS_KEY>
+ bucket: BILLING_BUCKET_NAME
+ path: REPORT_PATH
+ awsJobEnabled: AWS_JOB_ENABLED
+ accountId: ACCOUNT_ID
+ accessKeyId: ACCESS_KEY_ID
+ secretAccessKey: SECRET_ACCESS_KEY
# Adapter for writing converted data. Known types: console, file, s3file,
mongodb
adapterOut:
- type: mongodlab
- host: localhost
+ host: MONGO_HOST
port: 27017
username: admin
- password: <MONGODB_PASSWORD>
+ password: MONGO_PASSWORD
database: dlabdb
# bufferSize: 10000
upsert: true
+ serviceBaseName: SERVICE_BASE_NAME
# Filter for source and converted data.
filter:
- type: aws
currencyCode: USD
- columnDlabTag: <CONF_BILLING_TAG>
- serviceBaseName: <CONF_SERVICE_BASE_NAME>
+ columnDlabTag: CONF_BILLING_TAG
+ serviceBaseName: SERVICE_BASE_NAME
# Parser of source data to common format.
@@ -72,9 +73,9 @@ parser:
headerLineNo: 1
skipLines: 1
columnMapping: >-
- dlab_id=<DLAB_ID>;usage_date=<USAGE_DATE>;product=<PRODUCT>;
- usage_type=<USAGE_TYPE>;usage=<USAGE>;cost=<COST>;
- resource_id=<RESOURCE_ID>;tags=<TAGS>
+ dlab_id=DLAB_ID;usage_date=USAGE_DATE;product=PRODUCT;
+ usage_type=USAGE_TYPE;usage=USAGE;cost=COST;
+ resource_id=RESOURCE_ID;tags=TAGS
aggregate: day
@@ -95,4 +96,4 @@ logging:
currentLogFilename: /var/opt/dlab/log/ssn/billing.log
archive: true
archivedLogFilenamePattern:
/var/opt/dlab/log/ssn/billing-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 10
+ archivedFileCount: 10
\ No newline at end of file
diff --git a/services/billing-aws/src/main/resources/application.yml
b/services/billing-aws/src/main/resources/application.yml
index 8af84e1..4fe0b75 100644
--- a/services/billing-aws/src/main/resources/application.yml
+++ b/services/billing-aws/src/main/resources/application.yml
@@ -4,10 +4,10 @@ spring:
data:
mongodb:
username: admin
- password: admin
+ password: MONGO_PASSWORD
database: dlabdb
port: 27017
- host: localhost
+ host: MONGO_HOST
server:
port: 8088
@@ -15,8 +15,8 @@ server:
contextPath: /api/billing
server.ssl.key-store-type: JKS
-server.ssl.key-store: /Users/ofuks/keys/dlabcert/billing.jks
-server.ssl.key-store-password: KEYSTORE_PASSWORD
+server.ssl.key-store: /home/OS_USER/keys/endpoint.keystore.jks
+server.ssl.key-store-password: KEY_STORE_PASSWORD
server.ssl.key-alias: endpoint
logging:
@@ -27,8 +27,8 @@ logging:
keycloak:
bearer-only: true
- realm: DLAB_bhliva
- resource: sss
- credentials.secret: cf5a484b-039b-4161-8707-ad65c0f25962
+ realm: dlab
+ resource: KEYCLOAK_CLIENT_ID
+ credentials.secret: CLIENT_SECRET
ssl-required: none
- auth-server-url: http://52.11.45.11:8080/auth
\ No newline at end of file
+ auth-server-url: KEYCLOAK_AUTH_SERVER_URL
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]