Adding parameters to configure charts and releasing loggin and monitoring
Change-Id: I3587825aee954a963a14afd9289225e5f92a3bc9
diff --git a/logging/Chart.yaml b/logging/Chart.yaml
index 5120ca7..790589f 100644
--- a/logging/Chart.yaml
+++ b/logging/Chart.yaml
@@ -15,4 +15,4 @@
description: Sets up log aggregation infrastructure in Kubernetes, with elasticstack and kibana
name: logging
-version: 0.1.0-dev0
+version: 1.0.0
diff --git a/xos-core/templates/_core.tpl b/xos-core/templates/_core.tpl
index bd13e16..fe59e60 100644
--- a/xos-core/templates/_core.tpl
+++ b/xos-core/templates/_core.tpl
@@ -17,6 +17,8 @@
{{- define "xos-core.config" }}
name: xos-core
xos_dir: /opt/xos
+kafka_bootstrap_servers:
+ - {{ .Values.platformKafka }}
database:
name: {{ .Values.xosDBName | quote }}
username: {{ .Values.xosDBUser | quote }}
@@ -34,7 +36,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - {{ .Values.platformKafka }}
topic: xos.log.core
loggers:
'':
diff --git a/xos-core/templates/_tosca.tpl b/xos-core/templates/_tosca.tpl
index d8b75c8..98e7d13 100644
--- a/xos-core/templates/_tosca.tpl
+++ b/xos-core/templates/_tosca.tpl
@@ -31,7 +31,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - {{ .Values.platformKafka }}
topic: xos.log.tosca
loggers:
'':
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 89248f7..9a0a2dd 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -51,6 +51,9 @@
xos_core_gRPCSecureNodePort: 30010
xos_core_gRPCInsecureNodePort: 30011
+# kafka
+platformKafka: cord-kafka:9092
+
# XOS Admin username/password
xosAdminUser: 'admin@opencord.org'
xosAdminPassword: 'letmein'