From c3718901127e6ad97243c1c515a2cacc553441d9 Mon Sep 17 00:00:00 2001
From: "Xiaoguang(William) Zhang" <xz8905@att.com>
Date: Sat, 22 Aug 2020 22:34:42 -0400
Subject: [PATCH] Add "alert.severities" flag to snmp-notifier
- Add "alert.severities" flag to snmp-notifier of Alertmanager
- Reogranize snmp-notifier flags.
Change-Id: I7e21241c8133289539b41a770e32a2fc1ae16c14
---
.../templates/snmp-notifier/snmp-deployment.yaml | 9 +++++----
prometheus-alertmanager/values.yaml | 11 ++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/prometheus-alertmanager/templates/snmp-notifier/snmp-deployment.yaml b/prometheus-alertmanager/templates/snmp-notifier/snmp-deployment.yaml
index 708260337..c7aa79adb 100644
--- a/prometheus-alertmanager/templates/snmp-notifier/snmp-deployment.yaml
+++ b/prometheus-alertmanager/templates/snmp-notifier/snmp-deployment.yaml
@@ -55,14 +55,15 @@ spec:
{{ tuple $envAll $envAll.Values.pod.resources.snmpnotifier | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "server" "container" "snmpnotifier" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
args:
- - --alert.severity-label={{ .Values.conf.command_flags.snmpnotifier.alert_severity_label}}
- --alert.default-severity={{ .Values.conf.command_flags.snmpnotifier.alert_default_severity}}
- - --snmp.version={{ .Values.conf.command_flags.snmpnotifier.snmp_version}}
+ - --alert.severities={{ .Values.conf.command_flags.snmpnotifier.alert_severities}}
+ - --alert.severity-label={{ .Values.conf.command_flags.snmpnotifier.alert_severity_label}}
+ - --log.level={{ .Values.conf.command_flags.snmpnotifier.log_level}}
+ - --snmp.community={{ .Values.conf.command_flags.snmpnotifier.snmp_community}}
- --snmp.destination={{ .Values.conf.command_flags.snmpnotifier.snmp_desination}}
- --snmp.trap-default-oid={{ .Values.conf.command_flags.snmpnotifier.snmp_trap_default_oid}}
- --snmp.trap-description-template={{ .Values.conf.command_flags.snmpnotifier.snmp_trap_description_template}}
- - --snmp.community={{ .Values.conf.command_flags.snmpnotifier.snmp_community}}
- - --log.level={{ .Values.conf.command_flags.snmpnotifier.log_level}}
+ - --snmp.version={{ .Values.conf.command_flags.snmpnotifier.snmp_version}}
ports:
- name: snmp-api
containerPort: {{ tuple "snmpnotifier" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index 4c71b401c..7bab8de60 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -255,14 +255,15 @@ conf:
cluster:
listen_address: "0.0.0.0:9094"
snmpnotifier:
- alert_severity_label: severity
alert_default_severity: crititcal
- snmp_version: V2c
- snmp_desination: 192.168.89.128:162
+ alert_severities: "critical,warning,info,page"
+ alert_severity_label: severity
+ log_level: debug
+ snmp_community: public
+ snmp_desination: 127.0.0.1:162
snmp_trap_default_oid: 1.3.6.1.4.1.98789.0.1
snmp_trap_description_template: /etc/snmp_notifier/description-template.tpl
- snmp_community: public
- log_level: debug
+ snmp_version: V2c
alertmanager: |
global:
# The smarthost and SMTP sender used for mail notifications.