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
commit bbe2c5eed297f7e9aff7217c015e38a3f6b9c4c3 Author: bodnarmykola <[email protected]> AuthorDate: Tue Mar 31 23:04:22 2020 +0300 [DLAB-1565]: [Azure] - billing on local endpoint updated --- services/billing-azure/billing.yml | 104 ++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 35 deletions(-) diff --git a/services/billing-azure/billing.yml b/services/billing-azure/billing.yml index aec73ce..5361d90 100644 --- a/services/billing-azure/billing.yml +++ b/services/billing-azure/billing.yml @@ -19,40 +19,74 @@ # # ****************************************************************************** -# Authentication info - -# Explicit azure authentication parameters -clientId: <CLIENT_ID> -clientSecret: <CLIENT_SECRET> -tenantId: <TENANT_ID> -subscriptionId: <SUBSCRIPTION_ID> - -# Contains authentication info (clientId, clientSecret, tenantId, subscriptionId) received after Azure CLI authentication -# Overrides explicit azure authentication parameters above -authenticationFile: <AUTHENTICATION_FILE> - -# Billing configuration for RateCard API. For more details please see https://msdn.microsoft.com/en-us/library/mt219004.aspx -offerNumber: <OFFER_NUMBER> -currency: <CURRENCY> -locale: <LOCALE> -regionInfo: <REGION_INFO> - -# Azure provides with aggregated data by date. Scheduler tries to retrieve data every <period> with <initialDelay> from -# application startup in minutes. -# Scheduler retrieves data only for the past period of time from midnight of start day to midnight of end date. -# Scheduler does not retrieve data for the current date -initialDelay: 10 -period: 60 - -billingEnabled: false - -aggregationOutputMongoDataSource: - host: localhost - port: 27017 +spring: + main: + allow-bean-definition-overriding: true + data: + mongodb: + username: admin + password: MONGO_PASSWORD + database: dlabdb + port: MONGO_PORT + host: MONGO_HOST + +server: + port: 8088 + servlet: + contextPath: /api/billing + +server.ssl.key-store-type: JKS +server.ssl.key-store: /home/OS_USER/keys/ssn.keystore.jks +server.ssl.key-store-password: KEY_STORE_PASSWORD +server.ssl.key-alias: ssn + +logging: + file: /var/opt/dlab/log/ssn/billing.log + level: + com: + epam: trace + +keycloak: + bearer-only: true + realm: dlab + resource: KEYCLOAK_CLIENT_ID + credentials.secret: KEYCLOAK_CLIENT_SECRET + ssl-required: none + auth-server-url: KEYCLOAK_AUTH_SERVER_URL + +dlab: + sbn: SERVICE_BASE_NAME + billingEnabled: true + + # Authentication info + + # Explicit azure authentication parameters + clientId: CLIENT_ID + clientSecret: CLIENT_SECRET + tenantId: TENANT_ID + subscriptionId: SUBSCRIPTION_ID + + # Contains authentication info (clientId, clientSecret, tenantId, subscriptionId) received after Azure CLI authentication + # Overrides explicit azure authentication parameters above + authenticationFile: AUTHENTICATION_FILE + # Billing configuration for RateCard API. For more details please see https://msdn.microsoft.com/en-us/library/mt219004.aspx + offerNumber: OFFER_NUMBER + currency: CURRENCY + locale: LOCALE + regionInfo: REGION_INFO + + # Azure provides with aggregated data by date. Scheduler tries to retrieve data every <period> with <initialDelay> from + # application startup in minutes. + # Scheduler retrieves data only for the past period of time from midnight of start day to midnight of end date. + # Scheduler does not retrieve data for the current date + initialDelay: 10 + period: 60 + aggregationOutputMongoDataSource: + host: MONGO_HOST + port: MONGO_PORT username: admin - password: <MONGODB_PASSWORD> + password: MONGO_PASSWORD database: dlabdb - -ssnStorageAccountTagName: <AZURE_SSN_STORAGE_ACCOUNT_TAG> -sharedStorageAccountTagName: <AZURE_SHARED_STORAGE_ACCOUNT_TAG> -datalakeTagName: <AZURE_DATALAKE_TAG> \ No newline at end of file + ssnStorageAccountTagName: <AZURE_SSN_STORAGE_ACCOUNT_TAG> + sharedStorageAccountTagName: <AZURE_SHARED_STORAGE_ACCOUNT_TAG> + datalakeTagName: <AZURE_DATALAKE_TAG> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
