Skip to content

Commit

Permalink
Merge pull request #318 from splunk/release/1.10.0
Browse files Browse the repository at this point in the history
* Support Cisco APIC (ACI)
* Support Cisco UC (Unified Communication)
* Refactor CI for matrix testing supported Splunk versions
* Add developer docs using VS Code
* Fix navigation for VMWare docs
  • Loading branch information
Ryan Faircloth authored and GitHub committed Feb 11, 2020
2 parents cbfb994 + 930298d commit 7525d3a
Show file tree
Hide file tree
Showing 81 changed files with 2,052 additions and 1,170 deletions.
508 changes: 134 additions & 374 deletions .circleci/config.yml

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions .env.template

This file was deleted.

12 changes: 12 additions & 0 deletions .github/workflows/review-secrets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Review Secrets
on: [push]

jobs:
review_secrets:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Trufflehog Actions Scan
uses: edplato/trufflehog-actions-scan@v0.9f-beta

6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
[submodule "package/syslog-ng"]
path = package/syslog-ng
url = https://github.com/balabit/syslog-ng.git
branch = syslog-ng-3.25.1
#

5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"python.pythonPath": "venv/bin/python3",
"python.testing.pytestEnabled": true,
"python.testing.autoTestDiscoverOnSaveEnabled": true
}
33 changes: 33 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Setup step 1: python venv",
"type": "shell",
"command": "python3 -m venv ./venv",
"windows": {
"command": "python venv"
},
"group": "Setup",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Setup step 2: python requirements",
"type": "shell",
"command": "pip3 install -r requirements.txt",
"windows": {
"command": "python requirements"
},
"group": "Setup",
"presentation": {
"reveal": "always",
"panel": "new"
}
}
]
}
68 changes: 0 additions & 68 deletions clair-scan.sh

This file was deleted.

24 changes: 0 additions & 24 deletions clair-whitelist.yml

This file was deleted.

80 changes: 0 additions & 80 deletions clair_to_junit_parser.py

This file was deleted.

34 changes: 5 additions & 29 deletions demo-with-compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,11 @@
#Use of this source code is governed by a BSD-2-clause-style
#license that can be found in the LICENSE-BSD2 file or at
#https://opensource.org/licenses/BSD-2-Clause
WAITON=${1:-test}
compose=${2:-docker-compose-demo.yml}
echo $WAITON $compose
mkdir test-results
docker-compose down
docker volume rm sc4s-results
docker volume rm splunk-etc

docker volume create sc4s-results
docker volume create splunk-etc

docker container create --name dummy \
-v sc4s-results:/work/test-results \
-v splunk-etc:/work/splunk-etc \
registry.access.redhat.com/ubi7/ubi
docker cp ./splunk/etc/* dummy:/work/splunk-etc/
docker rm dummy

docker-compose -f $compose pull
docker-compose -f $compose up -d splunk
docker-compose -f $compose up -d sc4s
docker-compose -f tests/docker-compose-script.yml build
docker-compose -f tests/docker-compose-script.yml up -d splunk
sleep 60
docker-compose -f $compose build
docker-compose -f $compose up

docker container create --name dummy \
-v sc4s-results:/work/test-results \
registry.access.redhat.com/ubi7/ubi
docker-compose -f tests/docker-compose-script.yml up -d sc4s
sleep 5
docker-compose -f tests/docker-compose-script.yml up

docker cp dummy:/work/test-results/functional test-results
docker rm dummy
EXIT=$0
53 changes: 0 additions & 53 deletions docker-compose-debug.yml

This file was deleted.

Loading

0 comments on commit 7525d3a

Please sign in to comment.