aboutsummaryrefslogtreecommitdiff
path: root/ansible/plays
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2022-02-13 19:25:17 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2022-02-13 19:25:17 +0100
commit4b559395d6aa97925a2926bf88fd6015ad7e1b66 (patch)
treebacaed2dfb42ff9abb280d40f2a08b91cad07197 /ansible/plays
parent51ffd253f00df48aefeee65f3d8723259418f353 (diff)
downloadinfra-4b559395d6aa97925a2926bf88fd6015ad7e1b66.tar.gz
infra-4b559395d6aa97925a2926bf88fd6015ad7e1b66.tar.bz2
infra-4b559395d6aa97925a2926bf88fd6015ad7e1b66.tar.xz
infra-4b559395d6aa97925a2926bf88fd6015ad7e1b66.zip
wip
Diffstat (limited to 'ansible/plays')
-rw-r--r--ansible/plays/files/wireguard/vs0/vimscore-4.pub1
-rw-r--r--ansible/plays/ops-agent.yml1
-rw-r--r--ansible/plays/templates/ops-agent/docker-compose.yml2
-rw-r--r--ansible/plays/templates/ops-agent/telegraf.conf7
-rw-r--r--ansible/plays/wireguard-vs0.yml12
5 files changed, 22 insertions, 1 deletions
diff --git a/ansible/plays/files/wireguard/vs0/vimscore-4.pub b/ansible/plays/files/wireguard/vs0/vimscore-4.pub
new file mode 100644
index 0000000..de3f379
--- /dev/null
+++ b/ansible/plays/files/wireguard/vs0/vimscore-4.pub
@@ -0,0 +1 @@
+3BtUW/vKuCt1fMX/kUJ32Dx5spVJQBtk4NQyfQVp0RA=
diff --git a/ansible/plays/ops-agent.yml b/ansible/plays/ops-agent.yml
index cb16e6d..f4e52bc 100644
--- a/ansible/plays/ops-agent.yml
+++ b/ansible/plays/ops-agent.yml
@@ -3,6 +3,7 @@
- birgitte
- hash
- malabaricus
+ - knot
tasks:
# Generate template telegraf.conf
# docker run --rm telegraf:1.14 bash
diff --git a/ansible/plays/templates/ops-agent/docker-compose.yml b/ansible/plays/templates/ops-agent/docker-compose.yml
index c3a2b8a..57cab7b 100644
--- a/ansible/plays/templates/ops-agent/docker-compose.yml
+++ b/ansible/plays/templates/ops-agent/docker-compose.yml
@@ -1,7 +1,7 @@
version: "3"
services:
telegraf:
- image: telegraf:1.15
+ image: telegraf:1.17
privileged: true
network_mode: host
volumes:
diff --git a/ansible/plays/templates/ops-agent/telegraf.conf b/ansible/plays/templates/ops-agent/telegraf.conf
index a408ef6..4dd6422 100644
--- a/ansible/plays/templates/ops-agent/telegraf.conf
+++ b/ansible/plays/templates/ops-agent/telegraf.conf
@@ -27,7 +27,9 @@
[[inputs.processes]]
[[inputs.swap]]
[[inputs.system]]
+{% if false %}
[[inputs.docker]]
+{% endif %}
{% if telegraf_sensors_enable|default(false) %}
[[inputs.sensors]]
@@ -45,6 +47,11 @@ devices = [
{% endif %}
{% endif %}
+[[inputs.net]]
+[[inputs.netstat]]
+[[inputs.interrupts]]
+[[inputs.linux_sysctl_fs]]
+
[[outputs.influxdb]]
urls = ["$INFLUX_URL"]
skip_database_creation = false
diff --git a/ansible/plays/wireguard-vs0.yml b/ansible/plays/wireguard-vs0.yml
index a9a108b..904f8ed 100644
--- a/ansible/plays/wireguard-vs0.yml
+++ b/ansible/plays/wireguard-vs0.yml
@@ -21,6 +21,10 @@
address: 192.168.137.3/24
network: 10.137.3.0
prefix: 24
+ vimscore-4:
+ address: 192.168.137.4/24
+ network: 10.137.4.0
+ prefix: 24
arius:
address: 192.168.137.103/24
network: 10.137.103.0
@@ -44,6 +48,9 @@
- gateway: "{{ networks['vimscore-3'].address }}"
network: "{{ networks['vimscore-3'].network }}/{{ networks['vimscore-3'].prefix }}"
state: "{{ 'absent' if ansible_hostname == 'vimscore-3' else 'present' }}"
+ - gateway: "{{ networks['vimscore-4'].address }}"
+ network: "{{ networks['vimscore-4'].network }}/{{ networks['vimscore-4'].prefix }}"
+ state: "{{ 'absent' if ansible_hostname == 'vimscore-4' else 'present' }}"
- gateway: "{{ networks['arius'].address }}"
network: "{{ networks['arius'].network }}/{{ networks['arius'].prefix }}"
state: "{{ 'absent' if ansible_hostname == 'arius' else 'present' }}"
@@ -71,6 +78,11 @@
allowed_ips:
- "{{ networks['vimscore-3'].address | ipaddr('address') }}/32"
- "{{ networks['vimscore-3'].network }}/{{ networks['vimscore-3'].prefix }}"
+ vimscore-4:
+ endpoint: vimscore-4.vimscore.com
+ allowed_ips:
+ - "{{ networks['vimscore-4'].address | ipaddr('address') }}/32"
+ - "{{ networks['vimscore-4'].network }}/{{ networks['vimscore-4'].prefix }}"
arius:
allowed_ips:
- "{{ networks['arius'].address | ipaddr('address') }}/32"