30 May
2018
30 May
'18
9:50 a.m.
Module: check_mk
Branch: master
Commit: afe4abc948113977e948bf1ea700bed9b2ef99d9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afe4abc9481139…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed May 30 09:36:44 2018 +0200
Improve formatting by extracting an SNMP credential.
Change-Id: Id0ba66dfc544cefbb98483cbb6207f4f21b99c24
---
cmk/ec/defaults.py | 59 ++++++++++++++++++++----------------------------------
1 file changed, 22 insertions(+), 37 deletions(-)
diff --git a/cmk/ec/defaults.py b/cmk/ec/defaults.py
index 5be8940..784154b 100644
--- a/cmk/ec/defaults.py
+++ b/cmk/ec/defaults.py
@@ -54,15 +54,17 @@ def default_rule_pack(rules):
def default_config():
# type: () -> Dict[str, Any]
"""Returns the default configuration"""
+ v1_v2_credential = {
+ "description": '"public" default for receiving SNMPv1/v2
traps',
+ "credentials": "public",
+ }
return {
"rules": [], # old pre 1.2.7i1 format. Only used if rule_packs is
empty
"rule_packs": [], # new format with rule packages
"mkp_rule_packs": {}, # rule packs provided by MKPs and referenced in
rule_packs
"actions": [],
- "debug_rules":
- False,
- "rule_optimizer":
- True,
+ "debug_rules": False,
+ "rule_optimizer": True,
"log_level": {
"cmk.mkeventd": cmk.log.INFO,
"cmk.mkeventd.EventServer": cmk.log.INFO,
@@ -70,39 +72,22 @@ def default_config():
"cmk.mkeventd.StatusServer": cmk.log.INFO,
"cmk.mkeventd.lock": cmk.log.INFO,
},
- "log_rulehits":
- False,
- "log_messages":
- False,
- "retention_interval":
- 60,
- "housekeeping_interval":
- 60,
- "statistics_interval":
- 5,
- "history_lifetime":
- 365, # days
- "history_rotation":
- "daily",
- "replication":
- None,
- "remote_status":
- None,
- "socket_queue_len":
- 10,
- "eventsocket_queue_len":
- 10,
+ "log_rulehits": False,
+ "log_messages": False,
+ "retention_interval": 60,
+ "housekeeping_interval": 60,
+ "statistics_interval": 5,
+ "history_lifetime": 365, # days
+ "history_rotation": "daily",
+ "replication": None,
+ "remote_status": None,
+ "socket_queue_len": 10,
+ "eventsocket_queue_len": 10,
"hostname_translation": {},
- "archive_orphans":
- False,
- "archive_mode":
- "file",
- "translate_snmptraps":
- False,
- "snmp_credentials": [{
- "description": "\"public\" default for receiving
SNMPv1/v2 traps",
- "credentials": "public",
- },],
+ "archive_orphans": False,
+ "archive_mode": "file",
+ "translate_snmptraps": False,
+ "snmp_credentials": [v1_v2_credential],
"event_limit": {
'by_host': {
'action': 'stop_overflow_notify',
@@ -115,6 +100,6 @@ def default_config():
'overall': {
'action': 'stop_overflow_notify',
'limit': 10000
- }
+ },
},
}