Align ocata dvr model with new SL
Change-Id: I3888e3fcbfb341f6680941d8e1baae2b5f6957e2
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 832a60c..20916d2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -11,6 +11,7 @@
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.single
+- system.keystone.client.service.aodh
- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
@@ -22,7 +23,7 @@
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
- cluster.virtual-mcp-ocata-dvr.openstack.proxy
- cluster.virtual-mcp-ocata-dvr.stacklight.proxy
- cluster.virtual-mcp-ocata-dvr
@@ -95,7 +96,3 @@
- cluster.virtual-mcp-ocata-dvr.openstack.proxy
params:
linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index 6ee4dbe..9ea0fc7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -1,13 +1,19 @@
classes:
+- service.grafana.collector
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
- cluster.virtual-mcp-ocata-dvr.infra
- cluster.virtual-mcp-ocata-dvr.openstack
- cluster.virtual-mcp-ocata-dvr.stacklight
-- cluster.virtual-mcp-ocata-dvr.stacklight.client
+- cluster.overrides
parameters:
_param:
cluster_domain: virtual-mcp-ocata-dvr.local
@@ -38,4 +44,4 @@
stacklight_monitor_node03_address: 172.16.10.109
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
-
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
index 4c8112a..6d75d6c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
@@ -4,9 +4,10 @@
- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
- system.linux.network.interface.single_ovs_dvr
+- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-ocata-dvr
-- system.heka.alarm.openstack_compute
parameters:
_param:
primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 29bdc19..4fb5eaa 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -14,16 +14,21 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
- system.glusterfs.server.cluster
- system.glance.control.cluster
-- system.heka.alarm.openstack_control
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
- system.designate.server.cluster
- system.designate.server.backend.pdns
- system.galera.server.cluster
+- system.galera.server.database.aodh
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
@@ -39,6 +44,7 @@
_param:
keepalived_vip_interface: ens4
keepalived_openstack_telemetry_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index b744d5c..537cafb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -73,6 +73,8 @@
ceilometer_service_host: 172.16.10.108
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
ceilometer_graphite_publisher_host: 172.16.10.107
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
@@ -97,6 +99,7 @@
mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
+ keystone_aodh_password: workshop
keystone_ceilometer_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
@@ -115,6 +118,7 @@
mongodb_ceilometer_password: cloudlab
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
index 7911d0f..a8f20a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
@@ -1,6 +1,22 @@
classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-ocata-dvr.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-ocata-dvr
+parameters:
+ _param:
+ # Elasticsearch/Kibana client parameters
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ # Grafana client parameters
+ grafana_address: ${_param:stacklight_monitor_address}
+ grafana_port: 15013
+ grafana_user: admin
+ grafana_password: ${_param:grafana_admin_password}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ grafana_prometheus_port: 15010
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
index 48bffdc..0b10c03 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
@@ -1,28 +1,14 @@
parameters:
_param:
+ prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
- heka_aggregator_host: ${_param:stacklight_monitor_address}
- aggregator_port: 5565
- grafana_user: admin
- grafana_password: password
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
elasticsearch_port: 9200
- influxdb_stacklight_password: lmapass
- influxdb_admin_password: password
- influxdb_port: 8086
- influxdb_database: lma
- influxdb_user: lma
- influxdb_password: lmapass
- nagios_host: ${_param:stacklight_monitor_address}
- nagios_status_port: 8001
- nagios_username: nagiosadmin
- nagios_password: secret
- nagios_notification_smtp_server: 127.0.0.1
- nagios_notification_from: 'nagios@localhost'
- nagios_notification_email: 'root@localhost'
stacklight_environment: ${_param:cluster_domain}
stacklight_notification_topic: stacklight_notifications
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:openstack_database_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
index 77a5f3f..b874c16 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
@@ -1,12 +1,14 @@
classes:
- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_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.virtual-mcp-ocata-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-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index fb2bf0d..a99b73c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -1,39 +1,69 @@
classes:
-- system.collectd.remote_client.cluster
+- system.docker.host
+- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector.cluster
+- system.heka.remote_collector.container
- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
-- system.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-mcp-ocata-dvr
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
+- system.haproxy.proxy.listen.stacklight.influxdb
- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-ocata-dvr
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_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_password: 'password'
- keepalived_stacklight_monitor_vip_interface: ens4
+ keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_password: 'password'
+ keepalived_prometheus_vip_interface: ens4
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
- cluster_grafana_port: 3000
- cluster_node01_name: mon01
+ cluster_node01_hostname: mon01
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
+ cluster_node02_hostname: mon02
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
+ cluster_node03_hostname: mon03
cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+ docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+ 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_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+ docker_image_grafana: grafana/grafana:4.3.2
+ prometheus_glusterfs_service_host: ${_param:openstack_control_address}
+ glusterfs_node01_address: ${_param:openstack_control_node01_address}
+ glusterfs_node02_address: ${_param:openstack_control_node02_address}
+ glusterfs_node03_address: ${_param:openstack_control_node03_address}
+ influxdb_port: 8086
+ 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_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface: