Integrate grafana-k8s and prometheus-k8s

[osm/devops.git] / installers / charm / bundles / osm / bundle.yaml

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index b2db446..9f6023c 100644 (file)
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -123,19 +123,15 @@ applications:
     channel: latest/stable
     scale: 1
   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: 1
-    series: kubernetes
   keystone:
     charm: osm-keystone
     channel: latest/beta
@@ -143,8 +139,6 @@ applications:
     resources:
       keystone-image: opensourcemano/keystone:testing-daily
 relations:
-  - - grafana:prometheus
-    - prometheus:prometheus
   - - kafka:zookeeper
     - zookeeper:zookeeper
   - - keystone:db
@@ -177,12 +171,10 @@ relations:
     - 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
@@ -191,5 +183,4 @@ relations:
     - keystone:keystone
   - - mariadb:mysql
     - pol:mysql
-  - - grafana:db
-    - mariadb:mysql
+