Major update to all SL models, remove old params, renaming
Change-Id: I9d089bcdc7deee8a3ec6d8b722e440a832ef2db0
diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index 36f82f8..88dcede 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -1,4 +1,6 @@
classes:
+- system.docker.client
+- system.docker.host
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index 8c93be1..f27aece 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -3,6 +3,8 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- cluster.sl_k8s_calico
parameters:
_param:
diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index 9745f9a..6df9960 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.252
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 65f9dc4..bcc9e87 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -2,6 +2,7 @@
- system.docker.host
- system.linux.system.repo.influxdb
- system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.glusterfs
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.elasticsearch.server.cluster
@@ -13,8 +14,6 @@
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.server.single
@@ -28,6 +27,7 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
- cluster.sl_k8s_calico
parameters:
_param:
@@ -37,6 +37,7 @@
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
@@ -65,6 +66,7 @@
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
elasticsearch:
server:
heap:
diff --git a/classes/cluster/sl_k8s_contrail/infra/config.yml b/classes/cluster/sl_k8s_contrail/infra/config.yml
index 71c8aa9..b17d297 100644
--- a/classes/cluster/sl_k8s_contrail/infra/config.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/config.yml
@@ -1,4 +1,6 @@
classes:
+- system.docker.client
+- system.docker.host
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
diff --git a/classes/cluster/sl_k8s_contrail/opencontrail/control.yml b/classes/cluster/sl_k8s_contrail/opencontrail/control.yml
index a06f089..66052f3 100644
--- a/classes/cluster/sl_k8s_contrail/opencontrail/control.yml
+++ b/classes/cluster/sl_k8s_contrail/opencontrail/control.yml
@@ -14,6 +14,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.sl_k8s_contrail
parameters:
_param:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/client.yml b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
index 001d1bd..0f45d40 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
@@ -3,6 +3,8 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- cluster.sl_k8s_contrail
parameters:
_param:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/init.yml b/classes/cluster/sl_k8s_contrail/stacklight/init.yml
index 085eb89..48ad663 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.251
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index a0dd997..f23432e 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -1,6 +1,7 @@
classes:
- system.linux.system.repo.influxdb
- system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.glusterfs
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.docker.host
@@ -15,8 +16,6 @@
- system.galera.server.database.grafana
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.influxdb.server.single
- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
@@ -28,6 +27,7 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
- cluster.sl_k8s_contrail.infra
parameters:
_param:
@@ -37,6 +37,7 @@
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
@@ -65,6 +66,7 @@
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
elasticsearch:
server:
heap:
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index 844d189..8d5a4ae 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -1,5 +1,7 @@
classes:
- service.git.client
+- system.docker.client
+- system.docker.host
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
@@ -149,21 +151,66 @@
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
node:
- openstack_control_node01:
+ prx_node:
+ name: ${_param:openstack_proxy_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.stacklight.proxy
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:openstack_proxy_node01_address}
+ stacklight_monitor_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
+ domain: ${_param:cluster_domain}
classes:
- service.galera.master.cluster
+ - system.docker.swarm.master
+ - cluster.${_param:cluster_name}.stacklight.client
+ - cluster.${_param:cluster_name}.stacklight.server
params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node01_address}
+ keepalived_vip_priority: 100
mysql_cluster_role: master
+ openstack_control_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.master.cluster
+ - system.docker.swarm.master
+ - cluster.${_param:cluster_name}.stacklight.client
+ - cluster.${_param:cluster_name}.stacklight.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node01_address}
+ keepalived_vip_priority: 100
+ mysql_cluster_role: master
openstack_control_node02:
+ name: ${_param:stacklight_monitor_node02_hostname}
+ domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
+ - system.docker.swarm.manager
+ - cluster.${_param:cluster_name}.stacklight.server
params:
- mysql_cluster_role: slave
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node02_address}
+ keepalived_vip_priority: 101
+ mysql_cluster_role: slave
openstack_control_node03:
+ name: ${_param:stacklight_monitor_node03_hostname}
+ domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
+ - system.docker.swarm.manager
+ - cluster.${_param:cluster_name}.stacklight.server
params:
- mysql_cluster_role: slave
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node03_address}
+ keepalived_vip_priority: 102
+ mysql_cluster_role: slave
diff --git a/classes/cluster/sl_os_contrail/init.yml b/classes/cluster/sl_os_contrail/init.yml
index 3fd1c98..2829b40 100755
--- a/classes/cluster/sl_os_contrail/init.yml
+++ b/classes/cluster/sl_os_contrail/init.yml
@@ -1,6 +1,5 @@
classes:
- service.grafana.collector
-- system.heka.log_collector.single
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
diff --git a/classes/cluster/sl_os_contrail/openstack/compute.yml b/classes/cluster/sl_os_contrail/openstack/compute.yml
index 31b654e..702ce7c 100755
--- a/classes/cluster/sl_os_contrail/openstack/compute.yml
+++ b/classes/cluster/sl_os_contrail/openstack/compute.yml
@@ -8,6 +8,7 @@
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.virtual_router
- service.opencontrail.compute.cluster
+- system.prometheus.exporters.libvirt
- cluster.sl_os_contrail
parameters:
_param:
diff --git a/classes/cluster/sl_os_contrail/openstack/control.yml b/classes/cluster/sl_os_contrail/openstack/control.yml
index e2579a3..7b02b6e 100755
--- a/classes/cluster/sl_os_contrail/openstack/control.yml
+++ b/classes/cluster/sl_os_contrail/openstack/control.yml
@@ -33,6 +33,7 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.haproxy.proxy.listen.openstack.nova-placement
+- system.prometheus.exporters.jmx
- cluster.sl_os_contrail
parameters:
_param:
diff --git a/classes/cluster/sl_os_contrail/stacklight/client.yml b/classes/cluster/sl_os_contrail/stacklight/client.yml
index efca433..2ed7c46 100755
--- a/classes/cluster/sl_os_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/client.yml
@@ -3,6 +3,8 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- cluster.sl_os_contrail
parameters:
_param:
diff --git a/classes/cluster/sl_os_contrail/stacklight/init.yml b/classes/cluster/sl_os_contrail/stacklight/init.yml
index eb3bd1c..6d1102c 100755
--- a/classes/cluster/sl_os_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.253
@@ -29,15 +33,15 @@
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index ac37c38..29d0809 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -4,9 +4,6 @@
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
@@ -25,10 +22,10 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
- cluster.sl_os_contrail
parameters:
_param:
- heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
@@ -50,6 +47,7 @@
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
@@ -68,6 +66,7 @@
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
openstack_version: newton
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface:
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index cac737a..ff65a40 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -1,5 +1,7 @@
classes:
- service.git.client
+- system.docker.client
+- system.docker.host
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
diff --git a/classes/cluster/sl_os_ovs/openstack/compute.yml b/classes/cluster/sl_os_ovs/openstack/compute.yml
index 6c5324e..337e062 100644
--- a/classes/cluster/sl_os_ovs/openstack/compute.yml
+++ b/classes/cluster/sl_os_ovs/openstack/compute.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.prometheus.exporters.libvirt
- cluster.sl_os_ovs
parameters:
_param:
diff --git a/classes/cluster/sl_os_ovs/openstack/proxy.yml b/classes/cluster/sl_os_ovs/openstack/proxy.yml
index 456d7c9..3a76f36 100644
--- a/classes/cluster/sl_os_ovs/openstack/proxy.yml
+++ b/classes/cluster/sl_os_ovs/openstack/proxy.yml
@@ -1,15 +1,18 @@
classes:
- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
- system.salt.minion.cert.proxy
- cluster.sl_os_ovs
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}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 3f8a5e0..3ca0f10 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -3,6 +3,8 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- cluster.sl_os_ovs
parameters:
_param:
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 71b5ff3..2293764 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.252
diff --git a/classes/cluster/sl_os_ovs/stacklight/proxy.yml b/classes/cluster/sl_os_ovs/stacklight/proxy.yml
index f7c5364..e510cef 100644
--- a/classes/cluster/sl_os_ovs/stacklight/proxy.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/proxy.yml
@@ -7,6 +7,7 @@
- cluster.sl_os_ovs
parameters:
_param:
+ cluster_public_host: ${_param:prometheus_control_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index ebd4859..fd5a54b 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -10,12 +10,8 @@
- system.haproxy.proxy.listen.stacklight.kibana
- system.haproxy.proxy.listen.stacklight.influxdb
- service.haproxy.proxy.single
-- system.heka.remote_collector.cluster
-- system.heka.remote_collector.input.amqp
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.server.single
@@ -29,10 +25,10 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
- cluster.sl_os_ovs
parameters:
_param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -53,6 +49,7 @@
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
@@ -71,6 +68,7 @@
glusterfs_node01_address: ${_param:openstack_control_node01_address}
glusterfs_node02_address: ${_param:openstack_control_node02_address}
glusterfs_node03_address: ${_param:openstack_control_node03_address}
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface: