Add proxy for Grafana service
Change-Id: I0a3d5d73cdd7e6e10c866b78993b8ce171e2e4ed
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
index 91628ed..cb06525 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
@@ -1,10 +1,12 @@
classes:
- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
- system.nginx.server.proxy.stacklight.kibana
- system.salt.minion.cert.proxy
- cluster.virtual-mcp11-contrail
parameters:
_param:
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml
index ed66487..422bb8f 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml
@@ -1,10 +1,12 @@
classes:
- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
- system.nginx.server.proxy.stacklight.kibana
- system.salt.minion.cert.proxy
- cluster.virtual-mcp11-dvr
parameters:
_param:
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/client.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/client.yml
index 3799964..393449c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/client.yml
@@ -7,11 +7,11 @@
parameters:
_param:
# Elasticsearch/Kibana client parameters
- stacklight_log_address: ${_param:stacklight_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
# Grafana client parameters
- grafana_address: ${_param:stacklight_address}
+ grafana_address: ${_param:stacklight_monitor_address}
grafana_port: 15013
grafana_user: admin
grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_address}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15010
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index f755342..a6b4118 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- stacklight_address: 172.16.10.252
+ stacklight_monitor_address: 172.16.10.252
stacklight_node01_hostname: mon01
stacklight_node02_hostname: mon02
stacklight_node03_hostname: mon03
@@ -9,10 +9,10 @@
stacklight_node03_address: 172.16.10.109
# Glusterfs
- glusterfs_service_host: ${_param:stacklight_address}
+ glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
- prometheus_control_address: ${_param:stacklight_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -26,7 +26,7 @@
network:
host:
mon:
- address: ${_param:stacklight_address}
+ address: ${_param:stacklight_monitor_address}
names:
- mon
- mon.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
index f09e157..49c16f0 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
@@ -1,8 +1,17 @@
classes:
- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
- system.nginx.server.proxy.monitoring.prometheus_server
- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
- cluster.virtual-mcp11-k8s-calico.infra
parameters:
_param:
cluster_public_host: ${_param:prometheus_control_address}
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 4e48477..d12dfa1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -26,7 +26,7 @@
- cluster.virtual-mcp11-k8s-calico.infra
parameters:
_param:
- cluster_vip_address: ${_param:stacklight_address}
+ cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_public_host: mon
docker_image_alertmanager: alertmanager:latest
docker_image_pushgateway: pushgateway:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml
index 3799964..393449c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml
@@ -7,11 +7,11 @@
parameters:
_param:
# Elasticsearch/Kibana client parameters
- stacklight_log_address: ${_param:stacklight_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
# Grafana client parameters
- grafana_address: ${_param:stacklight_address}
+ grafana_address: ${_param:stacklight_monitor_address}
grafana_port: 15013
grafana_user: admin
grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_address}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15010
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index 2027844..fcba2a5 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- stacklight_address: 172.16.10.251
+ stacklight_monitor_address: 172.16.10.251
stacklight_node01_hostname: mon01
stacklight_node02_hostname: mon02
stacklight_node03_hostname: mon03
@@ -8,14 +8,14 @@
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
# GlusterFS
- glusterfs_service_host: ${_param:stacklight_address}
+ glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
- prometheus_control_address: ${_param:stacklight_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
linux:
network:
host:
mon:
- address: ${_param:stacklight_address}
+ address: ${_param:stacklight_monitor_address}
names:
- mon
- mon.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
index 14cd512..5c6a269 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
@@ -1,8 +1,17 @@
classes:
- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
- system.nginx.server.proxy.monitoring.prometheus_server
- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
- cluster.virtual-mcp11-k8s-contrail.infra
parameters:
_param:
+ nginx_proxy_grafana_port: 15013
cluster_public_host: ${_param:prometheus_control_address}
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index a9d8520..6677675 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -23,7 +23,7 @@
parameters:
_param:
cluster_public_host: mon
- cluster_vip_address: ${_param:stacklight_address}
+ cluster_vip_address: ${_param:stacklight_monitor_address}
docker_image_alertmanager: alertmanager:latest
docker_image_pushgateway: pushgateway:latest
docker_image_prometheus: prometheus:latest