Skip to content

Commit 1c1fa67

Browse files
authored
Merge branch 'optional-retry' into add-http-retries
2 parents 30b6be8 + c163daf commit 1c1fa67

File tree

124 files changed

+1460
-1607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1460
-1607
lines changed

.env

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Splunk host (default: localhost)
2+
host=localhost
3+
# Splunk admin port (default: 8089)
4+
port=8089
5+
# Splunk username
6+
username=admin
7+
# Splunk password
8+
password=changed!
9+
# Access scheme (default: https)
10+
scheme=https
11+
# Your version of Splunk (default: 6.2)
12+
version=8.0
13+
# Bearer token for authentication
14+
#bearerToken="<Bearer-token>"
15+
# Session key for authentication
16+
#sessionKey="<Session-Key>"

.github/workflows/test.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Python CI
2+
3+
on:
4+
[push, pull_request]
5+
6+
jobs:
7+
build:
8+
9+
runs-on: ${{ matrix.os }}
10+
strategy:
11+
matrix:
12+
os:
13+
- ubuntu-latest
14+
python: [2.7, 3.7]
15+
splunk-version:
16+
- "8.0"
17+
- "latest"
18+
fail-fast: false
19+
20+
services:
21+
splunk:
22+
image: splunk/splunk:${{matrix.splunk-version}}
23+
env:
24+
SPLUNK_START_ARGS: --accept-license
25+
SPLUNK_HEC_TOKEN: 11111111-1111-1111-1111-1111111111113
26+
SPLUNK_PASSWORD: changed!
27+
SPLUNK_APPS_URL: https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
28+
ports:
29+
- 8000:8000
30+
- 8088:8088
31+
- 8089:8089
32+
33+
steps:
34+
- uses: actions/checkout@v2
35+
- name: Setup Python
36+
uses: actions/setup-python@v2
37+
with:
38+
python-version: ${{ matrix.python }}
39+
- name: Install tox
40+
run: pip install tox
41+
- name: Test Execution
42+
run: tox -e py

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ MANIFEST
1616
coverage_report
1717
test.log
1818
examples/*/local
19-
examples/*/metadata/local.meta
19+
examples/**/local.meta
20+
examples/**/*.log
2021
tests/searchcommands_data/log/
2122
tests/searchcommands_data/output/
2223
examples/searchcommands_app/searchcommand_app.log
2324
Test Results*.html
2425
tests/searchcommands/data/app/app.log
2526
splunk_sdk.egg-info/
2627
dist/
27-
examples/searchcommands_app/package/default/commands.conf
2828
examples/searchcommands_app/package/lib/splunklib
2929
tests/searchcommands/apps/app_with_logging_configuration/*.log
3030
*.observed

.travis.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,59 @@
11
# Splunk Enterprise SDK for Python Changelog
22

3+
## Version 1.6.18
4+
5+
### Bug fixes
6+
* [#405](https://github.com/splunk/splunk-sdk-python/pull/405) Fix searchcommands_app example
7+
* [#406](https://github.com/splunk/splunk-sdk-python/pull/406) Fix mod inputs examples
8+
* [#407](https://github.com/splunk/splunk-sdk-python/pull/407) Fixed issue with Streaming and Generating Custom Search Commands dropping fields that aren't present in the first row of results. More details on how to opt-in to this fix can be found here:
9+
https://github.com/splunk/splunk-sdk-python/blob/develop/README.md#customization [ [issue#401](https://github.com/splunk/splunk-sdk-python/issues/401) ]
10+
11+
### Minor changes
12+
* [#408](https://github.com/splunk/splunk-sdk-python/pull/408) Add search mode example
13+
* [#409](https://github.com/splunk/splunk-sdk-python/pull/409) Add Support for authorization tokens read from .splunkrc [ [issue#388](https://github.com/splunk/splunk-sdk-python/issues/388) ]
14+
* [#413](https://github.com/splunk/splunk-sdk-python/pull/413) Default kvstore owner to nobody [ [issue#231](https://github.com/splunk/splunk-sdk-python/issues/231) ]
15+
16+
## Version 1.6.17
17+
18+
### Bug fixes
19+
20+
* [#383](https://github.com/splunk/splunk-sdk-python/pull/383) Implemented the possibility to provide a SSLContext object to the connect method
21+
* [#396](https://github.com/splunk/splunk-sdk-python/pull/396) Updated KVStore Methods to support dictionaries
22+
* [#397](https://github.com/splunk/splunk-sdk-python/pull/397) Added code changes for encoding '/' in _key parameter in kvstore.data APIs.
23+
* [#398](https://github.com/splunk/splunk-sdk-python/pull/398) Added dictionary support for KVStore "query" methods.
24+
* [#402](https://github.com/splunk/splunk-sdk-python/pull/402) Fixed regression introduced in 1.6.15 to once again allow processing of empty input records in custom search commands (fix [#376](https://github.com/splunk/splunk-sdk-python/issues/376))
25+
* [#404](https://github.com/splunk/splunk-sdk-python/pull/404) Fixed test case failure for 8.0 and latest(8.2.x) splunk version
26+
27+
### Minor changes
28+
29+
* [#381](https://github.com/splunk/splunk-sdk-python/pull/381) Updated current year in conf.py
30+
* [#389](https://github.com/splunk/splunk-sdk-python/pull/389) Fixed few typos
31+
* [#391](https://github.com/splunk/splunk-sdk-python/pull/391) Fixed spelling error in client.py
32+
* [#393](https://github.com/splunk/splunk-sdk-python/pull/393) Updated development status past 3
33+
* [#394](https://github.com/splunk/splunk-sdk-python/pull/394) Updated Readme steps to run examples
34+
* [#395](https://github.com/splunk/splunk-sdk-python/pull/395) Updated random_number.py
35+
* [#399](https://github.com/splunk/splunk-sdk-python/pull/399) Moved CI tests to GitHub Actions
36+
* [#403](https://github.com/splunk/splunk-sdk-python/pull/403) Removed usage of Easy_install to install SDK
37+
38+
## Version 1.6.16
39+
40+
### Bug fixes
41+
[#312](https://github.com/splunk/splunk-sdk-python/pull/312) Fix issue [#309](https://github.com/splunk/splunk-sdk-python/issues/309), avoid catastrophic backtracking in searchcommands
42+
343
## Version 1.6.15
444

545
### Bug fixes
6-
[#301](https://github.com/splunk/splunk-sdk-python/pull/301) Fix chunk synchronization
7-
[#327](https://github.com/splunk/splunk-sdk-python/pull/327) Rename and cleanup follow-up for chunk synchronization
8-
[#352](https://github.com/splunk/splunk-sdk-python/pull/352) Allow supplying of a key-value body when calling Context.post()
46+
47+
* [#301](https://github.com/splunk/splunk-sdk-python/pull/301) Fix chunk synchronization
48+
* [#327](https://github.com/splunk/splunk-sdk-python/pull/327) Rename and cleanup follow-up for chunk synchronization
49+
* [#352](https://github.com/splunk/splunk-sdk-python/pull/352) Allow supplying of a key-value body when calling Context.post()
950

1051
### Minor changes
11-
[#350](https://github.com/splunk/splunk-sdk-python/pull/350) Initial end-to-end tests for streaming, reporting, generating custom search commands
12-
[#348](https://github.com/splunk/splunk-sdk-python/pull/348) Update copyright years to 2020
13-
[#346](https://github.com/splunk/splunk-sdk-python/pull/346) Readme updates to urls, terminology, and formatting
14-
[#317](https://github.com/splunk/splunk-sdk-python/pull/317) Fix deprecation warnings
52+
53+
* [#350](https://github.com/splunk/splunk-sdk-python/pull/350) Initial end-to-end tests for streaming, reporting, generating custom search commands
54+
* [#348](https://github.com/splunk/splunk-sdk-python/pull/348) Update copyright years to 2020
55+
* [#346](https://github.com/splunk/splunk-sdk-python/pull/346) Readme updates to urls, terminology, and formatting
56+
* [#317](https://github.com/splunk/splunk-sdk-python/pull/317) Fix deprecation warnings
1557

1658
## Version 1.6.14
1759

Makefile

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ DATE := `date "+%FT%T%z"`
1818
CONTAINER_NAME := 'splunk'
1919

2020
.PHONY: all
21-
all: build_app test
21+
all: test
2222

2323
init:
2424
@echo "$(ATTN_COLOR)==> init $(NO_COLOR)"
2525

26-
.PHONY: build_app
27-
build_app:
28-
@echo "$(ATTN_COLOR)==> build_app $(NO_COLOR)"
29-
@python setup.py build dist
30-
3126
.PHONY: docs
3227
docs:
3328
@echo "$(ATTN_COLOR)==> docs $(NO_COLOR)"
@@ -61,16 +56,16 @@ test_smoke_no_app:
6156
@echo "$(ATTN_COLOR)==> test_smoke_no_app $(NO_COLOR)"
6257
@tox -e py27,py37 -- -m "smoke and not app"
6358

64-
.PHONY: splunkrc
65-
splunkrc:
66-
@echo "$(ATTN_COLOR)==> splunkrc $(NO_COLOR)"
67-
@echo "To make a .splunkrc:"
68-
@echo " [SPLUNK_INSTANCE_JSON] | python scripts/build-splunkrc.py ~/.splunkrc"
59+
.PHONY: env
60+
env:
61+
@echo "$(ATTN_COLOR)==> env $(NO_COLOR)"
62+
@echo "To make a .env:"
63+
@echo " [SPLUNK_INSTANCE_JSON] | python scripts/build-env.py"
6964

70-
.PHONY: splunkrc_default
71-
splunkrc_default:
72-
@echo "$(ATTN_COLOR)==> splunkrc_default $(NO_COLOR)"
73-
@python scripts/build-splunkrc.py ~/.splunkrc
65+
.PHONY: env_default
66+
env_default:
67+
@echo "$(ATTN_COLOR)==> env_default $(NO_COLOR)"
68+
@python scripts/build-env.py
7469

7570
.PHONY: up
7671
up:

0 commit comments

Comments
 (0)