Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated to support snmp config from redis configdb #6134

Merged
merged 11 commits into from
Jan 5, 2021
Merged

updated to support snmp config from redis configdb #6134

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb02a02
updated to support snmp config from redis configdb
Dec 4, 2020
98aca9d
updated for cases when configdb is empty
Dec 5, 2020
f227173
updated per PR comments
Dec 11, 2020
df113e1
updated snmp jinja2 file to use ConfigDB as main source and snmp.yml …
Dec 11, 2020
4712476
updated to add new changes
Dec 29, 2020
0b749eb
updated jinja file to get info from only configdb. The snmp.yml file…
Dec 29, 2020
fabc562
removing snmp.yml file from SONIC_CFGGEN_ARGS as it was already picke…
Dec 29, 2020
def1c15
updated to check if SNMP location and contact are not configured
Dec 29, 2020
e05110f
removed unneeded else per PR comments
Dec 30, 2020
fbe5d36
updated to removed unneeded 'else' in template
Dec 30, 2020
9b1d597
updated jinja template to fix spacing issues and update else to be el…
Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions dockers/docker-snmp/snmpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,37 @@ agentAddress udp6:161
# system + hrSystem groups only
view systemonly included .1.3.6.1.2.1.1
view systemonly included .1.3.6.1.2.1.25.1

# Default access to basic system info
{% if snmp_rocommunities %}
{% for community in snmp_rocommunities %}

{% if SNMP_COMMUNITY is defined %}
{% for community in SNMP_COMMUNITY %}
{% if SNMP_COMMUNITY[community]['TYPE'] == 'RO' %}
rocommunity {{ community }}
rocommunity6 {{ community }}
{% endif %}
{% endfor %}
{% endif %}

{% if SNMP_COMMUNITY is defined %}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% for community in SNMP_COMMUNITY %}
{% if SNMP_COMMUNITY[community]['TYPE'] == 'RW' %}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
rwcommunity {{ community }}
rwcommunity6 {{ community }}
{% endif %}
{% endfor %}
{% endif %}

{% if SNMP_USER is defined %}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% for user in SNMP_USER %}
{% if SNMP_USER[user]['SNMP_USER_PERMISSION'] == 'RO' %}
rouser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% else %}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
rwuser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
{% endif %}
{% endfor %}
{% else %}
rocommunity {{ snmp_rocommunity }}
rocommunity6 {{ snmp_rocommunity }}
{% endif %}

###############################################################################
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -51,8 +72,16 @@ rocommunity6 {{ snmp_rocommunity }}

# Note that setting these values here, results in the corresponding MIB objects being 'read-only'
# See snmpd.conf(5) for more details
sysLocation {{ snmp_location }}
{% if SNMP is defined and SNMP.LOCATION is defined %}
sysLocation {{ SNMP.LOCATION.Location }}
{% else %}
sysLocation public
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
{% if SNMP is defined and SNMP.CONTACT is defined %}
sysContact {{ SNMP.CONTACT.keys()[0] }} {{ SNMP.CONTACT.values()[0] }}
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% else %}
sysContact Azure Cloud Switch vteam <linuxnetdev@microsoft.com>
tsvanduyn marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
# Application + End-to-End layers
sysServices 72

Expand Down
1 change: 0 additions & 1 deletion dockers/docker-snmp/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ SONIC_CFGGEN_ARGS=" \
-d \
-y /etc/sonic/sonic_version.yml \
-t /usr/share/sonic/templates/sysDescription.j2,/etc/ssw/sysDescription \
-y /etc/sonic/snmp.yml \
-t /usr/share/sonic/templates/snmpd.conf.j2,/etc/snmp/snmpd.conf \
"

Expand Down