starlingx/monitoring
Code Issues Proposed changes

Merge "Reduce the collectd samples retention period"

Browse Source
This commit is contained in:
Zuul 2019-05-10 17:56:44 +00:00 committed by Gerrit Code Review
commit 3d72ac2fb3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collectd-extensions/centos/build_srpm.data
View File

@ -22,4 +22,4 @@ COPY_LIST="$PKG_BASE/src/LICENSE \
$PKG_BASE/src/ptp.conf \ $PKG_BASE/src/ptp.conf \
$PKG_BASE/src/example.py \ $PKG_BASE/src/example.py \
$PKG_BASE/src/example.conf" $PKG_BASE/src/example.conf"
TIS_PATCH_VER=10 TIS_PATCH_VER=11

8
collectd-extensions/src/fm_notifier.py
View File

@ -283,7 +283,7 @@ class PluginObject:
collectd.info('%s %s : %s' % (PLUGIN, self.plugin, string)) collectd.info('%s %s : %s' % (PLUGIN, self.plugin, string))
def _llog(self, string): def _llog(self, string):
"""Create a collectd notifier info log with the string param if debug_lists""" """Create a collectd notifier info log when debug_lists not empty"""
if debug_lists: if debug_lists:
collectd.info('%s %s : %s' % (PLUGIN, self.plugin, string)) collectd.info('%s %s : %s' % (PLUGIN, self.plugin, string))
@ -1077,7 +1077,7 @@ def _database_setup(database):
# TODO: Read current retention period from service parameter # TODO: Read current retention period from service parameter
# Make it a puppet implementation. # Make it a puppet implementation.
# #
# Create a 1 month samples retention policy # Create a '1 week' samples retention policy
# ----------------------------------------- # -----------------------------------------
# name = 'collectd samples' # name = 'collectd samples'
# duration = set retention period in time # duration = set retention period in time
@ -1092,14 +1092,14 @@ def _database_setup(database):
############################################################ ############################################################
PluginObject.dbObj.create_retention_policy( PluginObject.dbObj.create_retention_policy(
DATABASE_NAME, '4w', 1, database, True) DATABASE_NAME, '1w', 1, database, True)
except Exception as ex: except Exception as ex:
if str(ex) == 'database already exists': if str(ex) == 'database already exists':
try: try:
collectd.info("%s influxdb:collectd %s" % collectd.info("%s influxdb:collectd %s" %
(PLUGIN, str(ex))) (PLUGIN, str(ex)))
PluginObject.dbObj.create_retention_policy( PluginObject.dbObj.create_retention_policy(
DATABASE_NAME, '4w', 1, database, True) DATABASE_NAME, '1w', 1, database, True)
except Exception as ex: except Exception as ex:
if str(ex) == 'retention policy already exists': if str(ex) == 'retention policy already exists':
collectd.info("%s influxdb:collectd %s" % collectd.info("%s influxdb:collectd %s" %