Bird/Icinga2: Bird related monitoring config should ship with bird

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>

icinga2/bird_ospf_interfaces_down_ok.txt.tmpl → bird/icinga2/ospf_interfaces_down_ok.txt.tmpl

@@ -1,9 +1,7 @@
 #
 # Interfaces which are OK to be down in OSPF (Salt managed)
 #
-{%- set interfaces = salt['pillar.get']('nodes:' ~ grains['id'] ~ ':ifaces', {}) %}
-{%- for iface, config in interfaces.items ()|sort %}
-  {%- if config.get ('status', '') in [ 'planned', 'offline' ] %}
+{%- set interfaces = salt['pillar.get']('nodes:' ~ grains['id'] ~ ':routing:ospf:ifaces_down_ok', []) %}
+{%- for iface in interfaces %}
 {{ iface }}
-  {%- endif %}
 {%- endfor %}

bird/init.sls

@@ -374,3 +374,17 @@ bird6-configure:
     - watch_in:
       - cmd: bird6-configure
 {% endif %}
+
+################################################################################
+#                          Monitoring related stuff                            #
+################################################################################
+
+/etc/bird/ospf_interfaces_down_ok.txt:
+  file.managed:
+    - source: salt://bird/icinga2/ospf_interfaces_down_ok.txt.tmpl
+    - template: jinja
+
+/etc/bird/ibgp_sessions_down_ok.txt:
+  file.managed:
+    - source: salt://bird/icinga2/ibgp_sessions_down_ok.txt.tmpl
+    - template: jinja

icinga2/init.sls

@@ -327,19 +327,6 @@ Cleanup /etc/icinga2/ffho-conf.d/net/wbbl/:
 ################################################################################
 #                              Check related stuff                             #
 ################################################################################
-/etc/icinga2/ffho-conf.d/bird_ospf_interfaces_down_ok.txt:
-  file.managed:
-    - source: salt://icinga2/bird_ospf_interfaces_down_ok.txt.tmpl
-    - template: jinja
-    - require:
-      - file: /etc/icinga2/ffho-conf.d
-
-/etc/icinga2/ffho-conf.d/bird_ibgp_sessions_down_ok.txt:
-  file.managed:
-    - source: salt://icinga2/bird_ibgp_sessions_down_ok.txt.tmpl
-    - template: jinja
-    - require:
-      - file: /etc/icinga2/ffho-conf.d
 
 salt-cron-state-apply:
   cron.present:

icinga2/services/network.conf

@@ -83,7 +83,7 @@ apply Service "bird_ospf" {
 	import "generic-service"
 
 	check_command = "bird_ospf"
-	vars.interfaces_down_ok_file = "/etc/icinga2/ffho-conf.d/bird_ospf_interfaces_down_ok.txt"
+	vars.interfaces_down_ok_file = "/etc/bird/ospf_interfaces_down_ok.txt"
 	vars.ignore_missing_file = true
 	vars.no_ptp_ip = true
 
@@ -99,7 +99,7 @@ apply Service "bird_ospf6" {
 
 	check_command = "bird_ospf"
 	vars.proto = "6"
-	vars.interfaces_down_ok_file = "/etc/icinga2/ffho-conf.d/bird_ospf_interfaces_down_ok.txt"
+	vars.interfaces_down_ok_file = "/etc/bird/ospf_interfaces_down_ok.txt"
 	vars.ignore_missing_file = true
 	vars.no_ptp_ip = true
 
@@ -127,7 +127,7 @@ apply Service "bird_ibgp4" {
 	vars.ibgp_crit = "3:"
 	vars.asn = 65132
 	vars.proto = "4"
-	vars.sessions_down_ok_file = "/etc/icinga2/ffho-conf.d/bird_ibgp_sessions_down_ok.txt"
+	vars.sessions_down_ok_file = "/etc/bird/ibgp_sessions_down_ok.txt"
 	vars.ignore_missing_file = true
 
 	assign where host.address && host.vars.os == "Linux" && "router" in host.vars.roles
@@ -147,7 +147,7 @@ apply Service "bird_ibgp6" {
 	vars.ibgp_crit = "3:"
 	vars.asn = 65132
 	vars.proto = "6"
-	vars.sessions_down_ok_file = "/etc/icinga2/ffho-conf.d/bird_ibgp_sessions_down_ok.txt"
+	vars.sessions_down_ok_file = "/etc/bird/ibgp_sessions_down_ok.txt"
 	vars.ignore_missing_file = true
 
 	assign where host.address && host.vars.os == "Linux" && "router" in host.vars.roles