From 0345f445d8dac295c25856cbe68c484dd977c5e6 Mon Sep 17 00:00:00 2001 From: Nathaniel Beckstead Date: Thu, 6 Feb 2020 18:32:03 -0500 Subject: [PATCH 1/2] record network requests --- src/lambda_function.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lambda_function.py b/src/lambda_function.py index bbe989a..6be5e12 100644 --- a/src/lambda_function.py +++ b/src/lambda_function.py @@ -116,6 +116,8 @@ def lambda_handler(event, context): if db_data['title'] == '': db_data['title'] = 'No title given' + db_data['net-requests'] = glimpse.get_network_history() + # Don't need if db_data['numscans'] is set to 0 when # the DB GET doesn't exist #if exists: From 75357916edcb60f31d8580d35e114656b994d392 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Sat, 11 Dec 2021 20:47:41 -0500 Subject: [PATCH 2/2] update LogDNA storage method --- src/logging_help.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/logging_help.py b/src/logging_help.py index 335ba6a..67ed54f 100644 --- a/src/logging_help.py +++ b/src/logging_help.py @@ -23,6 +23,14 @@ def get_env(): return log_env +def get_parameter(): + paramter_name = 'LogDNAIngestionKey' + region_name = "us-east-1" + + ssm_client = boto3.client('ssm', region_name=region_name) + response = ssm_client.get_parameter(Name=paramter_name) + return response['Parameters']['Value'] + def get_secret(): secret_name = 'LogDNAIngestionKey' # os.environ['LOGGING_KEY'] @@ -87,7 +95,10 @@ def get_secret(): def log_msg(message): log_env = get_env() - logdna = get_secret() + try: + logdna = get_parameter() + except: + return logdata = { "lines": [ @@ -103,7 +114,8 @@ def log_msg(message): submission = requests.post('https://logs.logdna.com/logs/ingest?hostname=GLIMPSE&now={}'.format(int(time.time())), json=logdata, headers=h_data, auth=HTTPBasicAuth(logdna, '')) if submission.status_code != 200: # or submission.json['status'] != "ok": - raise ValueError('Got status {}'.format(submission.status_code)) + print('Got status {}'.format(submission.status_code)) + #raise ValueError('Got status {}'.format(submission.status_code))