projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Integrate grafana-k8s and prometheus-k8s"
[osm/devops.git]
/
installers
/
charm
/
bundles
/
osm-ha
/
bundle.yaml
diff --git
a/installers/charm/bundles/osm-ha/bundle.yaml
b/installers/charm/bundles/osm-ha/bundle.yaml
index
6ae48e1
..
a4e84d3
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-124,15
+124,19
@@
applications:
channel: latest/stable
scale: 3
prometheus:
channel: latest/stable
scale: 3
prometheus:
- charm:
prometheus-k8
s
- channel: latest/
edg
e
+ charm:
osm-prometheu
s
+ channel: latest/
stabl
e
scale: 1
scale: 1
+ series: kubernetes
storage:
storage:
- database: 50M
+ data: 50M
+ options:
+ default-target: "mon:8000"
grafana:
grafana:
- charm:
grafana-k8s
- channel: latest/
edg
e
+ charm:
osm-grafana
+ channel: latest/
stabl
e
scale: 3
scale: 3
+ series: kubernetes
keystone:
charm: osm-keystone
channel: latest/beta
keystone:
charm: osm-keystone
channel: latest/beta
@@
-140,6
+144,8
@@
applications:
resources:
keystone-image: opensourcemano/keystone:testing-daily
relations:
resources:
keystone-image: opensourcemano/keystone:testing-daily
relations:
+ - - grafana:prometheus
+ - prometheus:prometheus
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
@@
-172,10
+178,12
@@
relations:
- kafka:kafka
- - nbi:ingress
- ingress:ingress
- kafka:kafka
- - nbi:ingress
- ingress:ingress
+ - - nbi:prometheus
+ - prometheus:prometheus
- - nbi:keystone
- keystone:keystone
- - nbi:keystone
- keystone:keystone
- - - mon:
metrics-endpoint
- - prometheus:
metrics-endpoint
+ - - mon:
prometheus
+ - prometheus:
prometheus
- - ng-ui:nbi
- nbi:nbi
- - ng-ui:ingress
- - ng-ui:nbi
- nbi:nbi
- - ng-ui:ingress
@@
-184,3
+192,5
@@
relations:
- keystone:keystone
- - mariadb:mysql
- pol:mysql
- keystone:keystone
- - mariadb:mysql
- pol:mysql
+ - - grafana:db
+ - mariadb:mysql