X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-resources%2Fresources%2Fconfig%2Fapplication.properties;h=1b7bdf8ff634aac80855ebe800d14020d04a6a0c;hb=refs%2Fheads%2Fmaster;hp=817849fc48c3f4f9de44e0161c96948001395856;hpb=40cbf9be39f507e69e4a0b31b8f6ee5347a3c1a9;p=oom.git

diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index 817849fc48..7676475e73 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -28,13 +28,10 @@ spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 server.servlet.context-path=/
 
-spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
-spring.sleuth.messaging.jms.enabled = false
-spring.sleuth.trace-id128=true
-spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }}
-spring.sleuth.propagation.type=w3c, b3
-spring.sleuth.supports-join=false
-spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
+management.tracing.enabled={{ .Values.global.tracing.enabled }}
+management.tracing.sampling.probability={{ .Values.global.tracing.sampling.probability }}
+management.tracing.propagation.type=w3c, b3
+management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }}
 
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.keycloak.adapters.springboot.KeycloakAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 
@@ -50,16 +47,16 @@ server.tomcat.max-idle-time=60000
 # If you get an application startup failure that the port is already taken
 # If thats not it, please check if the key-store file path makes sense
 server.local.startpath=aai-resources/src/main/resources/
-server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties
 
-server.port=8447
-security.require-ssl=false
-server.ssl.enabled=false
+server.port={{ .Values.service.resourcesPort }}
 
-# JMS bind address host port
-jms.bind.address=tcp://localhost:61647
-dmaap.ribbon.listOfServers=message-router.{{ include "common.namespace" . }}:3904
-dmaap.ribbon.transportType=http
+spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
+spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
+spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.properties.sasl.jaas.config=${JAAS_CONFIG}
+spring.kafka.producer.retries=3
 
 # Schema related attributes for the oxm and edges
 # Any additional schema related attributes should start with prefix schema
@@ -98,9 +95,9 @@ schema.service.versions.endpoint=versions
 schema.service.client=no-auth
 
 #to expose the Prometheus scraping endpoint
-management.port=8448
-management.endpoints.enabled-by-default=false
-management.security.enabled=false
+management.server.port=8448
+management.endpoints.enabled-by-default=true
+management.endpoints.web.exposure.include=*
 endpoints.enabled={{ .Values.endpoints.enabled }}
 endpoints.info.enabled={{ .Values.endpoints.info.enabled }}
 endpoints.prometheus.enabled={{ .Values.metrics.serviceMonitor.enabled }}
@@ -111,4 +108,17 @@ management.metrics.distribution.sla[http.server.requests]=20ms, 30ms, 40ms, 50ms
 #Add common tag for grouping all aai related metrics
 management.metrics.tags.group_id=aai
 #It is not advisable to use labels to store dimensions with high cardinality. Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584
-scrape.uri.metrics=false
\ No newline at end of file
+scrape.uri.metrics=false
+
+# If true, the actuator health check will be overriden
+# to use the AaiGraphChecker check instead.
+# This does the same as the /echo endpoint,
+# but doesn't show up in micrometer metrics
+aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
+aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
+
+aai.basic-auth.enabled={{ .Values.global.auth.enabled }}
+{{- range $index, $user := .Values.global.auth.users }}
+aai.basic-auth.users[{{ $index }}].username={{ $user.username }}
+aai.basic-auth.users[{{ $index }}].password={{ $user.password }}
+{{- end }}