icinga2 host updates

ansible/ansible.cfg

@@ -12,6 +12,8 @@ host_key_checking = False
 
 remote_user = ansible
 
+vault_password_file = ~/.ansible-vault-pass
+
 inventory      = hosts
 fact_caching=jsonfile
 fact_caching_connection=fact_cache

ansible/group_vars/proxmox_servers.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: root
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'
 

ansible/host_vars/aprs.w5isp.com.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.232
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/db.w5isp.com.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 10.0.15.30
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/dokku.w5isp.com.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: 204.110.191.218
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/git.mcintire.me.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'
 public_ip: 172.245.56.83

ansible/host_vars/librenms.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.227
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/logs.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: 204.110.191.229
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/mail.mcintire.me.yml

@@ -1,6 +1,5 @@
 ---
 # Host-specific variables for mail.mcintire.me
-ansible_user: ansible
 ansible_python_interpreter: /usr/bin/python3
 
 firewall_allow_rules:

ansible/host_vars/monitor.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.241
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/netbox.vntx.net.yml

@@ -1,7 +1,6 @@
 ---
 # Host-specific configuration for netbox.vntx.net.
 # Connection
-ansible_user: graham
 ansible_host: 204.110.191.243
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/ns1.as393837.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: debian
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'
 public_ip: 204.110.191.222

ansible/host_vars/prom.w5isp.com.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: 10.0.15.31
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/radius.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.248
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/resolver1.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.240
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/resolver2.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.250
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/skippy.w5isp.com.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: skippy
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/staging.towerops.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: staging
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/uisp.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: graham
 ansible_host: 204.110.191.224
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/unimus.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: 204.110.191.238
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/host_vars/vpn.vntx.net.yml

@@ -1,5 +1,4 @@
 ---
-ansible_user: ansible
 ansible_host: 204.110.191.247
 ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'

ansible/roles/monitor/files/icinga2/conf.d/hosts-380.conf

@@ -10,9 +10,43 @@ object Host "edge-router" {
   vars.tower = "380"
 }
 
+object Host "380-omni" {
+  import "ap-ubnt"
+  address = "10.10.79.10"
+  vars.tower = "380"
+  vars.parents = "core-router"
+}
+
 object Host "380-climax-af24" {
   import "af24"
   address = "10.250.1.90"
   vars.tower = "380"
   vars.parents = "core-router"
 }
+
+object Host "380-culleoka-af11" {
+  import "af11"
+  address = "10.250.1.53"
+  vars.tower = "380"
+  vars.parents = "core-router"
+}
+
+object Host "380-newhope-af11" {
+  import "af11"
+  address = "10.250.1.61"
+  vars.tower = "380"
+  vars.parents = "core-router"
+}
+
+object Host "380-982-60" {
+  import "ap-ubnt"
+  address = "10.250.1.37"
+  vars.tower = "380"
+  vars.parents = "core-router"
+}
+
+object Host "resolver1" {
+  import "server"
+  address = "204.110.191.240"
+  vars.tower = "380"
+}

ansible/roles/monitor/files/icinga2/conf.d/hosts-494.conf

@@ -4,14 +4,14 @@ object Host "494-router" {
   vars.tower = "494"
 }
 
