diff --git a/Aktau_install_config/group_vars/adc_global.yml b/Aktau_install_config/group_vars/adc_global.yml index a61e91d..7c7f5bd 100644 --- a/Aktau_install_config/group_vars/adc_global.yml +++ b/Aktau_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.1.61.4:9092\",\"10.1.61.5:9092\",\"10.1.61.6:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.1.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Aktubinsk_install_config/group_vars/adc_global.yml b/Aktubinsk_install_config/group_vars/adc_global.yml index 2056c53..1db6b07 100644 --- a/Aktubinsk_install_config/group_vars/adc_global.yml +++ b/Aktubinsk_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.2.61.9:9092\",\"10.2.61.10:9092\",\"10.2.61.11:9092\",\"10.2.61.12:9092\",\"10.2.61.13:9092\",\"10.2.61.14:9092\",\"10.2.61.15:9092\",\"10.2.61.16:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.2.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Aktubinsk_install_config/hosts b/Aktubinsk_install_config/hosts index 3097b3f..1b245e8 100644 --- a/Aktubinsk_install_config/hosts +++ b/Aktubinsk_install_config/hosts @@ -38,6 +38,7 @@ #10.2.51.22 #10.2.53.48 #10.2.54.49 +#10.2.52.40 [adc_mxn] 10.2.55.[1:49] [adc_mcn0] diff --git a/Almaty_install_config/group_vars/adc_global.yml b/Almaty_install_config/group_vars/adc_global.yml index db9f4ca..c0b76f0 100644 --- a/Almaty_install_config/group_vars/adc_global.yml +++ b/Almaty_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.3.61.11:9092\",\"10.3.61.12:9092\",\"10.3.61.13:9092\",\"10.3.61.14:9092\",\"10.3.61.15:9092\",\"10.3.61.16:9092\",\"10.3.61.17:9092\",\"10.3.61.18:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.3.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Atyrau_install_config/group_vars/adc_global.yml b/Atyrau_install_config/group_vars/adc_global.yml index 4d30ef3..584c204 100644 --- a/Atyrau_install_config/group_vars/adc_global.yml +++ b/Atyrau_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.5.61.9:9092\",\"10.5.61.10:9092\",\"10.5.61.11:9092\",\"10.5.61.12:9092\",\"10.5.61.13:9092\",\"10.5.61.14:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.5.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Karaganda_install_config/group_vars/adc_global.yml b/Karaganda_install_config/group_vars/adc_global.yml index 86f5d6a..5b46829 100644 --- a/Karaganda_install_config/group_vars/adc_global.yml +++ b/Karaganda_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.6.61.9:9092\",\"10.6.61.10:9092\",\"10.6.61.11:9092\",\"10.6.61.12:9092\",\"10.6.61.13:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.6.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Kyzylorda_install_config/group_vars/adc_global.yml b/Kyzylorda_install_config/group_vars/adc_global.yml index 90e368a..fab83e0 100644 --- a/Kyzylorda_install_config/group_vars/adc_global.yml +++ b/Kyzylorda_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.9.61.4:9092\",\"10.9.61.5:9092\",\"10.9.61.6:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.9.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Taldykurgan_install_config/group_vars/adc_global.yml b/Taldykurgan_install_config/group_vars/adc_global.yml index cb8f069..eb91234 100644 --- a/Taldykurgan_install_config/group_vars/adc_global.yml +++ b/Taldykurgan_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.14.61.4:9092\",\"10.14.61.5:9092\",\"10.14.61.6:9092\",\"10.14.61.7:9092\",\"10.14.61.8:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.14.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/Uralsk_install_config/group_vars/adc_global.yml b/Uralsk_install_config/group_vars/adc_global.yml index 7deab29..2c74ef1 100644 --- a/Uralsk_install_config/group_vars/adc_global.yml +++ b/Uralsk_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.16.61.6:9092\",\"10.16.61.7:9092\",\"10.16.61.8:9092\",\"10.16.61.9:9092\",\"10.16.61.10:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.16.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/roles/adc_exporter/tasks/main.yml b/roles/adc_exporter/tasks/main.yml index 3c62572..826ada9 100644 --- a/roles/adc_exporter/tasks/main.yml +++ b/roles/adc_exporter/tasks/main.yml @@ -62,11 +62,11 @@ name: adc-exporter-systemd enabled: yes daemon_reload: yes - state: started + state: restarted - name: 'adc-exporter-ipmi service start' systemd: name: adc-exporter-ipmi enabled: yes daemon_reload: yes - state: started + state: restarted diff --git a/roles/adc_exporter/templates/adc-exporter-systemd.service.j2 b/roles/adc_exporter/templates/adc-exporter-systemd.service.j2 index 77ef2ae..d5e2f11 100644 --- a/roles/adc_exporter/templates/adc-exporter-systemd.service.j2 +++ b/roles/adc_exporter/templates/adc-exporter-systemd.service.j2 @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/opt/adc-exporter/systemd_exporter --collector.unit-whitelist="(tsg-env|tfe-env|tfe|sapp|mrzcpd|certstore|cert-redis|maat-redis).service" --web.disable-exporter-metrics +ExecStart=/opt/adc-exporter/systemd_exporter --web.disable-exporter-metrics Restart=always [Install] diff --git a/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 b/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 index 1f69435..3ecd197 100644 --- a/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 +++ b/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 @@ -32,11 +32,7 @@ promisc=1 [service] # lcore id for i/o service, use comma to split -{% if bladename == "mcn0" %} iocore={{ mcn0_mrzcpd.iocore }} -{% else %} -iocore={{ mcn123_mrzcpd.iocore }} -{% endif %} distmode=2 hashmode=0 diff --git a/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 b/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 index 30af697..78b33e7 100644 --- a/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 +++ b/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 @@ -33,11 +33,7 @@ promisc=1 [service] # lcore id for i/o service, use comma to split -{% if bladename == "mcn0" %} iocore={{ mcn0_mrzcpd.iocore }} -{% else %} -iocore={{ mcn123_mrzcpd.iocore }} -{% endif %} distmode=2 hashmode=0 diff --git a/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 b/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 index 7fa9f39..d05cb8c 100644 --- a/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 +++ b/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 @@ -10,7 +10,7 @@ clear_tx_flags=1 promisc=1 [service] -iocore={{ mrzcpd.iocore }} +iocore={{ mcn123_mrzcpd.iocore }} [eal] virtaddr=0x7d0000000000 diff --git a/tasks/reset_maat_redis.yml b/tasks/reset_maat_redis.yml new file mode 100644 index 0000000..90ef462 --- /dev/null +++ b/tasks/reset_maat_redis.yml @@ -0,0 +1,5 @@ +- hosts: adc_mcn3 + remote_user: root + tasks: + - name: 'reset maat-redis' + shell: systemctl daemon-reload; systemctl reset-failed maat-redis