sync develop to release/2.0.0 (#33)

Author: sharonx

Makefile

@@ -30,7 +30,7 @@ create:
 
 zip:
 	@echo "### create a tar.gz for plugin"
-	tar -cvzf ${PLUGIN_NAME}.tar.gz ${PLUGIN_DIR}
+	tar -cvzf splunk-logging-plugin.tar.gz ${PLUGIN_DIR}
 
 enable:
 	@echo "### enable plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"

test/malformed_data/test_malformed_events.py

@@ -57,7 +57,7 @@ def test_malformed_empty_string(setup, test_input, expected):
 
     # check that events get to splunk
     events = check_events_from_splunk(id=u_id,
-                                      start_time="-1m@m",
+                                      start_time="-15m@m",
                                       url=setup["splunkd_url"],
                                       user=setup["splunk_user"],
                                       password=setup["splunk_password"])

test/partial_log/test_partial_log.py

@@ -50,7 +50,7 @@ def test_partial_log(setup, test_input, expected):
 
     # check that events get to splunk
     events = check_events_from_splunk(id=u_id,
-                                      start_time="-5m@m",
+                                      start_time="-15m@m",
                                       url=setup["splunkd_url"],
                                       user=setup["splunk_user"],
                                       password=setup["splunk_password"])
@@ -87,7 +87,7 @@ def test_partial_log_flush_timeout(setup, test_input, expected):
 
     # check that events get to splunk
     events = check_events_from_splunk(id=u_id,
-                                      start_time="-5m@m",
+                                      start_time="-15m@m",
                                       url=setup["splunkd_url"],
                                       user=setup["splunk_user"],
                                       password=setup["splunk_password"])
@@ -122,7 +122,7 @@ def test_partial_log_flush_size_limit(setup):
 
     # check that events get to splunk
     events = check_events_from_splunk(id=u_id,
-                                      start_time="-5m@m",
+                                      start_time="-15m@m",
                                       url=setup["splunkd_url"],
                                       user=setup["splunk_user"],
                                       password=setup["splunk_password"])