Switch mcp11-contrail monitoring to Prometheus
Change-Id: I7bb10af272102a95ccd0912397fbb28e721360a5
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 00f12ca..4f7a0bd 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -1,41 +1,49 @@
classes:
-- system.linux.system.repo.grafana
-- system.linux.system.repo.influxdb
+- system.docker.host
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
+- system.heka.remote_collector
- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.heka.remote_collector.output.elasticsearch
+- 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
-#- system.influxdb.database.ceilometer
-- cluster.virtual-mcp11-contrail
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.service.dashboard.grafana_server
+- cluster.virtual-mcp11-contrail
parameters:
_param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
- heka_amqp_host: ${_param:openstack_message_queue_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}
+ grafana_admin_password: admin
+ docker_image_alertmanager: alertmanager:latest
+ docker_image_pushgateway: pushgateway:latest
+ docker_image_prometheus: prometheus:latest
+ docker_image_grafana: grafana/grafana:latest
+ 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}
linux:
network:
interface: