X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=9f6023c4bc911c599537aa22b4ecb63caf8fa8fd;hb=refs%2Fchanges%2F08%2F13808%2F3;hp=4d0777ec0c164989f704c4cfc21e976c2cccd9d7;hpb=4e8024f71bb6651a447f100c1c0fbd5081ae79f5;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 4d0777ec..9f6023c4 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -14,6 +14,7 @@
 name: osm
 bundle: kubernetes
 docs: https://discourse.charmhub.io/t/osm-docs-index/8806
+issues: https://osm.etsi.org/bugzilla/
 description: |
   **Single instance Charmed OSM**
 
@@ -22,7 +23,7 @@ description: |
   to the development stack for OSM and allows you to deploy a single instance OSM bundle
   that is fast, reliable, and a complete solution with MicroStack and MicroK8s.
 
-  - Industry‐aligned and fully compliant with upstream
+  - Industry-aligned and fully compliant with upstream
   - Predictable release cadence and upgrade path
   - Simplified deployments and operations
   - Stable and secure
@@ -58,11 +59,10 @@ applications:
     scale: 1
     series: kubernetes
     storage:
-      db: 50M
+      mongodb: 50M
   nbi:
     charm: osm-nbi
     channel: latest/beta
-    series: focal
     trust: true
     scale: 1
     options:
@@ -73,7 +73,6 @@ applications:
   ro:
     charm: osm-ro
     channel: latest/beta
-    series: focal
     trust: true
     scale: 1
     options:
@@ -83,7 +82,6 @@ applications:
   ng-ui:
     charm: osm-ng-ui
     channel: latest/beta
-    series: focal
     trust: true
     scale: 1
     resources:
@@ -91,7 +89,6 @@ applications:
   lcm:
     charm: osm-lcm
     channel: latest/beta
-    series: focal
     scale: 1
     options:
       database-commonkey: osm
@@ -101,7 +98,6 @@ applications:
   mon:
     charm: osm-mon
     channel: latest/beta
-    series: focal
     trust: true
     scale: 1
     options:
@@ -113,7 +109,6 @@ applications:
   pol:
     charm: osm-pol
     channel: latest/beta
-    series: focal
     scale: 1
     options:
       log-level: DEBUG
@@ -122,35 +117,28 @@ applications:
   vca:
     charm: osm-vca-integrator
     channel: latest/beta
-    series: focal
     scale: 1
   ingress:
     charm: nginx-ingress-integrator
     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/stable
+    channel: latest/beta
     scale: 1
     resources:
       keystone-image: opensourcemano/keystone:testing-daily
 relations:
-  - - grafana:prometheus
-    - prometheus:prometheus
   - - kafka:zookeeper
     - zookeeper:zookeeper
   - - keystone:db
@@ -183,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
@@ -197,5 +183,4 @@ relations:
     - keystone:keystone
   - - mariadb:mysql
     - pol:mysql
-  - - grafana:db
-    - mariadb:mysql
+