Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
version 2.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@guilhemmarchand
guilhemmarchand committed Aug 10, 2017
1 parent d896670 commit 3207330
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 37 deletions.
Binary file renamed deb/nmon-logger-splunk-hec-2.0.6.deb → deb/nmon-logger-rsyslog-debian-2.0.7.deb
View file
Binary file not shown.
Binary file renamed deb/nmon-logger-rsyslog-ubuntu-2.0.6.deb → deb/nmon-logger-rsyslog-ubuntu-2.0.7.deb
View file
Binary file not shown.
Binary file renamed deb/nmon-logger-rsyslog-debian-2.0.6.deb → deb/nmon-logger-splunk-hec-2.0.7.deb
View file
Binary file not shown.
Binary file renamed deb/nmon-logger-syslog-ng-2.0.6.deb → deb/nmon-logger-syslog-ng-2.0.7.deb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion debbuild/nmon-logger-rsyslog/DEBIAN/control
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: nmon-logger-rsyslog
Version: 2.0.6
Version: 2.0.7
Section: base
Priority: optional
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion debbuild/nmon-logger-splunk-hec/DEBIAN/control
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: nmon-logger-splunk-hec
Version: 2.0.6
Version: 2.0.7
Section: base
Priority: optional
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion debbuild/nmon-logger-syslog-ng/DEBIAN/control
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: nmon-logger-syslog-ng
Version: 2.0.6
Version: 2.0.7
Section: base
Priority: optional
Architecture: all
Expand Down
6 changes: 6 additions & 0 deletions docs/releasenotes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Release notes
What has been fixed by release
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

=======
V2.0.7:
=======

- fix: Python parser issue - epoch time stamp incorrectly parsed for dynamic data #4

=======
V2.0.6:
=======
Expand Down
22 changes: 13 additions & 9 deletions nmon-logger-rsyslog/etc/nmon-logger/bin/nmon2kv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
# - Optimize nmon_processing output and reduce volume of data to be generated #37
# - 2017/27/07: V1.0.7: Guilhem Marchand:
# - Splunk HEC implementation
# - 2017/10/08: V1.0.8: Guilhem Marchand:
# - Fix epoch timestmap failure for dynamic sections

# Load libs

Expand All @@ -62,7 +64,7 @@
import subprocess

# Converter version
nmon2kv_version = '1.0.7'
nmon2kv_version = '1.0.8'

