Merge pull request #412 from splunk/release/7_2_0

Release eventgen 7.2.0. Merge to master branch.
splunk · Oct 9, 2020 · d5d0ad2 · d5d0ad2
2 parents b658ec8 + 426b9d2
commit d5d0ad2
Show file tree

Hide file tree

Showing 81 changed files with 2,100 additions and 940 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           name: Check Code Format
           command: |
             set -e
-            pip install "black==19.10b0" "isort>=4.3.15"
+            pip install "black>=20.8b1" "isort>=5.4.2"
             make format-check
       - run:
           name: Run Tests
@@ -33,6 +33,7 @@ jobs:
             set -e
             make test
           no_output_timeout: 30m
+
       - store_test_results:
           path: /home/circleci/project/tests/test-reports
       - store_artifacts:

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -29,8 +29,7 @@ RUN apk --no-cache upgrade && \
 	chmod 0700 /root/.ssh && \
 	passwd -u root && \
 	# install dependencies of conductor2 used by perf
-	pip2 install filelock twisted requests queuelib psutil crochet msgpack-python unidecode attrdict service_identity && \
-	pip2 install git+https://github.com/esnme/[email protected]
+	pip2 install filelock twisted requests queuelib ujson psutil crochet msgpack-python unidecode attrdict service_identity
 
 COPY dockerfiles/sshd_config /etc/ssh/sshd_config
 COPY dockerfiles/entrypoint.sh /sbin/entrypoint.sh

diff --git a/docs/BASICS.md b/docs/BASICS.md
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,7 @@
+**7.2.0**:
+
+- Check the release note and download the package/source from [Here](https://github.com/splunk/eventgen/releases/tag/7.2.0)
+
 **7.1.1**:
 
 - Check the release note and download the package/source from [Here](https://github.com/splunk/eventgen/releases/tag/7.1.1)

diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md
@@ -136,7 +136,7 @@ scsEndPoint = <host>
     * Should be a full url to the scs endpoint
 
 scsAccessToken = <token>
-    * Should be a scs access token. Do not include "Bearer". 
+    * Should be a scs access token. Do not include "Bearer".
 
 scsClientId = <id>
     * Optional
@@ -329,7 +329,7 @@ sampletype = raw | csv
       OVERRIDES FOR DEFAULT FIELDS WILL ONLY WORK WITH outputMode SPLUNKSTREAM.
 
 interval = <integer>
-    * Only valid in mode = sample
+    * Delay between exections.  This number in replay mode occurs after the replay has finished.
     * How often to generate sample (in seconds).
     * 0 means disabled.
     * Defaults to 60 seconds.