Add LMA2.0
* Align current model with use LMA2.0 aproach
* Delete linux_system_codename from openstack/control.yml, proxy.yaml,
as it defined in infra/config.yml
Change-Id: I3afd56a511f67f91dbda1af157407aeabb15c717
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 1b84d4d..6f1b9e0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -1,40 +1,69 @@
classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.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.container
- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
-- system.linux.system.repo.tcp_elastic
+- 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-ovs
- 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-ovs
parameters:
_param:
- linux_system_codename: xenial
- 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: