From d60461b042df3ea05a405ca2f5f12790873e43e2 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme <jan.philipp@timme.it> Date: Fri, 19 Jul 2019 17:19:05 +0200 Subject: [PATCH] Remove snmpd, we have check_mk --- hshbase/init.sls | 1 - hshbase/snmpd/files/default.snmpd | 3 --- hshbase/snmpd/files/snmpd.conf | 23 ------------------- hshbase/snmpd/init.sls | 38 ------------------------------- 4 files changed, 65 deletions(-) delete mode 100644 hshbase/snmpd/files/default.snmpd delete mode 100644 hshbase/snmpd/files/snmpd.conf delete mode 100644 hshbase/snmpd/init.sls diff --git a/hshbase/init.sls b/hshbase/init.sls index 25cf01f..706fd03 100644 --- a/hshbase/init.sls +++ b/hshbase/init.sls @@ -8,4 +8,3 @@ include: - .openvmtools - .time - .locale - - .snmpd diff --git a/hshbase/snmpd/files/default.snmpd b/hshbase/snmpd/files/default.snmpd deleted file mode 100644 index 60af2f2..0000000 --- a/hshbase/snmpd/files/default.snmpd +++ /dev/null @@ -1,3 +0,0 @@ -# Don't load any MIBs by default. -# You might comment this lines once you have the MIBs downloaded. -export MIBS=UCD-SNMP-MIB diff --git a/hshbase/snmpd/files/snmpd.conf b/hshbase/snmpd/files/snmpd.conf deleted file mode 100644 index b2d713e..0000000 --- a/hshbase/snmpd/files/snmpd.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Listen on all interfaces - default is good -agentAddress udp:161,udp6:[::1]:161 -# Credentials for SNMPv3 - used in What's Up Gold -createUser hshuser MD5 "hshmonitoringtest" -defaultMonitors yes -# specific disk monitoring -disk / 10000 -disk /var 5% -# also list all other disks -includeAllDisks 10% -iquerySecName hshuser -linkUpDownNotifications yes -# maximum load threshold (1min, 5min, 15min) -load 12 10 5 -master agentx -rouser hshuser -sysContact HsH Webteam -sysLocation HsH IT VDC -# 72 is alright for now. (No idea) -sysServices 72 -# default systemonly view is fine -view systemonly included .1.3.6.1.2.1.1 -view systemonly included .1.3.6.1.2.1.25.1 diff --git a/hshbase/snmpd/init.sls b/hshbase/snmpd/init.sls deleted file mode 100644 index 239a909..0000000 --- a/hshbase/snmpd/init.sls +++ /dev/null @@ -1,38 +0,0 @@ -{% from "hshbase/map.jinja" import hshbase with context %} - -{% if hshbase.snmpd %} - -{% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %} -hsh_snmpd_installed: - pkg.installed: - - pkgs: [snmpd, snmp-mibs-downloader] - -/etc/snmp/snmpd.conf: - file.managed: - - source: salt://hshbase/snmpd/files/snmpd.conf - - mode: 644 - - user: root - - group: root - -/etc/default/snmpd: - file.managed: - - source: salt://hshbase/snmpd/files/default.snmpd - - mode: 644 - - user: root - - group: root - -hsh_snmpd_service_running: - service.running: - - name: snmpd - - reload: True - - enable: True - - watch: - - file: /etc/snmp/snmpd.conf - - file: /etc/default/snmpd - - require: - - file: /etc/snmp/snmpd.conf - - file: /etc/default/snmpd - - pkg: hsh_snmpd_installed -{% endif %} - -{% endif %} -- GitLab