Add tags to requirements.yaml for easier deployment of central and edge
Also, bump nem-monitoring chart and fix prometheus scrape endpoints for
nem-kpi-exporter and node-exporter.
Change-Id: I1615c970ac4da55dbd858345a97e1f0738a0d86e
diff --git a/.gitignore b/.gitignore
index 68d93c6..d6b6376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
requirements.lock
+charts
diff --git a/cord-platform/Chart.yaml b/cord-platform/Chart.yaml
index 686484b..fb9d1cf 100644
--- a/cord-platform/Chart.yaml
+++ b/cord-platform/Chart.yaml
@@ -16,5 +16,4 @@
description: A Helm chart to install the CORD platform
icon: https://guide.opencord.org/logos/cord.svg
-version: 7.1.1
-appVersion: 7.1.1
+version: 7.2.1
diff --git a/cord-platform/requirements.yaml b/cord-platform/requirements.yaml
index 456c3f9..cb51c6b 100644
--- a/cord-platform/requirements.yaml
+++ b/cord-platform/requirements.yaml
@@ -21,17 +21,30 @@
- name: kafka
version: 0.13.3
repository: https://kubernetes-charts-incubator.storage.googleapis.com
+ tags:
+ - central
+ - edge
- name: onos
version: 1.1.2
repository: https://charts.opencord.org
+ tags:
+ - edge
- name: xos-core
version: 3.0.9
repository: https://charts.opencord.org
+ tags:
+ - central
- name: logging
version: 1.1.0
repository: https://charts.opencord.org
condition: logging.enabled
+ tags:
+ - central
+ - edge
- name: nem-monitoring
- version: 1.0.14
+ version: 1.2.1
repository: https://charts.opencord.org
condition: nem-monitoring.enabled
+ tags:
+ - central
+ - edge
diff --git a/cord-platform/values.yaml b/cord-platform/values.yaml
index 78e2152..edea2a5 100644
--- a/cord-platform/values.yaml
+++ b/cord-platform/values.yaml
@@ -24,11 +24,29 @@
kafka_brokers: ['cord-platform-kafka:9092']
nem-monitoring:
- enabled: true
-
kpi_exporter:
kpi_broker: cord-platform-kafka:9092
+ extraScrapeConfigs: |
+ - job_name: 'xos-core'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - xos-core-prometheus:8000
+ - job_name: 'nem-kpi-exporter'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - cord-platform-nem-kpi-exporter:8080
+ - job_name: 'node-exporter'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - cord-platform-prometheus-node-exporter:9100
+
grafana:
datasources:
datasources.yaml:
@@ -36,13 +54,11 @@
datasources:
- name: Prometheus
type: prometheus
- url: http://cord-platform-prometheus-server.default.svc.cluster.local
+ url: http://cord-platform-prometheus-server
access: proxy
isDefault: true
logging:
- enabled: true
-
kibana:
env:
ELASTICSEARCH_URL: "http://cord-platform-elasticsearch-client:9200"