Update Aether configs
Change-Id: Iaa1adf3caf40c498242cb74de725dcced7f683b2
diff --git a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
index baf366f..38b0daf 100644
--- a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
+++ b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
@@ -5,9 +5,27 @@
central: false
edge: true
+kafka:
+ fullnameOverride: "cord-platform-kafka"
+
+logging:
+ elasticsearch:
+ fullnameOverride: "cord-platform-elasticsearch"
+ kibana:
+ fullnameOverride: "cord-platform-kibana"
+ logstash:
+ fullnameOverride: "cord-platform-logstash"
+ fluentd-elasticsearch:
+ fullnameOverride: "cord-platform-fluentd-elasticsearch"
+
nem-monitoring:
kpi_exporter:
+ # NOTE: set enabled=false for central cluster
enabled: true
+ fullnameOverride: "cord-platform-kpi-exporter"
+ kpi_broker: "cord-platform-kafka:9092"
+ topics:
+ - "onos.kpis"
prometheus:
alertmanager:
@@ -28,12 +46,12 @@
external_labels:
datacenter: "edge-onf-menlo"
extraScrapeConfigs: |
- - job_name: 'nem-kpi-exporter'
+ - job_name: 'cord-platform-kpi-exporter'
metrics_path: /metrics
scrape_interval: 15s
static_configs:
- targets:
- - cord-platform-nem-kpi-exporter:8080
+ - cord-platform-kpi-exporter:8080
grafana:
fullnameOverride: "cord-platform-grafana"
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global-nem-monitoring.yaml
index 4c89d1d..2f7ca98 100644
--- a/deployment-configs/aether/apps/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global-nem-monitoring.yaml
@@ -26,10 +26,9 @@
- '{job="kubernetes-service-endpoints"}'
static_configs:
- targets:
- - cord-platform-prometheus-server.staging-cord-platform-p-rp6p6.svc.staging.central:80
- - cord-platform-prometheus-server.staging-cord-platform-p-8s6wg.svc.a.staging.edge:80
- - cord-platform-prometheus-server.staging-cord-platform-p-lmx6j.svc.b.staging.edge:80
- - cord-platform-prometheus-server.staging-cord-platform-p-867hl.svc.c.staging.edge:80
+ - cord-platform-prometheus-server.cord-platform-p-s5pp8.svc.product.central:80
+ - cord-platform-prometheus-server.cord-platform-p-6lcrm.svc.menlo.edge:80
+ - cord-platform-prometheus-server.cord-platform-p-lmx6j.svc.b.staging.edge:80
extraScrapeConfigs: ""
grafana:
diff --git a/deployment-configs/aether/apps/production-mcord-profile.yaml b/deployment-configs/aether/apps/production-mcord-profile.yaml
index 66dfb3e..4c76c98 100644
--- a/deployment-configs/aether/apps/production-mcord-profile.yaml
+++ b/deployment-configs/aether/apps/production-mcord-profile.yaml
@@ -1,7 +1,5 @@
progran:
enabled: false
-fabric:
- enabled: true
mcord-subscriber:
image:
@@ -13,7 +11,8 @@
kafkaService: "cord-platform-kafka"
fabric:
+ enabled: true
kafkaService: "cord-platform-kafka"
-onosFabricRestHost: "cord-platform-onos-ui.cord-platform-p-x7tlq.svc.menlo.edge"
+onosFabricRestHost: "cord-platform-onos-ui.cord-platform-p-6lcrm.svc.menlo.edge"
onosFabricRestPort: 8181
diff --git a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
index f776c24..6f2ba16 100644
--- a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
@@ -1,6 +1,6 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0-debug"
pullPolicy: "Always"
config:
@@ -10,11 +10,11 @@
s1u:
device: "s1u-net"
# NOTE: set different IP for each edge
- ip: "119.0.0.3/24"
+ ip: "119.0.0.7/24"
sgi:
device: "sgi-net"
# NOTE: set different IP for each edge
- ip: "13.1.1.3/24"
+ ip: "13.1.1.7/24"
networks:
sgi:
# NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production-omec-cp.yaml b/deployment-configs/aether/apps/production-omec-cp.yaml
index 06e7092..6e5f4a9 100644
--- a/deployment-configs/aether/apps/production-omec-cp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp.yaml
@@ -14,10 +14,8 @@
config:
clusterDomain: "product.central"
- hss:
- hssdb: "cassandra"
spgwc:
- s1uAddr: "119.0.0.3"
+ s1uAddr: "119.0.0.7"
mme:
cfgFiles:
config.json: