Skip to content

Commit

Permalink
Switch to 3.26.1 base
Browse files Browse the repository at this point in the history
  • Loading branch information
rfaircloth-splunk committed Mar 25, 2020
1 parent 16dc25c commit d33feb2
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
32 changes: 16 additions & 16 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
docker:
- image: circleci/python:3.7
environment:
SYSLOG: "syslog-ng-3.25.1"
SYSLOG: "syslog-ng-3.26.1"
SPLUNK_VERSION: "8.0.2"
<<: *test
test-sc4s-master-splunk-8-0:
Expand All @@ -104,14 +104,14 @@ jobs:
docker:
- image: circleci/python:3.7
environment:
SYSLOG: "syslog-ng-3.25.1"
SYSLOG: "syslog-ng-3.26.1"
SPLUNK_VERSION: "7.3.4"
<<: *test
test-sc4s-3-25-1-splunk-7-2:
docker:
- image: circleci/python:3.7
environment:
SYSLOG: "syslog-ng-3.25.1"
SYSLOG: "syslog-ng-3.26.1"
SPLUNK_VERSION: "7.2.9"
<<: *test

Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
docker:
- image: circleci/python:3.7
environment:
SYSLOG: "syslog-ng-3.25.1"
SYSLOG: "syslog-ng-3.26.1"
steps:
- setup_remote_docker:
docker_layer_caching: true
Expand Down Expand Up @@ -243,21 +243,21 @@ workflows:
build_test:
jobs:
- test-sc4s-3-25-1-splunk-8-0
# filters:
# branches:
# only: /.*/
# filters:
# branches:
# only: /.*/
- test-sc4s-master-splunk-8-0
# filters:
# branches:
# only: /.*/
# filters:
# branches:
# only: /.*/
- test-sc4s-3-25-1-splunk-7-3
# filters:
# branches:
# only: /.*/
# filters:
# branches:
# only: /.*/
- test-sc4s-3-25-1-splunk-7-2
# filters:
# branches:
# only: /.*/
# filters:
# branches:
# only: /.*/
- approval-tag-alpha:
type: approval
filters:
Expand Down
4 changes: 2 additions & 2 deletions docs/gettingstarted/docker-swarm-general.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ index=* sourcetype=sc4s:events "starting up"
```
This should yield the following event:
```ini
syslog-ng starting up; version='3.25.1'
syslog-ng starting up; version='3.26.1'
```
when the startup process proceeds normally (without syntax errors). If you do not see this,
follow the steps below before proceeding to deeper-level troubleshooting:
Expand All @@ -245,7 +245,7 @@ docker logs SC4S
```
You should see events similar to those below in the output:
```ini
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.25.1'
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.26.1'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection accepted; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection closed; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
```
Expand Down
4 changes: 2 additions & 2 deletions docs/gettingstarted/docker-swarm-rhel7.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ index=* sourcetype=sc4s:events "starting up"
```
This should yield the following event:
```ini
syslog-ng starting up; version='3.25.1'
syslog-ng starting up; version='3.26.1'
```
when the startup process proceeds normally (without syntax errors). If you do not see this,
follow the steps below before proceeding to deeper-level troubleshooting:
Expand All @@ -253,7 +253,7 @@ docker logs SC4S
```
You should see events similar to those below in the output:
```ini
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.25.1'
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.26.1'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection accepted; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection closed; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
```
Expand Down
4 changes: 2 additions & 2 deletions docs/gettingstarted/docker-systemd-general.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ index=* sourcetype=sc4s:events "starting up"
```
This should yield the following event:
```ini
syslog-ng starting up; version='3.25.1'
syslog-ng starting up; version='3.26.1'
```
when the startup process proceeds normally (without syntax errors). If you do not see this,
follow the steps below before proceeding to deeper-level troubleshooting:
Expand All @@ -256,7 +256,7 @@ docker logs SC4S
```
You should see events similar to those below in the output:
```ini
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.25.1'
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.26.1'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection accepted; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection closed; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
```
Expand Down
4 changes: 2 additions & 2 deletions docs/gettingstarted/podman-systemd-general.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ index=* sourcetype=sc4s:events "starting up"
```
This should yield the following event:
```ini
syslog-ng starting up; version='3.25.1'
syslog-ng starting up; version='3.26.1'
```
when the startup process proceeds normally (without syntax errors). If you do not see this,
follow the steps below before proceeding to deeper-level troubleshooting:
Expand All @@ -243,7 +243,7 @@ podman logs SC4S
```
You should see events similar to those below in the output:
```ini
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.25.1'
Oct 1 03:13:35 77cd4776af41 syslog-ng[1]: syslog-ng starting up; version='3.26.1'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection accepted; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
Oct 1 05:29:55 77cd4776af41 syslog-ng[1]: Syslog connection closed; fd='49', client='AF_INET(10.0.1.18:55010)', local='AF_INET(0.0.0.0:514)'
```
Expand Down
2 changes: 1 addition & 1 deletion docs/troubleshooting.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ don't expect, check to see that the index is created in Splunk, or that a `lastC
cause for almost _all_ `400` errors.
* If you continue to the individual log entries in these directories, you will see entries of the form
```bash
curl -k -u "sc4s HEC debug:a778f63a-5dff-4e3c-a72c-a03183659e94" "https://splunk.smg.aws:8088/services/collector/event" -d '{"time":"1584556114.271","sourcetype":"sc4s:events","source":"SC4S:s_internal","index":"main","host":"e3563b0ea5d8","fields":{"sc4s_syslog_severity":"notice","sc4s_syslog_facility":"syslog","sc4s_log_host":"e3563b0ea5d8","sc4s_fromhostip":"127.0.0.1"},"event":"syslog-ng starting up; version='3.25.1'"}'
curl -k -u "sc4s HEC debug:a778f63a-5dff-4e3c-a72c-a03183659e94" "https://splunk.smg.aws:8088/services/collector/event" -d '{"time":"1584556114.271","sourcetype":"sc4s:events","source":"SC4S:s_internal","index":"main","host":"e3563b0ea5d8","fields":{"sc4s_syslog_severity":"notice","sc4s_syslog_facility":"syslog","sc4s_log_host":"e3563b0ea5d8","sc4s_fromhostip":"127.0.0.1"},"event":"syslog-ng starting up; version='3.26.1'"}'
```
* These commands, with minimal modifications (e.g. multiple URLs specified or elements that needs shell escapes) can be run directly on the
command line to determine what, exactly, the HEC endpoint is returning. This can be used to refine th index or other parameter to correct the
Expand Down
2 changes: 1 addition & 1 deletion package/etc/syslog-ng.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@version:3.25
@version:3.26

# syslog-ng configuration file.

Expand Down

0 comments on commit d33feb2

Please sign in to comment.