diff options
15 files changed, 28 insertions, 2 deletions
diff --git a/ansible/HAL_deploy.yml b/ansible/HAL_deploy.yml index 659f8c4f..857ba5db 100644 --- a/ansible/HAL_deploy.yml +++ b/ansible/HAL_deploy.yml @@ -23,6 +23,7 @@ - {role: maat-redis, tags: maat-redis} - {role: certstore, tags: certstore} - {role: telegraf_statistic, tags: telegraf_statistic} + - {role: sysctl, tags: sysctl} - {role: exporter, tags: exporter} - {role: tsg-diagnose, tags: tsg-diagnose} - {role: system-init, tags: system-init} @@ -47,6 +48,7 @@ - {role: exporter, tags: exporter} - {role: tsg_sn, tags: tsg_sn} - {role: tfe, tags: tfe} + - {role: sysctl, tags: sysctl} - {role: system-init, tags: system-init} - {role: hasp, tags: hasp} @@ -73,6 +75,7 @@ - {role: certstore, tags: certstore} - {role: tfe, tags: tfe} - {role: telegraf_statistic, tags: telegraf_statistic} + - {role: sysctl, tags: sysctl} - {role: exporter, tags: exporter} - {role: docker, tags: docker} - {role: tsg-diagnose, tags: tsg-diagnose} @@ -105,6 +108,7 @@ - {role: firewall, tags: firewall} - {role: tsg_app, tags: tsg_app} - {role: telegraf_statistic, tags: telegraf_statistic} + - {role: sysctl, tags: sysctl} - {role: exporter, tags: exporter} - {role: system-init-TSG-X-P1403, tags: system-init-TSG-X-P1403} - {role: system-init, tags: system-init} @@ -135,6 +139,7 @@ - {role: certstore, tags: certstore} - {role: tfe, tags: tfe} - {role: telegraf_statistic, tags: telegraf_statistic} + - {role: sysctl, tags: sysctl} - {role: exporter, tags: exporter} - {role: docker, tags: docker} - {role: tsg-diagnose, tags: tsg-diagnose} @@ -165,6 +170,7 @@ - {role: k8s-dashboard, tags: k8s-dashboard} - {role: k3s-exporter, tags: k3s-exporter} - {role: tsg-diagnose, tags: tsg-diagnose} + - {role: sysctl, tags: sysctl} - {role: system-init-TSG-X-P1403, tags: system-init-TSG-X-P1403} - {role: system-init, tags: system-init} - {role: consul, tags: consul} diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 3c203d23..6369cf09 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -52,7 +52,7 @@ framework_rpm_version: # 17_libmaatframe_tools: libmaatframe-tools-3.6.19.9c4741d 18_libswarmkv: libswarmkv-3.0.6.4165cac 19_libswarmkv-tools: libswarmkv-tools-3.0.6.4165cac - 20_libfieldstat3: libfieldstat3-3.0.11.061640c + 20_libfieldstat3: libfieldstat3-3.0.15.2693d63 21_libmaat4: libmaat4-4.0.40.2e1a14e 22_libMESA_sts: libMESA_sts-1.0.2.dd68f5c 23_libfieldstat4: libfieldstat4-4.2.1.6e5d010 diff --git a/ansible/roles/sysctl/files/90-telegraf.conf b/ansible/roles/sysctl/files/90-telegraf.conf new file mode 100644 index 00000000..4edc3f05 --- /dev/null +++ b/ansible/roles/sysctl/files/90-telegraf.conf @@ -0,0 +1,3 @@ +# read/write buffer +net.core.rmem_max = 33554432 +net.core.wmem_max = 33554432 diff --git a/ansible/roles/sysctl/tasks/main.yml b/ansible/roles/sysctl/tasks/main.yml new file mode 100644 index 00000000..c70bfee8 --- /dev/null +++ b/ansible/roles/sysctl/tasks/main.yml @@ -0,0 +1,4 @@ +- name: "copy telegraf sysctl.d to destination server" + copy: + src: "{{ role_path }}/files/90-telegraf.conf" + dest: /usr/lib/sysctl.d/
\ No newline at end of file diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 index 60107e2e..0ed07aa3 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 @@ -38,6 +38,7 @@ [[inputs.socket_listener]] service_address = "udp://:8900" data_format = "influx" + read_buffer_size = "32MiB" [[processors.rename]] [[processors.rename.replace]] field = "hit_count_sum" diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 index a0a02e61..80fcb665 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 @@ -31,6 +31,7 @@ [[inputs.socket_listener]] service_address = "udp://:8400" data_format = "influx" + read_buffer_size = "32MiB" [[outputs.kafka]] sasl_username = "admin" diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 index 1470a1d6..19d8dc94 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 @@ -33,6 +33,7 @@ [[inputs.socket_listener]] service_address = "udp://:8200" data_format = "influx" + read_buffer_size = "32MiB" #[[processors.converter]] # [processors.converter.tags] diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 index 92d462a8..14ed3acd 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 @@ -38,6 +38,7 @@ [[inputs.socket_listener]] service_address = "udp://:8100" data_format = "influx" + read_buffer_size = "32MiB" [[aggregators.basicstats]] period = "1s" diff --git a/ansible/roles/tfe/tasks/main.yml b/ansible/roles/tfe/tasks/main.yml index 5833c74c..61164ee4 100644 --- a/ansible/roles/tfe/tasks/main.yml +++ b/ansible/roles/tfe/tasks/main.yml @@ -47,6 +47,10 @@ src: "{{ role_path }}/templates/tfe-env-config.j2" dest: /etc/sysconfig/tfe-env-config +- name: "move tfe sysctl.conf" + shell: mv /etc/sysctl.d/80-tfe.conf /usr/lib/sysctl.d/80-tfe.conf + when: runtime_env != 'TSG-X-P0906' + - name: "template the tfe.conf" template: src: "{{ role_path }}/templates/tfe.conf.j2.j2" diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf index 0b1d6f0b..a0421e40 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf @@ -30,6 +30,7 @@ [[inputs.socket_listener]] service_address = "udp://:8900" data_format = "influx" + read_buffer_size = "32MiB" [[processors.rename]] [[processors.rename.replace]] field = "hit_count_sum" diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf index a422cffc..b8f917bb 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf @@ -25,6 +25,7 @@ [[inputs.socket_listener]] service_address = "udp://:8300" data_format = "influx" + read_buffer_size = "32MiB" #[[processors.converter]] # [processors.converter.tags] diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf index 57526fae..3a6e3726 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf @@ -25,6 +25,7 @@ [[inputs.socket_listener]] service_address = "udp://:8400" data_format = "influx" + read_buffer_size = "32MiB" [[outputs.kafka]] sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}" diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf index d0df97b4..64d9d3e2 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf @@ -25,6 +25,7 @@ [[inputs.socket_listener]] service_address = "udp://:8200" data_format = "influx" + read_buffer_size = "32MiB" #[[processors.converter]] # [processors.converter.tags] diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf index 1f4037e3..1fef9474 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf @@ -30,6 +30,7 @@ [[inputs.socket_listener]] service_address = "udp://:8100" data_format = "influx" + read_buffer_size = "32MiB" [[aggregators.basicstats]] period = "1s" diff --git a/make/Makefile.TSGXNXR620G40R01P0906 b/make/Makefile.TSGXNXR620G40R01P0906 index ae2bf7d7..e28d3ddd 100644 --- a/make/Makefile.TSGXNXR620G40R01P0906 +++ b/make/Makefile.TSGXNXR620G40R01P0906 @@ -70,7 +70,7 @@ add-images-into-sysroot: builddir sysroot-verfile sysroot-ansible cp $(IMAGEDIR_BASE)/$(APP_BUNDLE_BIN) $(TARGET_INSTALLER_DIR)/$(APP_BUNDLE_BIN) sysroot-archive: installer add-images-into-sysroot sysroot-cleanup - cp $(IMAGEDIR_BASE)/80-tfe.conf $(TARGET_SYSROOT_DIR)/etc/sysctl.d/ + cp $(IMAGEDIR_BASE)/80-tfe.conf $(TARGET_SYSROOT_DIR)/usr/lib/sysctl.d/ tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_SYSROOT_DIR) . | pbzip2 -p9 > $(TARGET_INSTALLER_DIR)/$(CHROOT_PKG) sysroot-binary: sysroot-archive |