Merge "Always use first mysql node in pool, fixes PROD-11155"
diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring.yml
index 4371367..7c03c35 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring.yml
@@ -15,6 +15,23 @@
driver_opts:
encrypted: 1
service:
+ remote_agent:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_agent"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_agent"
+ image: ${_param:docker_image_remote_agent}
+ ports:
+ - 15014:${telegraf:remote_agent:output:prometheus_client:bind:port}
+ volumes:
+ - ${telegraf:remote_agent:dir:config}:/etc/telegraf
+ - ${telegraf:remote_agent:dir:config_d}:/etc/telegraf/telegraf.d
alertmanager:
networks:
- monitoring
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index d216e9d..85b95c7 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -25,6 +25,8 @@
dist: trusty
- name: swift
dist: trusty
+ - name: ironic
+ dist: trusty
- name: ceilometer
dist: xenial
- name: cinder
@@ -45,6 +47,8 @@
dist: xenial
- name: swift
dist: xenial
+ - name: ironic
+ dist: xenial
template:
discard:
build:
@@ -117,4 +121,4 @@
default: 'true'
UPLOAD_APTLY:
type: boolean
- default: 'true'
\ No newline at end of file
+ default: 'true'
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index c2cefce..cf39dbd 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -48,6 +48,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 130a3d8..68792d4 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -47,6 +47,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index 7bbf92e..ed6602d 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -20,3 +20,8 @@
- 'tasks.monitoring_alertmanager'
type: A
port: ${prometheus:alertmanager:bind:port}
+ - name: 'remote_agent'
+ domain:
+ - 'tasks.monitoring_remote_agent'
+ type: A
+ port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
diff --git a/telegraf/agent/remote.yml b/telegraf/agent/remote.yml
new file mode 100644
index 0000000..ecbae25
--- /dev/null
+++ b/telegraf/agent/remote.yml
@@ -0,0 +1,16 @@
+classes:
+- service.telegraf.agent.remote
+parameters:
+ telegraf:
+ remote_agent:
+ dir:
+ config: /srv/volumes/local/telegraf
+ config_d: /srv/volumes/local/telegraf/telegraf.d
+ input:
+ internal:
+ output:
+ prometheus_client:
+ bind:
+ address: 0.0.0.0
+ port: 9126
+ engine: prometheus