Add remote_agent
Switch docker images namespace to mirantis
Change-Id: Iecf430d4f3cc1d1fadc052ec047f291be4cea8e5
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 44db9f2..50c5b6e 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -15,6 +15,7 @@
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
@@ -37,9 +38,10 @@
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_alertmanager: mirantis/alertmanager:latest
+ docker_image_pushgateway: mirantis/pushgateway:latest
+ docker_image_prometheus: mirantis/prometheus:latest
+ docker_image_remote_agent: mirantis/telegraf:latest
docker_image_grafana: grafana/grafana:latest
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index a60fe1d..84923ac 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -15,6 +15,7 @@
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
@@ -37,9 +38,10 @@
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_alertmanager: mirantis/alertmanager:latest
+ docker_image_pushgateway: mirantis/pushgateway:latest
+ docker_image_prometheus: mirantis/prometheus:latest
+ docker_image_remote_agent: mirantis/telegraf:latest
docker_image_grafana: grafana/grafana:latest
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 6919acf..656980d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -17,6 +17,7 @@
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
@@ -28,9 +29,10 @@
_param:
cluster_vip_address: ${_param:stacklight_address}
cluster_public_host: mon
- docker_image_alertmanager: alertmanager:latest
- docker_image_pushgateway: pushgateway:latest
- docker_image_prometheus: prometheus:latest
+ docker_image_alertmanager: mirantis/alertmanager:latest
+ docker_image_pushgateway: mirantis/pushgateway:latest
+ docker_image_prometheus: mirantis/prometheus:latest
+ docker_image_remote_agent: mirantis/telegraf:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 3cf5184..ecbaa80 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -17,6 +17,7 @@
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
@@ -28,9 +29,10 @@
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_public_host: mon
- docker_image_alertmanager: alertmanager:latest
- docker_image_pushgateway: pushgateway:latest
- docker_image_prometheus: prometheus:latest
+ docker_image_alertmanager: mirantis/alertmanager:latest
+ docker_image_pushgateway: mirantis/pushgateway:latest
+ docker_image_prometheus: mirantis/prometheus:latest
+ docker_image_remote_agent: mirantis/telegraf:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index a29524e..d073ec1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -13,6 +13,7 @@
- system.glusterfs.server.volume.prometheus
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
@@ -24,9 +25,10 @@
_param:
cluster_public_host: mon
cluster_vip_address: ${_param:stacklight_monitor_address}
- docker_image_alertmanager: alertmanager:latest
- docker_image_pushgateway: pushgateway:latest
- docker_image_prometheus: prometheus:latest
+ docker_image_alertmanager: mirantis/alertmanager:latest
+ docker_image_pushgateway: mirantis/pushgateway:latest
+ docker_image_prometheus: mirantis/prometheus:latest
+ docker_image_remote_agent: mirantis/telegraf:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/system b/classes/system
index cba353c..f83ba29 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit cba353c451189de64651f9d5ce548d22d3938a1e
+Subproject commit f83ba298ed988672c0ca7c8f6f6aaac51b9726af