[bug]Bug fix of sonic telemetry monitor. #4286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
retest this please |
|
retest broadcom please |
|
retest mellanox please |
lguohan
approved these changes
Mar 22, 2020
abdosi
pushed a commit
that referenced
this pull request
Aug 24, 2020
…ecure mode (#4286) When telemetry is in secure mode ,the monitor will have error log of the match string "--insecure". So I modify to be compatiable with insecure mode and secure mode. Co-authored-by: Ubuntu <ubuntu@ip-10-5-1-21.ap-south-1.compute.internal>
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
May 14, 2021
Commit: 50e4cc1 Backport ethtool to support QSFP-DD (sonic-net#5725) Using Diff from Last Merge i.e. below commit: 6aef4d3 (HEAD) Merge branch 'dev_3.0' of ssh://git.corp.linkedin.com:29418/sonic/sonic-buildimage into MERGE_201911_0824 diff from 4810db8 [monit]: monit_telemetry which will have error when telemetry is in secure mode (sonic-net#4286) Signed-off-by: svc-lnos-user <svc-lnos-user@linkedin.com> Signed-off-by: Praveen Chaudhary <pchaudhary@linkedin.com> RB= G=lnos-reviewers R=pchaudhary,pmao,samaity,zxu A= RB= G=lnos-reviewers R=pchaudhary,pmao,samaity,zxu A= Changes to be committed: new file: .reviewboardrc new file: acl/main.acl modified: build_debian.sh modified: device/celestica/x86_64-cel_e1031-r0/installer.conf new file: device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-40/th-seastone-dx010-32x50G-16x100G.config.bcm new file: device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-50-40/th-seastone-dx010-48x50G-8x100G.config.bcm modified: device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/innovium.77700_B new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/utopias_32x100.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/config_db.json new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/innovium.77700_A new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/utopias_p3b.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/config_db.json new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/innovium.77700_B new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/utopias_128x100.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/default_sku new file: device/cisco/x86_64-cisco_N3K_C3432D/installer.conf new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/eeprom.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/led_control.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/psuutil.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/qsfpdd.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/sfputil.py new file: device/cisco/x86_64-cisco_N3K_C3432D/sensors.conf new file: device/cisco/x86_64-cisco_N3K_C3432D/topo.conf new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/th-cisco-3232c-32x100G.config.bcm new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/th-cisco-3232c-96x25G-16x50G.config.bcm new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/th-cisco-3232c-64x50G.config.bcm new file: device/cisco/x86_64-n3200-r0/installer.conf new file: device/cisco/x86_64-n3200-r0/plugins/eeprom.py new file: device/cisco/x86_64-n3200-r0/plugins/led_control.py new file: device/cisco/x86_64-n3200-r0/plugins/psuutil.py new file: device/cisco/x86_64-n3200-r0/plugins/sfputil.py new file: device/cisco/x86_64-n3200-r0/sensors.conf new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/th-open19-bolt-32x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/th-open19-bolt-96x25G-8x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/hwsku.json new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/th-open19-bolt-96x25G-16x50G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/th-open19-bolt-48x50G-8x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/th-open19-bolt-48x50G-16x50G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/i2c_init.sh new file: device/linkedin/x86_64-flex_bolthawk-r0/installer.conf new file: device/linkedin/x86_64-flex_bolthawk-r0/led-code/ledcode0 new file: device/linkedin/x86_64-flex_bolthawk-r0/led_proc_init.soc new file: device/linkedin/x86_64-flex_bolthawk-r0/platform.json new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/eeprom.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/helper_data.json new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/sensorutil.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/sfputil.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/urlheader.py new file: device/linkedin/x86_64-flex_bolthawk-r0/th-open19-bolt-flex-all.config.bcm new file: device/linkedin/x86_64-open19_bolt-r0 new file: device/linkedin/x86_64-qwave_bolt_uefi-r0 modified: dockers/docker-base/Dockerfile.j2 modified: dockers/docker-fpm-quagga/supervisord.conf modified: dockers/docker-router-advertiser/docker-init.sh modified: dockers/docker-router-advertiser/radvd.conf.j2 modified: dockers/docker-sonic-telemetry/Dockerfile.j2 new file: dockers/docker-sonic-telemetry/node_exporter.sh modified: dockers/docker-sonic-telemetry/start.sh modified: dockers/docker-sonic-telemetry/supervisord.conf modified: files/build_templates/docker_image_ctl.j2 modified: files/build_templates/organization_extensions.sh modified: files/build_templates/sonic_debian_extension.j2 modified: files/image_config/bash/bash.bashrc modified: files/image_config/interfaces/interfaces.j2 modified: files/image_config/rsyslog/rsyslog.conf.j2 modified: files/scripts/arp_update modified: installer/x86_64/install.sh modified: platform/broadcom/docker-syncd-brcm/Dockerfile.j2 modified: platform/broadcom/docker-syncd-brcm/start.sh modified: platform/broadcom/docker-syncd-brcm/supervisord.conf modified: platform/broadcom/one-image.mk new file: platform/broadcom/platform-modules-linkedin.mk new file: platform/broadcom/platform-modules-n9200.mk modified: platform/broadcom/rules.mk new file: platform/broadcom/sonic-platform-modules-linkedin/LICENSE new file: platform/broadcom/sonic-platform-modules-linkedin/README.md new file: platform/broadcom/sonic-platform-modules-linkedin/bolt-cel new file: platform/broadcom/sonic-platform-modules-linkedin/bolt-flex-old new file: platform/innovium/docker-orchagent-invm.mk new file: platform/innovium/platform-modules-cisco.mk modified: platform/vs/docker-sonic-vs/Dockerfile.j2 new file: release_version.json modified: rules/config modified: rules/docker-telemetry.mk modified: rules/sonic-utilities.mk modified: rules/telemetry.mk modified: slave.mk modified: sonic-slave-stretch/Dockerfile.j2 modified: src/sonic-config-engine/minigraph.py modified: src/sonic-device-data/tests/permitted_list new file: src/sonic-device-data/tests/platformJson_checker new file: src/wpasupplicant/sonic-wpa-supplicant Conflicts: .reviewboardrc acl/ build_debian.sh.rej device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-40/th-seastone-dx010-32x50G-16x100G.config.bcm device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-50-40/th-seastone-dx010-48x50G-8x100G.config.bcm device/cisco/ device/linkedin/ dockers/docker-router-advertiser/docker-init.sh.rej dockers/docker-sonic-telemetry/node_exporter.sh files/build_templates/docker_image_ctl.j2.rej files/build_templates/sonic_debian_extension.j2.rej files/image_config/interfaces/interfaces.j2.rej files/image_config/logrotate/logrotate.d/rsyslog.rej files/image_config/rsyslog/rsyslog.d/00-sonic.conf.rej files/scripts/arp_update.rej platform/broadcom/docker-syncd-brcm/Dockerfile.j2.rej platform/broadcom/platform-modules-linkedin.mk platform/broadcom/platform-modules-n9200.mk platform/broadcom/sai.mk.rej platform/broadcom/sonic-platform-modules-linkedin/ platform/innovium/docker-orchagent-invm.mk platform/innovium/platform-modules-cisco.mk platform/vs/docker-sonic-vs.mk.rej platform/vs/docker-sonic-vs/Dockerfile.j2.rej platform/vs/docker-sonic-vs/start.sh.rej release_version.json rules/config.rej rules/docker-telemetry.mk.rej rules/sonic-platform-common.mk.rej rules/sonic-utilities.mk.rej rules/sonic-yang-mgmt-py2.mk rules/telemetry.mk.rej slave.mk.rej sonic-slave-jessie/Dockerfile.j2.rej sonic-slave-stretch/Dockerfile.j2.rej src/sonic-config-engine/minigraph.py.rej src/sonic-config-engine/portconfig.py.rej src/sonic-config-engine/sonic-cfggen.rej src/sonic-device-data/src/Makefile.rej src/sonic-device-data/tests/media_checker.rej src/sonic-device-data/tests/permitted_list.rej src/sonic-device-data/tests/platformJson_checker src/wpasupplicant/
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When telemetry is in secure mode ,the monitor will have error log of the match string "--insecure". So I modify to be compatiable with insecure mode and secure mode.