Integrate grafana-k8s and prometheus-k8s
Update osm bundle
Update osm bundle HA
Update charmed installer
Change-Id: I34806659cd8fa44e4d9b4a1eea33e362cc38ae22
Signed-off-by: Patricia Reinoso <patricia.reinoso@canonical.com>
diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index a4e84d3..6ae48e1 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -124,19 +124,15 @@
channel: latest/stable
scale: 3
prometheus:
- charm: osm-prometheus
- channel: latest/stable
+ charm: prometheus-k8s
+ channel: latest/edge
scale: 1
- series: kubernetes
storage:
- data: 50M
- options:
- default-target: "mon:8000"
+ database: 50M
grafana:
- charm: osm-grafana
- channel: latest/stable
+ charm: grafana-k8s
+ channel: latest/edge
scale: 3
- series: kubernetes
keystone:
charm: osm-keystone
channel: latest/beta
@@ -144,8 +140,6 @@
resources:
keystone-image: opensourcemano/keystone:testing-daily
relations:
- - - grafana:prometheus
- - prometheus:prometheus
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
@@ -178,12 +172,10 @@
- kafka:kafka
- - nbi:ingress
- ingress:ingress
- - - nbi:prometheus
- - prometheus:prometheus
- - nbi:keystone
- keystone:keystone
- - - mon:prometheus
- - prometheus:prometheus
+ - - mon:metrics-endpoint
+ - prometheus:metrics-endpoint
- - ng-ui:nbi
- nbi:nbi
- - ng-ui:ingress
@@ -192,5 +184,3 @@
- keystone:keystone
- - mariadb:mysql
- pol:mysql
- - - grafana:db
- - mariadb:mysql