Thanks to visit codestin.com
Credit goes to github.com

Skip to content

regex stanza bugfix #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 6, 2020
Merged

regex stanza bugfix #365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ae86b7
prelim changes
jmeixensperger Mar 20, 2020
ba184d5
fix regex length matching
jmeixensperger Mar 23, 2020
08cb262
fix wildcard sample + csv cases
jmeixensperger Mar 23, 2020
c078285
small csv fix, add test case
jmeixensperger Mar 23, 2020
473fb6d
revert accidental change
jmeixensperger Mar 24, 2020
5decde0
Upgraded test instance
Mar 25, 2020
3bc7cb7
add httpevent collector
jmeixensperger Mar 25, 2020
2f87c06
forgot to update stanza name
jmeixensperger Mar 26, 2020
1f49565
add escape for csv matching + test case
jmeixensperger Apr 2, 2020
945a4a1
add sample, remove stanza
jmeixensperger Apr 2, 2020
16eba0f
push not working
jmeixensperger Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add httpevent collector
  • Loading branch information
@jmeixensperger
jmeixensperger committed Mar 25, 2020
commit 3bc7cb7072b8b14373b8d9a61920b42109002a82
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test_helper:

sleep 120
@echo 'Provision splunk container'
docker exec --user splunk provision_splunk_1 sh -c 'cd /opt/splunk;./provision.sh;/opt/splunk/bin/splunk enable listen 9997 -auth admin:changeme;/opt/splunk/bin/splunk add index test_0;/opt/splunk/bin/splunk add index test_1;/opt/splunk/bin/splunk restart'
docker exec --user splunk provision_splunk_1 sh -c 'cd /opt/splunk;./provision.sh;./add_httpevent_collector.sh;/opt/splunk/bin/splunk enable listen 9997 -auth admin:changeme;/opt/splunk/bin/splunk add index test_0;/opt/splunk/bin/splunk add index test_1;/opt/splunk/bin/splunk restart'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use --no-cache option here for docker-comopse instead of introducing more steps.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That only works for the build command, so we'd still have to build the image either way (I assume this is the extra step you are referring to).


run_tests:
@echo 'Running the super awesome tests'
Expand Down
2 changes: 1 addition & 1 deletion tests/large/provision/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ RUN sudo apt-get update
RUN echo "installing docker dependencies and development tools" && \
sudo apt-get --assume-yes install curl vim

COPY provision.sh /opt/splunk/
COPY ["provision.sh", "add_httpevent_collector.sh", "/opt/splunk/"]
5 changes: 5 additions & 0 deletions tests/large/provision/add_httpevent_collector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
HTTP_INPUTS_PATH=/opt/splunk/etc/apps/search/local/inputs.conf
echo "[test]" >> $HTTP_INPUTS_PATH
echo "disabled = 0" >> $HTTP_INPUTS_PATH
echo "token = 00000000-0000-0000-0000-000000000000" >> $HTTP_INPUTS_PATH
echo "indexes = main,test_0,test_1" >> $HTTP_INPUTS_PATH