From 08b6fcf4c00deb2efb7ddb759b430ab7effa3cc8 Mon Sep 17 00:00:00 2001
From: Micael Karlberg
Date: Fri, 11 Oct 2013 13:06:19 +0200
Subject: [snmp] Updated release notes, ref man, appup and assigned proper
version
---
lib/snmp/doc/src/snmpm.xml | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
(limited to 'lib/snmp/doc/src/snmpm.xml')
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 07fdd208ff..f7b7e6220e 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -4,7 +4,7 @@
- 20042012
+ 20042013
Ericsson AB. All Rights Reserved.
@@ -1209,32 +1209,40 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
- log_to_txt(LogDir, Mibs)
- log_to_txt(LogDir, Mibs, OutFile) -> ok | {error, Reason}
- log_to_txt(LogDir, Mibs, OutFile, LogName) -> ok | {error, Reason}
- log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> ok | {error, Reason}
- log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> ok | {error, Reason}
+ log_to_txt(LogDir)
+ log_to_txt(LogDir, Block | Mibs)
+ log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {error, Reason}
+ log_to_txt(LogDir, Mibs, OutFile, Block | LogName) -> ok | {error, Reason}
+ log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) -> ok | {error, Reason}
+ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) -> ok | {error, Reason}
+ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start) -> ok | {error, Reason}
log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> ok | {error, Reason}
+ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> ok | {error, Reason}
Convert an Audit Trail Log to text format
LogDir = string()
Mibs = [MibName]
MibName = string()
+ Block = block()
OutFile = string()
LogName = string()
LogFile = string()
- Start = Stop = null | datetime() | {local_time,datetime()} | {universal_time,datetime()}
+ Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()}
Reason = disk_log_open_error() | file_open_error() | term()
disk_log_open_error() = {LogName, term()}
file_open_error() = {OutFile, term()}
Converts an Audit Trail Log to a readable text file.
- OutFile defaults to "./snmpm_log.txt".
- LogName defaults to "snmpm_log".
- LogFile defaults to "snmpm.log".
- See snmp:log_to_txt
- for more info.
+ OutFile defaults to "./snmpm_log.txt".
+ LogName defaults to "snmpm_log".
+ LogFile defaults to "snmpm.log".
+ The Block option indicates if the log should be blocked
+ during conversion. This could be usefull when converting large
+ logs (when otherwise the log could wrap during conversion).
+ Defaults to false.
+ See snmp:log_to_txt
+ for more info.
@@ -1242,20 +1250,23 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
log_to_io(LogDir) -> ok | {error, Reason}
+ log_to_io(LogDir, Block | Mibs) -> ok | {error, Reason}
log_to_io(LogDir, Mibs) -> ok | {error, Reason}
- log_to_io(LogDir, Mibs) -> ok | {error, Reason}
- log_to_io(LogDir, Mibs, LogName) -> ok | {error, Reason}
- log_to_io(LogDir, Mibs, LogName, LogFile) -> ok | {error, Reason}
- log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> ok | {error, Reason}
+ log_to_io(LogDir, Mibs, Block | LogName) -> ok | {error, Reason}
+ log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {error, Reason}
+ log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {error, Reason}
+ log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {error, Reason}
log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {error, Reason}
+ log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {error, Reason}
Convert an Audit Trail Log to text format
LogDir = string()
Mibs = [MibName]
MibName = string()
+ Block = block()
LogName = string()
LogFile = string()
- Start = Stop = null | datetime() | {local_time,datetime()} | {universal_time,datetime()}
+ Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()}
Reason = disk_log_open_error() | file_open_error() | term()
disk_log_open_error() = {LogName, term()}
file_open_error() = {OutFile, term()}
--
cgit v1.2.3
From 1508a71c3ec41347e6e34c57671028f2e4640680 Mon Sep 17 00:00:00 2001
From: Micael Karlberg
Date: Tue, 19 Nov 2013 12:41:02 +0100
Subject: [snmp] Cleanup and changed atl conversion block default
Changed the default value for the Audit Trail Log
conversion to true. Also some cleanup.
OTP-11396
---
lib/snmp/doc/src/snmpm.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
(limited to 'lib/snmp/doc/src/snmpm.xml')
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index f7b7e6220e..a0a1b5716d 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -1223,7 +1223,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
LogDir = string()
Mibs = [MibName]
MibName = string()
- Block = block()
+ Block = boolean()
OutFile = string()
LogName = string()
LogFile = string()
@@ -1237,10 +1237,10 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
OutFile defaults to "./snmpm_log.txt".
LogName defaults to "snmpm_log".
LogFile defaults to "snmpm.log".
- The Block option indicates if the log should be blocked
+
The Block argument indicates if the log should be blocked
during conversion. This could be usefull when converting large
logs (when otherwise the log could wrap during conversion).
- Defaults to false.
+ Defaults to true.
See snmp:log_to_txt
for more info.
@@ -1263,7 +1263,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
LogDir = string()
Mibs = [MibName]
MibName = string()
- Block = block()
+ Block = boolean()
LogName = string()
LogFile = string()
Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()}
@@ -1276,6 +1276,10 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
prints it on stdio.
LogName defaults to "snmpm_log".
LogFile defaults to "snmpm.log".
+ The Block argument indicates if the log should be blocked
+ during conversion. This could be usefull when converting large
+ logs (when otherwise the log could wrap during conversion).
+ Defaults to true.
See snmp:log_to_io
for more info.
--
cgit v1.2.3