firewall: T4605: Rename filter tables to vyos_filter

4 files changed, 8 insertions, 9 deletions

diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index f6caf2f0b..f8ad1f798 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -48,7 +48,6 @@ airbag.enable()
 policy_route_conf_script = '/usr/libexec/vyos/conf_mode/policy-route.py'
 
 nftables_conf = '/run/nftables.conf'
-
 nftables_zone_conf = '/run/nftables_zone.conf'
 nftables6_zone_conf = '/run/nftables_zone6.conf'
 
diff --git a/src/conf_mode/protocols_nhrp.py b/src/conf_mode/protocols_nhrp.py
index b247ce2ab..991fcc7eb 100755
--- a/src/conf_mode/protocols_nhrp.py
+++ b/src/conf_mode/protocols_nhrp.py
@@ -94,15 +94,15 @@ def apply(nhrp):
                 comment = f'VYOS_NHRP_{tunnel}'
                 source_address = nhrp['if_tunnel'][tunnel]['source_address']
 
-                rule_handle = find_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', ['ip protocol gre', f'ip saddr {source_address}', 'ip daddr 224.0.0.0/4'])
+                rule_handle = find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', ['ip protocol gre', f'ip saddr {source_address}', 'ip daddr 224.0.0.0/4'])
                 if not rule_handle:
-                    run(f'sudo nft insert rule ip filter VYOS_FW_OUTPUT ip protocol gre ip saddr {source_address} ip daddr 224.0.0.0/4 counter drop comment "{comment}"')
+                    run(f'sudo nft insert rule ip vyos_filter VYOS_FW_OUTPUT ip protocol gre ip saddr {source_address} ip daddr 224.0.0.0/4 counter drop comment "{comment}"')
 
     for tunnel in nhrp['del_tunnels']:
         comment = f'VYOS_NHRP_{tunnel}'
-        rule_handle = find_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', [f'comment "{comment}"'])
+        rule_handle = find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', [f'comment "{comment}"'])
         if rule_handle:
-            remove_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', rule_handle)
+            remove_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', rule_handle)
 
     action = 'restart' if nhrp and 'tunnel' in nhrp else 'stop'
     run(f'systemctl {action} opennhrp.service')
diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py
index 53df006a4..427cb6911 100755
--- a/src/conf_mode/service_monitoring_telegraf.py
+++ b/src/conf_mode/service_monitoring_telegraf.py
@@ -42,7 +42,7 @@ systemd_override = '/etc/systemd/system/telegraf.service.d/10-override.conf'
 
 def get_nft_filter_chains():
     """ Get nft chains for table filter """
-    nft = cmd('nft --json list table ip filter')
+    nft = cmd('nft --json list table ip vyos_filter')
     nft = json.loads(nft)
     chain_list = []
 
diff --git a/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py b/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
index bf4bfd05d..cbc2bfe6b 100755
--- a/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
+++ b/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
@@ -11,7 +11,7 @@ def get_nft_filter_chains():
     """
     Get list of nft chains for table filter
     """
-    nft = cmd('/usr/sbin/nft --json list table ip filter')
+    nft = cmd('/usr/sbin/nft --json list table ip vyos_filter')
     nft = json.loads(nft)
     chain_list = []
 
@@ -27,7 +27,7 @@ def get_nftables_details(name):
     """
     Get dict, counters packets and bytes for chain
     """
-    command = f'/usr/sbin/nft list chain ip filter {name}'
+    command = f'/usr/sbin/nft list chain ip vyos_filter {name}'
     try:
         results = cmd(command)
     except:
@@ -60,7 +60,7 @@ def get_nft_telegraf(name):
     Get data for telegraf in influxDB format
     """
     for rule, rule_config in get_nftables_details(name).items():
-        print(f'nftables,table=filter,chain={name},'
+        print(f'nftables,table=vyos_filter,chain={name},'
               f'ruleid={rule} '
               f'pkts={rule_config["packets"]}i,'
               f'bytes={rule_config["bytes"]}i '