Update sl-pike-dvr model
Change-Id: If2ea2690b2787528e918bdc4477453360f2d2c2c
Closes-Bug: PROD-21138
diff --git a/classes/cluster/sl-pike-dvr/stacklight/client.yml b/classes/cluster/sl-pike-dvr/stacklight/client.yml
index 4988908..10711a7 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/client.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/client.yml
@@ -13,7 +13,9 @@
grafana_port: 15013
grafana_user: admin
grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ # Pin grafana to Prometheus LTS
+ #grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ grafana_prometheus_address: ${_param:openstack_control_address}
grafana_prometheus_port: 15016
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/sl-pike-dvr/stacklight/init.yml b/classes/cluster/sl-pike-dvr/stacklight/init.yml
index 015ea27..b5cb724 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/init.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/init.yml
@@ -1,5 +1,16 @@
parameters:
_param:
+ stacklight_monitor_hostname: mon
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
@@ -16,20 +27,20 @@
mon:
address: ${_param:stacklight_monitor_address}
names:
- - mon
- - mon.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_hostname}
+ - ${_param:stacklight_monitor_hostname}.${_param:cluster_domain}
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - mon01
- - mon01.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - mon02
- - mon02.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - mon03
- - mon03.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index 678645c..07324aa 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -19,8 +19,7 @@
- service.haproxy.proxy.single
- system.influxdb.relay.cluster
- system.influxdb.server.single
-- system.influxdb.database.stacklight
-- system.influxdb.database.ceilometer
+- system.influxdb.database.prometheus
- system.keepalived.cluster.instance.prometheus_server_vip
- system.telegraf.agent.remote
- system.mongodb.server.cluster
@@ -41,6 +40,9 @@
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_version: 5
kibana_version: 5
+ elasticsearch_curator_retention_period: 14
+ prometheus_storage_retention: "168h"
+ influxdb_prometheus_database_retention: 14d
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
keepalived_prometheus_vip_interface: ens4
@@ -67,7 +69,7 @@
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
- prometheus_influxdb_db: lma
+ prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
remote_collector_telegraf_host: monitoring_remote_agent
@@ -80,3 +82,7 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ elasticsearch:
+ server:
+ heap:
+ size: 1