# LOGGING INFORMATION:
# - The program uses the standard logging Python module to display important messages in Splunk logs
Expand Down Expand Up @@ -2265,7 +2267,7 @@ def dynamic_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2317,7 +2319,7 @@ def dynamic_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2364,7 +2366,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),
else:
if debug:
logging.debug("DEBUG, " + str(section) + " ignoring event " + str(ZZZZ_timestamp) +
Expand Down Expand Up @@ -2415,7 +2417,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2436,6 +2438,7 @@ def dynamic_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down Expand Up @@ -2656,7 +2659,7 @@ def solaris_wlm_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2708,7 +2711,7 @@ def solaris_wlm_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2755,7 +2758,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

else:
if debug:
Expand Down Expand Up @@ -2807,7 +2810,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2827,6 +2830,7 @@ def solaris_wlm_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down
2 changes: 1 addition & 1 deletion nmon-logger-rsyslog/etc/nmon-logger/default/app.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# app.conf

version = 2.0.6
version = 2.0.7
22 changes: 13 additions & 9 deletions nmon-logger-splunk-hec/etc/nmon-logger/bin/nmon2kv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
# - Optimize nmon_processing output and reduce volume of data to be generated #37
# - 2017/27/07: V1.0.7: Guilhem Marchand:
# - Splunk HEC implementation
# - 2017/10/08: V1.0.8: Guilhem Marchand:
# - Fix epoch timestmap failure for dynamic sections

# Load libs

Expand All @@ -62,7 +64,7 @@
import subprocess

# Converter version
nmon2kv_version = '1.0.7'
nmon2kv_version = '1.0.8'

# LOGGING INFORMATION:
# - The program uses the standard logging Python module to display important messages in Splunk logs
Expand Down Expand Up @@ -2265,7 +2267,7 @@ def dynamic_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2317,7 +2319,7 @@ def dynamic_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2364,7 +2366,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),
else:
if debug:
logging.debug("DEBUG, " + str(section) + " ignoring event " + str(ZZZZ_timestamp) +
Expand Down Expand Up @@ -2415,7 +2417,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2436,6 +2438,7 @@ def dynamic_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down Expand Up @@ -2656,7 +2659,7 @@ def solaris_wlm_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2708,7 +2711,7 @@ def solaris_wlm_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2755,7 +2758,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

else:
if debug:
Expand Down Expand Up @@ -2807,7 +2810,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2827,6 +2830,7 @@ def solaris_wlm_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down
2 changes: 1 addition & 1 deletion nmon-logger-splunk-hec/etc/nmon-logger/default/app.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# app.conf

version = 2.0.6
version = 2.0.7
22 changes: 13 additions & 9 deletions nmon-logger-syslog-ng/etc/nmon-logger/bin/nmon2kv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
# - Optimize nmon_processing output and reduce volume of data to be generated #37
# - 2017/27/07: V1.0.7: Guilhem Marchand:
# - Splunk HEC implementation
# - 2017/10/08: V1.0.8: Guilhem Marchand:
# - Fix epoch timestmap failure for dynamic sections

# Load libs

Expand All @@ -62,7 +64,7 @@
import subprocess

# Converter version
nmon2kv_version = '1.0.7'
nmon2kv_version = '1.0.8'

# LOGGING INFORMATION:
# - The program uses the standard logging Python module to display important messages in Splunk logs
Expand Down Expand Up @@ -2265,7 +2267,7 @@ def dynamic_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2317,7 +2319,7 @@ def dynamic_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2364,7 +2366,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),
else:
if debug:
logging.debug("DEBUG, " + str(section) + " ignoring event " + str(ZZZZ_timestamp) +
Expand Down Expand Up @@ -2415,7 +2417,7 @@ def dynamic_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2436,6 +2438,7 @@ def dynamic_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down Expand Up @@ -2656,7 +2659,7 @@ def solaris_wlm_section_fn(section):
if header_match:
header = header_match.group(2)

final_header = 'ZZZZ' + ',' + header + '\n'
final_header = 'timestamp' + ',' + 'ZZZZ' + ',' + header + '\n'

# increment
count += 1
Expand Down Expand Up @@ -2708,7 +2711,7 @@ def solaris_wlm_section_fn(section):
perfdata = perfdata_match.group(2)

# final perfdata
final_perfdata = ZZZZ_timestamp + ',' + perfdata + '\n'
final_perfdata = ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'

if realtime:

Expand Down Expand Up @@ -2755,7 +2758,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

else:
if debug:
Expand Down Expand Up @@ -2807,7 +2810,7 @@ def solaris_wlm_section_fn(section):
sanity_check = 0

# Write perf data
membuffer.write(ZZZZ_timestamp + ',' + perfdata + '\n'),
membuffer.write(ZZZZ_epochtime + ',' + ZZZZ_timestamp + ',' + perfdata + '\n'),

if sanity_check == 0:

Expand All @@ -2827,6 +2830,7 @@ def solaris_wlm_section_fn(section):

for d in csv.DictReader(membuffer):
ZZZZ = d.pop('ZZZZ')
ZZZZ_epochtime = d.pop('timestamp')
for device, value in sorted(d.items()):
# increment
count += 1
Expand Down
2 changes: 1 addition & 1 deletion nmon-logger-syslog-ng/etc/nmon-logger/default/app.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# app.conf

version = 2.0.6
version = 2.0.7
Binary file renamed rpm/nmon-logger-rsyslog-2.0.6-0.noarch.rpm → rpm/nmon-logger-rsyslog-2.0.7-0.noarch.rpm
View file
Binary file not shown.
Binary file renamed ...nmon-logger-splunk-hec-2.0.6-0.noarch.rpm → ...nmon-logger-splunk-hec-2.0.7-0.noarch.rpm
View file
Binary file not shown.
Binary file renamed rpm/nmon-logger-syslog-ng-2.0.6-0.noarch.rpm → rpm/nmon-logger-syslog-ng-2.0.7-0.noarch.rpm
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion rpmbuild/SPECS/nmon-logger-rsyslog.spec
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: nmon-logger-rsyslog
Version: 2.0.6
Version: 2.0.7
Release: 0
Summary: nmon-logger for rsyslog
Source: %{name}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion rpmbuild/SPECS/nmon-logger-splunk-hec.spec
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: nmon-logger-splunk-hec
Version: 2.0.6
Version: 2.0.7
Release: 0
Summary: nmon-logger for Splunk HEC
Source: %{name}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion rpmbuild/SPECS/nmon-logger-syslog-ng.spec
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: nmon-logger-syslog-ng
Version: 2.0.6
Version: 2.0.7
Release: 0
Summary: nmon-logger for syslog-ng
Source: %{name}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion rpmbuild/SPECS_AIX/nmon-logger-splunk-hec.spec
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: nmon-logger-splunk-hec
Version: 2.0.6
Version: 2.0.7
Release: 0
Summary: nmon-logger for Splunk HEC
Source: %{name}.tar.gz
Expand Down

0 comments on commit 3207330

Please sign in to comment.