From d9ab0abb43d0477b2f31ad6a9cf0b09b396cca4e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 16 Oct 2023 20:13:03 +0200 Subject: [PATCH] MT#58521 Remove obsolete InfluxDB checks We have removed InfluxDB support long ago, and there's been enough time to clean up any systems involved. Remove these checks that no longer serve any purpose. Change-Id: I6de535f0dd571d7d8d006eecd66cb31ff6661db6 --- templates/130_filesys-ngcp.yaml.tt2 | 21 ------------------- templates/410_process-ngcp.yaml.tt2 | 6 ------ templates/411_process-ngcp-pro.yaml.tt2 | 3 --- templates/500_init-daemons-dabian.yaml.tt2 | 8 ------- templates/510_init-daemons-ngcp.yaml.tt2 | 4 ---- templates/821_network-ports-ngcp.yaml.tt2 | 14 ------------- templates/822_network-ports-ngcp-pro.yaml.tt2 | 5 ----- 7 files changed, 61 deletions(-) diff --git a/templates/130_filesys-ngcp.yaml.tt2 b/templates/130_filesys-ngcp.yaml.tt2 index 0ea6e4e..93334c8 100644 --- a/templates/130_filesys-ngcp.yaml.tt2 +++ b/templates/130_filesys-ngcp.yaml.tt2 @@ -254,27 +254,6 @@ file: linked-to: /ngcp-data/backup filetype: symlink - /ngcp-data/influxdb: - exists: - or: - - true - - false - mode: "0755" - owner: influxdb - group: influxdb - filetype: directory - - /var/lib/influxdb: - exists: - or: - - true - - false - mode: "0777" - owner: root - group: root - linked-to: /ngcp-data/influxdb - filetype: symlink - /ngcp-data/prometheus: exists: true mode: "0755" diff --git a/templates/410_process-ngcp.yaml.tt2 b/templates/410_process-ngcp.yaml.tt2 index 823ed93..90a436f 100644 --- a/templates/410_process-ngcp.yaml.tt2 +++ b/templates/410_process-ngcp.yaml.tt2 @@ -59,9 +59,6 @@ process: asterisk: running: {{if and [% is_proxy ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} - influxd: - running: false - prometheus: running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'prometheus' ? 'true' : 'false' %] @@ -126,9 +123,6 @@ process: rtpengine-recor: running: {{if and [% is_rtp && rtpengine.recording.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} - telegraf: - running: false - # We have to use a truncated process name because that's the COMM limit # on Linux (15 characters). Real name: victoria-metrics. victoria-metric: diff --git a/templates/411_process-ngcp-pro.yaml.tt2 b/templates/411_process-ngcp-pro.yaml.tt2 index fccd43b..214b27e 100644 --- a/templates/411_process-ngcp-pro.yaml.tt2 +++ b/templates/411_process-ngcp-pro.yaml.tt2 @@ -49,9 +49,6 @@ process: pacemaker-contr: running: [% ha.crm == 'pacemaker' ? 'true' : 'false' %] - influxdb-relay: - running: false - monit: running: [% general.process_handler == 'monit' ? 'true' : 'false' %] diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2 index c5fd500..e6e3904 100644 --- a/templates/500_init-daemons-dabian.yaml.tt2 +++ b/templates/500_init-daemons-dabian.yaml.tt2 @@ -35,10 +35,6 @@ service: enabled: true running: true - influxdb.service: - enabled: false - running: false - motd.service: enabled: [% general.init_system == 'systemd' ? 'false' : 'true' %] running: [% general.init_system == 'systemd' ? 'false' : 'true' %] @@ -95,10 +91,6 @@ service: enabled: [% ntp.backend == 'timesyncd' ? 'true' : 'false ' %] running: [% ntp.backend == 'timesyncd' ? 'true' : 'false ' %] - telegraf.service: - enabled: false - running: false - victoria-metrics.service: enabled: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'true' : 'false' %] running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'true' : 'false' %] diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index e8ba322..0a9a9ce 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -120,10 +120,6 @@ service: enabled: false running: {{if and [% is_proxy && faxserver.enable == "yes" && general.ngcp_type != 'spce' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} - influxdb-relay.service: - enabled: false - running: false - snmpd.service: enabled: [% general.ngcp_type != 'spce' ? 'true' : 'false' %] running: [% general.ngcp_type != 'spce' ? 'true' : 'false' %] diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2 index 2078f08..36aaaed 100644 --- a/templates/821_network-ports-ngcp.yaml.tt2 +++ b/templates/821_network-ports-ngcp.yaml.tt2 @@ -207,17 +207,3 @@ port: ip: ["[% sip_int_ips.0 %]"] [% END -%] - # InfluxDB Admin - tcp:8083: - listening: false - ip: ["127.0.0.1"] - - # InfluxDb Query - tcp:8086: - listening: false - ip: ["[% ha_int_ips.0 %]"] - - # InfluxDb Backup/Restore RPC - tcp:8088: - listening: false - ip: ["127.0.0.1"] diff --git a/templates/822_network-ports-ngcp-pro.yaml.tt2 b/templates/822_network-ports-ngcp-pro.yaml.tt2 index be3add1..ddecbef 100644 --- a/templates/822_network-ports-ngcp-pro.yaml.tt2 +++ b/templates/822_network-ports-ngcp-pro.yaml.tt2 @@ -13,11 +13,6 @@ port: listening: true ip: ["127.0.0.1"] - # InfluxDB Relay - tcp:9096: - listening: false - ip: ["127.0.0.1"] - # Corosync udp:5405: listening: [% ha.gcs == 'corosync' ? 'true' : 'false' %]