From dbd9e8b7fb3b8517868378431101985515898c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=99=A5=20Ivan=20Tam=20=E2=99=A5?= Date: Sat, 31 Aug 2013 02:34:17 +0000 Subject: [PATCH 1/2] Adds 'example' tag to the configuration Also adds more feedback during the verify loop. --- configure-syslog.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure-syslog.py b/configure-syslog.py index fa02210..4a22f0a 100755 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -42,7 +42,7 @@ NON_ROOT_USER = 2 MINIMUM_SUPPORTED_PYTHON_VERSION = '2.6' -VERIFICATION_SLEEP_INTERAVAL = 25 +VERIFICATION_SLEEP_INTERAVAL = 240 VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION = 5 LOGGLY_SETUP_LOG_FILE = "loggly_setup.log" @@ -123,7 +123,7 @@ %s template LogglyFormat { template("<${PRI}>1 ${ISODATE} ${HOST} ${PROGRAM} \ -${PID} ${MSGID} [%s@%s] $MSG\\n");}; +${PID} ${MSGID} [%s@%s tag=\\"example\\"] $MSG\\n");}; destination d_loggly {tcp("%s" port(%s) template(LogglyFormat));}; log { source(%s); destination(d_loggly); }; @@ -140,7 +140,7 @@ # Define the template used for sending logs to Loggly. Do not change this format. $template LogglyFormat,"<%%pri%%>%%protocol-version%% %%timestamp:::date-rfc3339%% \ -%%HOSTNAME%% %%app-name%% %%procid%% %%msgid%% [%s@%s] %%msg%%" +%%HOSTNAME%% %%app-name%% %%procid%% %%msgid%% [%s@%s tag=\\"example\\"] %%msg%%" # Send messages to syslog server listening on TCP port using template *.* @@%s:%s;LogglyFormat @@ -1078,6 +1078,9 @@ def doverify(loggly_user, loggly_password, loggly_subdomain): # Implement REST APIs to search if dummy message has been sent. wait_time = 0 while wait_time < VERIFICATION_SLEEP_INTERAVAL: + print ".", + sys.stdout.flush() + LOGGER.debug("Sending search request. %s" % search_url) data = get_json_data(search_url, loggly_user, loggly_password) rsid = data["rsid"]["id"] @@ -1086,11 +1089,13 @@ def doverify(loggly_user, loggly_password, loggly_subdomain): data = get_json_data(search_result_url, loggly_user, loggly_password) total_events = data["total_events"] if total_events >= 1 and VERIFICATION_FAIL not in LOGGLY_QA: + print "." LOGGER.info("******* Congratulations! " "Loggly is configured successfully.") break wait_time += VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION time.sleep(VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION) + if wait_time >= VERIFICATION_SLEEP_INTERAVAL: LOGGER.critical(VERIFICATION_FAIL_MESSAGE) From 1b70f2fe92035e41dd2811f77b3636b9cc884f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=99=A5=20Ivan=20Tam=20=E2=99=A5?= Date: Sat, 31 Aug 2013 17:17:32 -0700 Subject: [PATCH 2/2] Fix misspelling --- configure-syslog.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure-syslog.py b/configure-syslog.py index af957d4..7f8da64 100755 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -41,8 +41,8 @@ NON_ROOT_USER = 2 MINIMUM_SUPPORTED_PYTHON_VERSION = '2.6' -VERIFICATION_SLEEP_INTERAVAL = 240 -VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION = 5 +VERIFICATION_SLEEP_INTERVAL = 240 +VERIFICATION_SLEEP_INTERVAL_PER_ITERATION = 5 OS_UBUNTU = 1 OS_FEDORA = 2 @@ -1144,7 +1144,7 @@ def doverify(loggly_user, loggly_password, loggly_subdomain): search_url = REST_URL_GET_SEARCH_ID % (loggly_subdomain, LOGGLY_DOMAIN, unique_string) # Implement REST APIs to search if dummy message has been sent. wait_time = 0 - while wait_time < VERIFICATION_SLEEP_INTERAVAL: + while wait_time < VERIFICATION_SLEEP_INTERVAL: print ".", sys.stdout.flush() @@ -1161,10 +1161,10 @@ def doverify(loggly_user, loggly_password, loggly_subdomain): "Loggly is configured successfully."), print_comp = True) break - wait_time += VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION - time.sleep(VERIFICATION_SLEEP_INTERAVAL_PER_ITERATION) + wait_time += VERIFICATION_SLEEP_INTERVAL_PER_ITERATION + time.sleep(VERIFICATION_SLEEP_INTERVAL_PER_ITERATION) - if wait_time >= VERIFICATION_SLEEP_INTERAVAL: + if wait_time >= VERIFICATION_SLEEP_INTERVAL: Logger.printLog(VERIFICATION_FAIL_MESSAGE, prio = 'crit', print_comp = True)