-object Host "494-omni-2.4" {
+object Host "494-rocket-2ac" {
   import "ap-ubnt"
   address = "10.10.175.10"
   vars.tower = "494"
   vars.parents = "494-router"
 }
 
-object Host "494-omni-epmp" {
+object Host "494-epmp-omni" {
   import "ap-epmp"
   address = "10.10.175.11"
   vars.tower = "494"

ansible/roles/monitor/files/icinga2/conf.d/hosts-982.conf

@@ -10,35 +10,30 @@ object Host "982-1" {
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
 object Host "982-2" {
   import "ap-ubnt"
   address = "10.10.63.2"
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
 object Host "982-3" {
   import "ap-ubnt"
   address = "10.10.63.3"
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
 object Host "982-4" {
   import "ap-ubnt"
   address = "10.10.63.4"
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
 object Host "982-5" {
   import "ap-ubnt"
   address = "10.10.63.5"
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
 object Host "982-6" {
   import "ap-ubnt"
   address = "10.10.63.6"
@@ -46,23 +41,9 @@ object Host "982-6" {
   vars.parents = "982-router"
 }
 
-object Host "982-t-380" {
+object Host "982-380-60" {
   import "ap-ubnt"
   address = "10.250.1.34"
   vars.tower = "982"
   vars.parents = "982-router"
 }
-
-object Host "982-t-380" {
-  import "ap-ubnt"
-  address = "10.250.1.34"
-  vars.tower = "982"
-  vars.parents = "982-router"
-}
-
-object Host "982-t- " {
-  import "ap-ubnt"
-  address = ""
-  vars.tower = "982"
-  vars.parents = "982-router"
-}

ansible/roles/monitor/files/icinga2/conf.d/hosts-altoga.conf

@@ -1,6 +1,17 @@
-//object Host "altoga-verona" {
+object Host "altoga-sw" {
-//  import "ap-ubnt"
+  import "ap-ubnt"
-//  address = "10.250.1.149"
+  address = "10.10.95.20"
-//  vars.tower = "Altoga"
+  vars.tower = "Altoga"
-//}
+}
 
+object Host "altoga-east" {
+  import "ap-ubnt"
+  address = "10.10.95.21"
+  vars.tower = "Altoga"
+}
+
+object Host "altoga-north" {
+  import "ap-ubnt"
+  address = "10.10.95.22"
+  vars.tower = "Altoga"
+}

ansible/roles/monitor/files/icinga2/conf.d/hosts-climax.conf

@@ -4,58 +4,53 @@ object Host "climax-router" {
   vars.tower = "Climax"
 }
 
-object Host "climax-ubnt-nw" {
+object Host "climax-nw" {
   import "ap-ubnt"
   address = "10.10.31.11"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
-
+object Host "climax-ne" {
-object Host "climax-ubnt-ne" {
   import "ap-ubnt"
   address = "10.10.31.12"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
-
+object Host "climax-s" {
-object Host "climax-ubnt-s" {
   import "ap-ubnt"
   address = "10.10.31.13"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
-
 object Host "climax-epmp-nw" {
   import "ap-epmp"
   address = "10.10.31.30"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
-
+object Host "climax-epmp-ne" {
-object Host "climax-900-w" {
+  import "ap-epmp"
+  address = "10.10.31.31"
+  vars.tower = "Climax"
+  vars.parents = "climax-router"
+}
+object Host "climax-900-e" {
   import "ap-ubnt"
   address = "10.10.31.40"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
 
-object Host "climax-core-af24" {
+object Host "climax-verona-af11" {
+  import "af11"
+  address = "10.250.1.29"
+  vars.tower = "Climax"
+  vars.parents = "climax-router"
+}
+
+object Host "climax-380-af24" {
   import "af24"
   address = "10.250.1.93"
   vars.tower = "Climax"
   vars.parents = "climax-router"
 }
-
-//object Host "climax-verona-af11" {
-//  import "af11"
-//  address = "10.250.1.29"
-//  vars.tower = "Climax"
-//  vars.parents = "climax-router"
-//}
-
-//object Host "climax-culleoka-af11" {
-//  import "af11"
-//  address = "10.250.1.13"
-//  vars.tower = "Climax"
-//  vars.parents = "climax-router"
-//}

ansible/roles/monitor/files/icinga2/conf.d/hosts-culleoka.conf

@@ -4,91 +4,101 @@ object Host "culleoka-router" {
   vars.tower = "Culleoka"
 }
 
-object Host "culleoka-ubnt-ac1" {
+object Host "culleoka-ac1" {
   import "ap-ubnt"
   address = "10.10.111.1"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
+object Host "culleoka-ac2" {
-object Host "culleoka-ubnt-ac2" {
   import "ap-ubnt"
   address = "10.10.111.2"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
+object Host "culleoka-se" {
-//object Host "culleoka-ubnt-se" {
+  import "ap-ubnt"
-//  import "ap-ubnt"
+  address = "10.10.111.11"
-//  address = "10.10.111.11"
+  vars.tower = "Culleoka"
-//  vars.tower = "Culleoka"
+  vars.parents = "culleoka-router"
-//}
+}
-
+object Host "culleoka-sw" {
-object Host "culleoka-ubnt-sw" {
   import "ap-ubnt"
   address = "10.10.111.12"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
 object Host "culleoka-n" {
   import "ap-ubnt"
   address = "10.10.111.14"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
 object Host "culleoka-epmp-n" {
   import "ap-epmp"
   address = "10.10.111.30"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
 object Host "culleoka-epmp-se" {
   import "ap-epmp"
   address = "10.10.111.31"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
 object Host "culleoka-epmp-sw" {
   import "ap-epmp"
   address = "10.10.111.32"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
 object Host "culleoka-epmp-ne" {
   import "ap-epmp"
   address = "10.10.111.33"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
-
+object Host "culleoka-epmp-se-34" {
-//object Host "culleoka-ac-power" {
+  import "ap-epmp"
-//  import "generic-host"
+  address = "10.10.111.34"
-//  address = "100.64.27.252"
+  vars.tower = "Culleoka"
-//  vars.tower = "Culleoka"
+  vars.parents = "culleoka-router"
-//  vars.parents = "culleoka-router"
+}
-//}
+object Host "culleoka-epmp-nw" {
-
+  import "ap-epmp"
-//object Host "culleoka-climax-af11" {
+  address = "10.10.111.35"
-//  import "af11"
+  vars.tower = "Culleoka"
-//  address = "10.250.1.10"
+  vars.parents = "culleoka-router"
-//  vars.tower = "Culleoka"
+}
-//  vars.parents = "culleoka-router"
+object Host "culleoka-clayton-ap" {
-//}
+  import "ap-ubnt"
-
+  address = "10.10.111.50"
-//object Host "clayton-ap" {
+  vars.tower = "Culleoka"
-//  import "ap-ubnt"
+  vars.parents = "culleoka-router"
-//  address = "10.10.111.50"
+}
-//  vars.tower = "Culleoka"
+object Host "clayton-to-culleoka" {
-//}
+  import "ap-ubnt"
-
+  address = "10.10.111.60"
-object Host "culleoka-clayton-bh" {
+  vars.tower = "Culleoka"
+  vars.parents = "culleoka-router"
+}
+object Host "culleoka-to-clayton" {
   import "ap-ubnt"
   address = "10.10.111.61"
   vars.tower = "Culleoka"
   vars.parents = "culleoka-router"
 }
+
+object Host "culleoka-380-af11" {
+  import "af11"
+  address = "10.250.1.50"
+  vars.tower = "Culleoka"
+  vars.parents = "culleoka-router"
+}
+
+object Host "culleoka-climax-af11" {
+  import "af11"
+  address = "10.250.1.10"
+  vars.tower = "Culleoka"
+  vars.parents = "culleoka-router"
+}

ansible/roles/monitor/files/icinga2/conf.d/hosts-lowrycrossing.conf

@@ -20,7 +20,14 @@ object Host "lowrycrossing-ne" {
 
 object Host "lowrycrossing-n" {
   import "ap-epmp"
-  address = "10.10.159.10"
+  address = "10.10.159.12"
+  vars.tower = "Lowry Crossing"
+  vars.parents = "lowrycrossing-router"
+}
+
+object Host "lowrycrossing-nw" {
+  import "ap-epmp"
+  address = "10.10.159.13"
   vars.tower = "Lowry Crossing"
   vars.parents = "lowrycrossing-router"
 }

ansible/roles/monitor/files/icinga2/conf.d/hosts-newhope.conf

@@ -8,50 +8,37 @@ object Host "newhope-se" {
   import "ap-epmp"
   address = "10.10.143.11"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }
 object Host "newhope-ne" {
   import "ap-epmp"
   address = "10.10.143.12"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }
 object Host "newhope-nw" {
   import "ap-epmp"
   address = "10.10.143.13"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }
 object Host "newhope-sw" {
   import "ap-epmp"
   address = "10.10.143.14"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }
 
-//object Host "newhope-edgepoint" {
-//  import "edgeswitch"
-//  address = "100.64.19.250"
-//  vars.tower = "New Hope"
-//  vars.parents = "10.254.254.108"
-//}
-//object Host "newhope-edgepoint2" {
-//  import "edgeswitch"
-//  address = "100.64.19.251"
-//  vars.tower = "New Hope"
-//  vars.parents = "10.254.254.108"
-//}
-
 object Host "newhope-core-af11" {
   import "af11"
   address = "10.250.1.58"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }
 
 object Host "newhope-lowrycrossing-af24" {
   import "af24"
   address = "10.250.1.109"
   vars.tower = "New Hope"
-  vars.parents = "10.254.254.108"
+  vars.parents = "newhope-router"
 }

ansible/roles/monitor/files/icinga2/conf.d/hosts-verona.conf

@@ -10,27 +10,30 @@ object Host "verona-nw" {
   vars.tower = "Verona"
   vars.parents = "verona-router"
 }
-
 object Host "verona-ne" {
   import "ap-ubnt"
   address = "10.10.15.12"
   vars.tower = "Verona"
   vars.parents = "verona-router"
 }
-
 object Host "verona-s" {
   import "ap-ubnt"
   address = "10.10.15.13"
   vars.tower = "Verona"
   vars.parents = "verona-router"
 }
-
+object Host "verona-horn-w" {
-//object Host "verona-switch" {
+  import "ap-ubnt"
-//  import "netonix"
+  address = "10.10.15.1"
-//  address = "100.64.3.250"
+  vars.tower = "Verona"
-//  vars.tower = "Verona"
+  vars.parents = "verona-router"
-//  vars.parents = "verona-router"
+}
-//}
+object Host "verona-horn-nw" {
+  import "ap-ubnt"
+  address = "10.10.15.2"
+  vars.tower = "Verona"
+  vars.parents = "verona-router"
+}
 
 object Host "verona-climax-af11" {
   import "af11"
@@ -39,8 +42,9 @@ object Host "verona-climax-af11" {
   vars.parents = "verona-router"
 }
 
-//object Host "verona-altoga" {
+object Host "verona-altoga" {
-//  import "ap-ubnt"
+  import "ap-ubnt"
-//  address = "10.250.1.146"
+  address = "10.250.1.146"
-//  vars.tower = "Verona"
+  vars.tower = "Verona"
-//}
+  vars.parents = "verona-router"
+}