spl2-testing-framework 1.7.2__tar.gz → 1.8.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/PKG-INFO +34 -7
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/README.md +33 -6
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/pyproject.toml +1 -1
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/conftest.py +85 -11
- spl2_testing_framework-1.8.0/spl2_testing_framework/spl2_test_config.json +18 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/performance.py +13 -4
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/results.py +27 -12
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/spl2test_runner.py +110 -31
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/splunk_integration/splunk_handler.py +17 -6
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/test_discovery.py +12 -12
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/test_types.py +2 -2
- spl2_testing_framework-1.8.0/spl2_testing_framework/tools/utils.py +331 -0
- spl2_testing_framework-1.7.2/spl2_testing_framework/spl2_test_config.json +0 -18
- spl2_testing_framework-1.7.2/spl2_testing_framework/tools/utils.py +0 -132
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/LICENSE +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/__init__.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/launch_remotely_spl2.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/logger_manager.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/pytest.ini.sample +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/single_spl2_file_runner.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/spl2_utils/assertions.spl2 +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/spl2_utils/logs_to_metrics.spl2 +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/test_runner.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/__init__.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/create_diff_sheet.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/__init__.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/cli_job.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/cloud_job.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/job.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/splunk_job.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/jobs/test_cloud_job.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/search_clients/__init__.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/search_clients/cli_search_client.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/search_clients/cloud_search_client.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/search_clients/search_client.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/search_clients/splunk_search_client.py +0 -0
- {spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/tools/splunk_integration/__init__.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: spl2-testing-framework
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.8.0
|
|
4
4
|
Summary: SPL2 Testing Framework
|
|
5
5
|
Home-page: https://github.com/splunk/spl2-testing-framework
|
|
6
6
|
Keywords: SPL2 testing framework
|
|
@@ -35,7 +35,7 @@ Description-Content-Type: text/markdown
|
|
|
35
35
|
|
|
36
36
|
## Overview
|
|
37
37
|
|
|
38
|
-
The **SPL2 Testing Framework** enables running SPL2 tests both locally (
|
|
38
|
+
The **SPL2 Testing Framework** enables running SPL2 tests both locally (or on any Splunk instance with SPL2
|
|
39
39
|
orchestrator), remotely (using external cloud environments) or using cli.
|
|
40
40
|
|
|
41
41
|
- **For Cloud**: It uses
|
|
@@ -138,6 +138,9 @@ Additionally, the following options are supported:
|
|
|
138
138
|
* `--create_comparison_sheet` - to create a comparison sheet in `comparison_box_test` folder using actual and expected outputs (works only when running box tests)
|
|
139
139
|
* `--cli_bench` - when running tests with CLI, this option enables benchmarking mode by adding `-b` and `-n` flags to the spl2-processor-cli command. The value specifies the number of events to test (e.g., `--cli_bench=1000` will add `-b -n 1000` to the CLI command). **In bench mode, all tests always succeed and CLI output is printed to logs** - this is useful for performance testing and benchmarking. This is only applicable when using `--type cli`.
|
|
140
140
|
* `--check_splunk_results` - option to validate box test output by sending events to a Splunk instance (using HEC) and querying them back, with support for **CIM** (Common Information Model) and **TA** (Technology Add-on) checks.
|
|
141
|
+
* `--reduction_stats` - when set, **box tests** record a reduction rate per run: input `_raw` vs output `_raw` (after pairing input/output events). Rates are grouped by **pipeline** (the `.spl2` code module stem) and **sourcetype** (from the input event if set, else the output event, else `UNKNOWN`). Off by default.
|
|
142
|
+
* `--reduction_stats_file` - path to a JSON file written at the **end of the pytest session** with collected rates (default `reduction_stats.json`). Only used when `--reduction_stats` is set.
|
|
143
|
+
* `--reduction_stats_full` - when set together with `--reduction_stats`, each pipeline’s JSON payload also includes a pandas **`describe()`** summary (count, mean, std, min, quartiles, max) per sourcetype column. Only used when `--reduction_stats` is set.
|
|
141
144
|
|
|
142
145
|
* Note: The `pytest.ini.sample` file allows you to define command parameters. Just update the configurations, rename the
|
|
143
146
|
file by removing the `.sample` extension, and execute the command.
|
|
@@ -153,6 +156,7 @@ Sample configuration which may be used:
|
|
|
153
156
|
- Module: `spl2_testing_framework.test_runner`
|
|
154
157
|
- Parameters:
|
|
155
158
|
`--type [cli | splunk | cloud] --test_dir /tests/resources -o log_cli=true --log-cli-level=INFO --verbose`
|
|
159
|
+
- Optional: append `--reduction_stats` (and `--reduction_stats_file`, `--reduction_stats_full` if needed) to collect box-test reduction JSON as described above.
|
|
156
160
|
- If test dir is not specified, current working directory will be used
|
|
157
161
|
- Use `--code_dir` if SPL2 code modules are in a separate directory from tests
|
|
158
162
|
- If necessary another pytest options can be added
|
|
@@ -252,7 +256,31 @@ command ("|")
|
|
|
252
256
|
Content of this file will also be printed to stdout.
|
|
253
257
|
|
|
254
258
|
This checks can be applied only to box tests, as assertions which are used in unit tests may impact spl2 pipeline
|
|
255
|
-
performance.
|
|
259
|
+
performance.
|
|
260
|
+
|
|
261
|
+
### Reduction rate statistics (box tests)
|
|
262
|
+
|
|
263
|
+
Optional telemetry for **how much** each pipeline shrinks event payloads (length of input `_raw` vs matched output `_raw`), broken down by **pipeline** and **sourcetype**.
|
|
264
|
+
|
|
265
|
+
**Enable**
|
|
266
|
+
|
|
267
|
+
- Pass `--reduction_stats` to pytest (or add it in `pytest.ini` / your IDE run configuration).
|
|
268
|
+
|
|
269
|
+
**Output**
|
|
270
|
+
|
|
271
|
+
- During the session, each box test appends one or more floating-point rates into an in-memory structure: `pipeline_name → sourcetype → [rates…]`.
|
|
272
|
+
- After all tests finish, if `--reduction_stats` was set, the framework logs a short **pandas** summary per pipeline and writes **`--reduction_stats_file`** (default `reduction_stats.json`).
|
|
273
|
+
- With **`--reduction_stats_full`**, the JSON file also embeds per-pipeline **`describe()`** statistics for each sourcetype column (handy for dashboards or quick distribution checks).
|
|
274
|
+
|
|
275
|
+
**How rates are computed (high level)**
|
|
276
|
+
|
|
277
|
+
- Input events are parsed from the box test `source` string; output rows come from the job’s destination results.
|
|
278
|
+
- Input/output rows are **paired** using similarity on `_raw` (with a threshold and a same-length positional fallback). Only **matched** pairs contribute rates.
|
|
279
|
+
- For each pair, lengths use a **canonical JSON length** when `_raw` parses as JSON or a Python literal; otherwise the raw string length is used, so identical logical content can yield a **0** reduction rate even if string formatting differs.
|
|
280
|
+
|
|
281
|
+
**Scope**
|
|
282
|
+
|
|
283
|
+
- Applies to **box tests** only. Single-SPL2 runs and unit tests do not populate reduction stats.
|
|
256
284
|
|
|
257
285
|
### Check splunk results
|
|
258
286
|
|
|
@@ -263,13 +291,13 @@ When set (`--check_splunk_results=<option>`), box tests (after running the SPL2
|
|
|
263
291
|
| **CIM** | For each output event, ingest via HEC, load back from Splunk, then check CIM fields from `expected_cim_fields.cim_fields` with `validate_compatibility(actual, expected)`. Skips if the box test has no `cim_fields`. |
|
|
264
292
|
| **TA** | For each output event, ingest via HEC, load back from Splunk, then assert equality with the expected row for that index. |
|
|
265
293
|
|
|
266
|
-
|
|
294
|
+
You can name top-level fields to drop on **both** the pipeline/actual row and each matching `expected_destination_result` row before they are compared by adding **`ignore_fields_in_destination_compare`**: an object mapping **field name → short reason**. Use the same key under `test` in each entry in `*.test.json` (same file as `expected_destination_result`):
|
|
267
295
|
|
|
268
296
|
```json
|
|
269
297
|
"test": {
|
|
270
298
|
"source": "...",
|
|
271
299
|
"expected_destination_result": [ ... ],
|
|
272
|
-
"
|
|
300
|
+
"ignore_fields_in_destination_compare": {
|
|
273
301
|
"_raw": "Raw event differs after Splunk indexing",
|
|
274
302
|
"_time": "Timestamp may vary due to ingestion latency"
|
|
275
303
|
}
|
|
@@ -277,8 +305,7 @@ For **TA** only, you can name top-level fields to drop on **both** the queried e
|
|
|
277
305
|
```
|
|
278
306
|
|
|
279
307
|
|
|
280
|
-
If the key is omitted, no fields are ignored.
|
|
281
|
-
in-memory box test assert). If the file or key is missing, no fields are ignored.
|
|
308
|
+
If the key is omitted, no fields are ignored. It applies to the **default in-memory** box test assert (no `--check_splunk_results`) and to **`--check_splunk_results=TA`**. It does **not** apply to **`--check_splunk_results=CIM`**. If the file or key is missing, no fields are ignored.
|
|
282
309
|
|
|
283
310
|
#### Configuration:
|
|
284
311
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
## Overview
|
|
4
4
|
|
|
5
|
-
The **SPL2 Testing Framework** enables running SPL2 tests both locally (
|
|
5
|
+
The **SPL2 Testing Framework** enables running SPL2 tests both locally (or on any Splunk instance with SPL2
|
|
6
6
|
orchestrator), remotely (using external cloud environments) or using cli.
|
|
7
7
|
|
|
8
8
|
- **For Cloud**: It uses
|
|
@@ -105,6 +105,9 @@ Additionally, the following options are supported:
|
|
|
105
105
|
* `--create_comparison_sheet` - to create a comparison sheet in `comparison_box_test` folder using actual and expected outputs (works only when running box tests)
|
|
106
106
|
* `--cli_bench` - when running tests with CLI, this option enables benchmarking mode by adding `-b` and `-n` flags to the spl2-processor-cli command. The value specifies the number of events to test (e.g., `--cli_bench=1000` will add `-b -n 1000` to the CLI command). **In bench mode, all tests always succeed and CLI output is printed to logs** - this is useful for performance testing and benchmarking. This is only applicable when using `--type cli`.
|
|
107
107
|
* `--check_splunk_results` - option to validate box test output by sending events to a Splunk instance (using HEC) and querying them back, with support for **CIM** (Common Information Model) and **TA** (Technology Add-on) checks.
|
|
108
|
+
* `--reduction_stats` - when set, **box tests** record a reduction rate per run: input `_raw` vs output `_raw` (after pairing input/output events). Rates are grouped by **pipeline** (the `.spl2` code module stem) and **sourcetype** (from the input event if set, else the output event, else `UNKNOWN`). Off by default.
|
|
109
|
+
* `--reduction_stats_file` - path to a JSON file written at the **end of the pytest session** with collected rates (default `reduction_stats.json`). Only used when `--reduction_stats` is set.
|
|
110
|
+
* `--reduction_stats_full` - when set together with `--reduction_stats`, each pipeline’s JSON payload also includes a pandas **`describe()`** summary (count, mean, std, min, quartiles, max) per sourcetype column. Only used when `--reduction_stats` is set.
|
|
108
111
|
|
|
109
112
|
* Note: The `pytest.ini.sample` file allows you to define command parameters. Just update the configurations, rename the
|
|
110
113
|
file by removing the `.sample` extension, and execute the command.
|
|
@@ -120,6 +123,7 @@ Sample configuration which may be used:
|
|
|
120
123
|
- Module: `spl2_testing_framework.test_runner`
|
|
121
124
|
- Parameters:
|
|
122
125
|
`--type [cli | splunk | cloud] --test_dir /tests/resources -o log_cli=true --log-cli-level=INFO --verbose`
|
|
126
|
+
- Optional: append `--reduction_stats` (and `--reduction_stats_file`, `--reduction_stats_full` if needed) to collect box-test reduction JSON as described above.
|
|
123
127
|
- If test dir is not specified, current working directory will be used
|
|
124
128
|
- Use `--code_dir` if SPL2 code modules are in a separate directory from tests
|
|
125
129
|
- If necessary another pytest options can be added
|
|
@@ -219,7 +223,31 @@ command ("|")
|
|
|
219
223
|
Content of this file will also be printed to stdout.
|
|
220
224
|
|
|
221
225
|
This checks can be applied only to box tests, as assertions which are used in unit tests may impact spl2 pipeline
|
|
222
|
-
performance.
|
|
226
|
+
performance.
|
|
227
|
+
|
|
228
|
+
### Reduction rate statistics (box tests)
|
|
229
|
+
|
|
230
|
+
Optional telemetry for **how much** each pipeline shrinks event payloads (length of input `_raw` vs matched output `_raw`), broken down by **pipeline** and **sourcetype**.
|
|
231
|
+
|
|
232
|
+
**Enable**
|
|
233
|
+
|
|
234
|
+
- Pass `--reduction_stats` to pytest (or add it in `pytest.ini` / your IDE run configuration).
|
|
235
|
+
|
|
236
|
+
**Output**
|
|
237
|
+
|
|
238
|
+
- During the session, each box test appends one or more floating-point rates into an in-memory structure: `pipeline_name → sourcetype → [rates…]`.
|
|
239
|
+
- After all tests finish, if `--reduction_stats` was set, the framework logs a short **pandas** summary per pipeline and writes **`--reduction_stats_file`** (default `reduction_stats.json`).
|
|
240
|
+
- With **`--reduction_stats_full`**, the JSON file also embeds per-pipeline **`describe()`** statistics for each sourcetype column (handy for dashboards or quick distribution checks).
|
|
241
|
+
|
|
242
|
+
**How rates are computed (high level)**
|
|
243
|
+
|
|
244
|
+
- Input events are parsed from the box test `source` string; output rows come from the job’s destination results.
|
|
245
|
+
- Input/output rows are **paired** using similarity on `_raw` (with a threshold and a same-length positional fallback). Only **matched** pairs contribute rates.
|
|
246
|
+
- For each pair, lengths use a **canonical JSON length** when `_raw` parses as JSON or a Python literal; otherwise the raw string length is used, so identical logical content can yield a **0** reduction rate even if string formatting differs.
|
|
247
|
+
|
|
248
|
+
**Scope**
|
|
249
|
+
|
|
250
|
+
- Applies to **box tests** only. Single-SPL2 runs and unit tests do not populate reduction stats.
|
|
223
251
|
|
|
224
252
|
### Check splunk results
|
|
225
253
|
|
|
@@ -230,13 +258,13 @@ When set (`--check_splunk_results=<option>`), box tests (after running the SPL2
|
|
|
230
258
|
| **CIM** | For each output event, ingest via HEC, load back from Splunk, then check CIM fields from `expected_cim_fields.cim_fields` with `validate_compatibility(actual, expected)`. Skips if the box test has no `cim_fields`. |
|
|
231
259
|
| **TA** | For each output event, ingest via HEC, load back from Splunk, then assert equality with the expected row for that index. |
|
|
232
260
|
|
|
233
|
-
|
|
261
|
+
You can name top-level fields to drop on **both** the pipeline/actual row and each matching `expected_destination_result` row before they are compared by adding **`ignore_fields_in_destination_compare`**: an object mapping **field name → short reason**. Use the same key under `test` in each entry in `*.test.json` (same file as `expected_destination_result`):
|
|
234
262
|
|
|
235
263
|
```json
|
|
236
264
|
"test": {
|
|
237
265
|
"source": "...",
|
|
238
266
|
"expected_destination_result": [ ... ],
|
|
239
|
-
"
|
|
267
|
+
"ignore_fields_in_destination_compare": {
|
|
240
268
|
"_raw": "Raw event differs after Splunk indexing",
|
|
241
269
|
"_time": "Timestamp may vary due to ingestion latency"
|
|
242
270
|
}
|
|
@@ -244,8 +272,7 @@ For **TA** only, you can name top-level fields to drop on **both** the queried e
|
|
|
244
272
|
```
|
|
245
273
|
|
|
246
274
|
|
|
247
|
-
If the key is omitted, no fields are ignored.
|
|
248
|
-
in-memory box test assert). If the file or key is missing, no fields are ignored.
|
|
275
|
+
If the key is omitted, no fields are ignored. It applies to the **default in-memory** box test assert (no `--check_splunk_results`) and to **`--check_splunk_results=TA`**. It does **not** apply to **`--check_splunk_results=CIM`**. If the file or key is missing, no fields are ignored.
|
|
249
276
|
|
|
250
277
|
#### Configuration:
|
|
251
278
|
|
{spl2_testing_framework-1.7.2 → spl2_testing_framework-1.8.0}/spl2_testing_framework/conftest.py
RENAMED
|
@@ -14,19 +14,21 @@
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
import json
|
|
17
|
+
import logging
|
|
18
|
+
import math
|
|
17
19
|
import os
|
|
18
20
|
from collections import defaultdict
|
|
19
21
|
|
|
20
|
-
import pandas as pd
|
|
21
22
|
import pytest
|
|
22
23
|
|
|
23
|
-
from .tools.results import Results
|
|
24
|
-
from .tools.splunk_integration.splunk_handler import SplunkHandler
|
|
25
|
-
|
|
26
24
|
pytest.register_assert_rewrite("spl2_testing_framework")
|
|
27
25
|
|
|
28
26
|
from requests.auth import AuthBase, HTTPBasicAuth
|
|
29
27
|
|
|
28
|
+
from .logger_manager import setup_logging
|
|
29
|
+
from .tools.results import Results
|
|
30
|
+
from .tools.splunk_integration.splunk_handler import SplunkHandler
|
|
31
|
+
|
|
30
32
|
from spl2_testing_framework.tools.search_clients.cli_search_client import (
|
|
31
33
|
CLISearchClient,
|
|
32
34
|
)
|
|
@@ -58,10 +60,7 @@ TEST_DIR = "test_dir"
|
|
|
58
60
|
CODE_DIR = "code_dir"
|
|
59
61
|
LIMIT_TESTS = "limit_tests"
|
|
60
62
|
CLI_BENCH = "cli_bench"
|
|
61
|
-
|
|
62
|
-
import logging
|
|
63
|
-
|
|
64
|
-
from .logger_manager import setup_logging
|
|
63
|
+
REDUCTION_STATS = "reduction_stats"
|
|
65
64
|
|
|
66
65
|
setup_logging()
|
|
67
66
|
|
|
@@ -89,6 +88,24 @@ def pytest_addoption(parser):
|
|
|
89
88
|
parser.addoption(f"--{IGNORE_ADDITIONAL_FIELDS_IN_ACTUAL}", action="store_true")
|
|
90
89
|
parser.addoption(f"--{LIMIT_TESTS}", action="store", type=int, default=None)
|
|
91
90
|
parser.addoption(f"--{CLI_BENCH}", action="store", type=int, default=None)
|
|
91
|
+
parser.addoption(
|
|
92
|
+
f"--{REDUCTION_STATS}",
|
|
93
|
+
action="store_true",
|
|
94
|
+
default=False,
|
|
95
|
+
help="Collect reduction rates per pipeline/sourcetype and save to file (see --reduction_stats_file, --reduction_stats_full). By default disabled.",
|
|
96
|
+
)
|
|
97
|
+
parser.addoption(
|
|
98
|
+
"--reduction_stats_file",
|
|
99
|
+
action="store",
|
|
100
|
+
default="reduction_stats.json",
|
|
101
|
+
help="Path to save reduction rates (JSON). Used only when --reduction_stats is set.",
|
|
102
|
+
)
|
|
103
|
+
parser.addoption(
|
|
104
|
+
"--reduction_stats_full",
|
|
105
|
+
action="store_true",
|
|
106
|
+
default=False,
|
|
107
|
+
help="Include full dataframe stats (count, mean, std, min, 25%%, 50%%, 75%%, max) in the saved file. Used only when --reduction_stats is set.",
|
|
108
|
+
)
|
|
92
109
|
|
|
93
110
|
|
|
94
111
|
def pytest_generate_tests(metafunc):
|
|
@@ -169,7 +186,7 @@ def spl2_test_runner(
|
|
|
169
186
|
url = f"https://{config['tenant']}.api.{config['cloud_instance']}/{config['tenant']}"
|
|
170
187
|
search_client = CloudSearchClient(url=url, auth=bearer_token_authentication)
|
|
171
188
|
else:
|
|
172
|
-
raise
|
|
189
|
+
raise ValueError(
|
|
173
190
|
"Unknown test type: {}. Supported tests types: 'splunk', 'cloud', 'cli'".format(
|
|
174
191
|
test_type
|
|
175
192
|
)
|
|
@@ -188,6 +205,9 @@ def run_configurations(request):
|
|
|
188
205
|
),
|
|
189
206
|
CLI_BENCH: request.config.getoption(f"--{CLI_BENCH}"),
|
|
190
207
|
CHECK_SPLUNK_RESULTS: request.config.getoption(f"--{CHECK_SPLUNK_RESULTS}"),
|
|
208
|
+
REDUCTION_STATS: request.config.getoption(
|
|
209
|
+
f"--{REDUCTION_STATS}", default=False
|
|
210
|
+
),
|
|
191
211
|
}
|
|
192
212
|
|
|
193
213
|
|
|
@@ -328,17 +348,71 @@ def splunk_handler(config, splunk_token_authentication):
|
|
|
328
348
|
|
|
329
349
|
|
|
330
350
|
@pytest.fixture(scope="session")
|
|
331
|
-
def stats():
|
|
351
|
+
def stats(request):
|
|
332
352
|
s = defaultdict(lambda: defaultdict(list))
|
|
333
353
|
yield s
|
|
334
354
|
|
|
355
|
+
collect_reduction = request.config.getoption(f"--{REDUCTION_STATS}", default=False)
|
|
356
|
+
if not collect_reduction:
|
|
357
|
+
return
|
|
358
|
+
|
|
359
|
+
_LOGGER.info("Reduction stats: reporting (--reduction_stats was set)")
|
|
360
|
+
if not s:
|
|
361
|
+
_LOGGER.info(
|
|
362
|
+
"Reduction stats: no data (no box tests ran or no rates collected)"
|
|
363
|
+
)
|
|
364
|
+
return
|
|
365
|
+
|
|
366
|
+
import pandas as pd # lazy import — only needed when --reduction_stats is set
|
|
367
|
+
|
|
368
|
+
def _pad_to_equal_length(rates_dict):
|
|
369
|
+
"""Pad lists to same length with NaN so pd.DataFrame accepts different-length columns."""
|
|
370
|
+
if not rates_dict:
|
|
371
|
+
return rates_dict
|
|
372
|
+
max_len = max(len(lst) for lst in rates_dict.values())
|
|
373
|
+
return {
|
|
374
|
+
k: list(lst) + [float("nan")] * (max_len - len(lst))
|
|
375
|
+
for k, lst in rates_dict.items()
|
|
376
|
+
}
|
|
377
|
+
|
|
335
378
|
for template, v in s.items():
|
|
336
|
-
|
|
379
|
+
v_padded = _pad_to_equal_length(dict(v))
|
|
380
|
+
x = pd.DataFrame(v_padded)
|
|
337
381
|
_LOGGER.info(" *** *** ***")
|
|
338
382
|
_LOGGER.info("Collected statistics: ")
|
|
339
383
|
_LOGGER.info("Template name: %s ", template)
|
|
340
384
|
_LOGGER.info(x.describe())
|
|
341
385
|
|
|
386
|
+
out_path = request.config.getoption(
|
|
387
|
+
"--reduction_stats_file", default="reduction_stats.json"
|
|
388
|
+
)
|
|
389
|
+
include_full = request.config.getoption("--reduction_stats_full", default=False)
|
|
390
|
+
if out_path:
|
|
391
|
+
data = {}
|
|
392
|
+
for pipeline, sourcetype_rates in s.items():
|
|
393
|
+
rates_dict = dict(sourcetype_rates)
|
|
394
|
+
if include_full:
|
|
395
|
+
rates_padded = _pad_to_equal_length(rates_dict)
|
|
396
|
+
df = pd.DataFrame(rates_padded)
|
|
397
|
+
describe = df.describe().to_dict()
|
|
398
|
+
# NaN is not JSON-serializable; convert to None
|
|
399
|
+
describe_serializable = {
|
|
400
|
+
k: {
|
|
401
|
+
kk: (None if isinstance(vv, float) and math.isnan(vv) else vv)
|
|
402
|
+
for kk, vv in v.items()
|
|
403
|
+
}
|
|
404
|
+
for k, v in describe.items()
|
|
405
|
+
}
|
|
406
|
+
data[pipeline] = {
|
|
407
|
+
"rates": rates_dict,
|
|
408
|
+
"describe": describe_serializable,
|
|
409
|
+
}
|
|
410
|
+
else:
|
|
411
|
+
data[pipeline] = rates_dict
|
|
412
|
+
with open(out_path, "w", encoding="utf-8") as f:
|
|
413
|
+
json.dump(data, f, indent=2)
|
|
414
|
+
_LOGGER.info("Reduction rates saved to %s", out_path)
|
|
415
|
+
|
|
342
416
|
|
|
343
417
|
def _set_results_options(metafunc):
|
|
344
418
|
ignore_empty_strings = metafunc.config.getoption(IGNORE_EMPTY_STRINGS)
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
{
|
|
2
|
+
"host": "",
|
|
3
|
+
"cloud_instance": "",
|
|
4
|
+
"tenant": "",
|
|
5
|
+
"bearer_token": "",
|
|
6
|
+
"port": "",
|
|
7
|
+
"user": "",
|
|
8
|
+
"password": "",
|
|
9
|
+
"SPLUNK_INSTANCE": {
|
|
10
|
+
"ip": "localhost",
|
|
11
|
+
"port": 8088,
|
|
12
|
+
"api_port": 8089,
|
|
13
|
+
"username": "admin",
|
|
14
|
+
"password": "Chang3d!",
|
|
15
|
+
"index": "testx",
|
|
16
|
+
"hec_token": "4a8a737d-5452-426c-a6f7-106dca4e813f"
|
|
17
|
+
}
|
|
18
|
+
}
|
|
@@ -249,7 +249,14 @@ class PerformanceCheck:
|
|
|
249
249
|
|
|
250
250
|
@staticmethod
|
|
251
251
|
def _preserve_timestamps_through_fields(code_module: str) -> str:
|
|
252
|
-
"""Replace '| fields' keep-mode with a no-op so _timestamp_perf* fields are not stripped.
|
|
252
|
+
"""Replace '| fields' keep-mode with a no-op so _timestamp_perf* fields are not stripped.
|
|
253
|
+
|
|
254
|
+
During performance instrumentation the pipeline runs with a slightly different shape:
|
|
255
|
+
keep-mode ``| fields`` commands are removed to prevent them from stripping the injected
|
|
256
|
+
``_timestamp_perf*`` variables. This means perf numbers reflect a pipeline with all
|
|
257
|
+
fields passing through, which is slightly heavier than production but avoids silently
|
|
258
|
+
dropping the instrumentation fields and producing zeroed measurements.
|
|
259
|
+
"""
|
|
253
260
|
return re.sub(
|
|
254
261
|
r"\|\s*fields\s+(?!-)(.+)",
|
|
255
262
|
r"| eval _perf_fields_preserved=1",
|
|
@@ -297,11 +304,13 @@ class PerformanceCheck:
|
|
|
297
304
|
flags=re.M,
|
|
298
305
|
)
|
|
299
306
|
|
|
300
|
-
func_timestamps = re.findall(
|
|
307
|
+
func_timestamps = re.findall(
|
|
308
|
+
rf"_time_{re.escape(f['f_name'])}_placeholder", new_function
|
|
309
|
+
)
|
|
301
310
|
|
|
302
311
|
for n, timestamp in enumerate(func_timestamps):
|
|
303
312
|
new_function = re.sub(
|
|
304
|
-
timestamp,
|
|
313
|
+
re.escape(timestamp),
|
|
305
314
|
rf"_timestamp_perf{f['f_name']}_{n:03d}",
|
|
306
315
|
new_function,
|
|
307
316
|
count=1,
|
|
@@ -318,7 +327,7 @@ class PerformanceCheck:
|
|
|
318
327
|
)
|
|
319
328
|
|
|
320
329
|
func_timestamps = re.findall(
|
|
321
|
-
rf"\$_time_{f['f_name']}_placeholder", new_function
|
|
330
|
+
rf"\$_time_{re.escape(f['f_name'])}_placeholder", new_function
|
|
322
331
|
)
|
|
323
332
|
|
|
324
333
|
for n, timestamp in enumerate(func_timestamps):
|
|
@@ -13,12 +13,11 @@
|
|
|
13
13
|
# limitations under the License.
|
|
14
14
|
|
|
15
15
|
|
|
16
|
+
import ast
|
|
16
17
|
import json
|
|
17
18
|
from collections import UserDict
|
|
18
19
|
from datetime import datetime, timezone
|
|
19
|
-
from os import remove
|
|
20
20
|
from typing import Any
|
|
21
|
-
import pytest
|
|
22
21
|
|
|
23
22
|
|
|
24
23
|
class Results(UserDict):
|
|
@@ -38,16 +37,34 @@ class Results(UserDict):
|
|
|
38
37
|
self._remove_timestamps_if_necessary()
|
|
39
38
|
self._remove_all_empty_strings_from_dicts_if_necessary()
|
|
40
39
|
|
|
40
|
+
@staticmethod
|
|
41
|
+
def _coerce_string_if_json_or_python_literal(value: str) -> Any:
|
|
42
|
+
"""If ``value`` looks like JSON or a Python ``list``/``dict`` literal, parse it.
|
|
43
|
+
|
|
44
|
+
Test JSON and Splunk sometimes embed ``list``/``dict`` as strings; JSON only
|
|
45
|
+
accepts double quotes, so single-quoted Python reprs need ``literal_eval``.
|
|
46
|
+
"""
|
|
47
|
+
candidate = value.strip()
|
|
48
|
+
if not (candidate.startswith("[") or candidate.startswith("{")):
|
|
49
|
+
return value
|
|
50
|
+
try:
|
|
51
|
+
return json.loads(candidate)
|
|
52
|
+
except Exception:
|
|
53
|
+
try:
|
|
54
|
+
parsed = ast.literal_eval(candidate)
|
|
55
|
+
except (ValueError, SyntaxError):
|
|
56
|
+
return value
|
|
57
|
+
if isinstance(parsed, (list, dict)):
|
|
58
|
+
return parsed
|
|
59
|
+
return value
|
|
60
|
+
|
|
41
61
|
@staticmethod
|
|
42
62
|
def _cast_types(data: Any):
|
|
43
63
|
"""Casts everything into dicts / lists / strings.
|
|
44
64
|
This is necessary because Splunk, IP and CLI often return different types of data.
|
|
45
65
|
"""
|
|
46
|
-
if isinstance(data, str)
|
|
47
|
-
|
|
48
|
-
data = json.loads(data)
|
|
49
|
-
except Exception:
|
|
50
|
-
pass # If it fails, it's not a json, so it's just a normal string
|
|
66
|
+
if isinstance(data, str):
|
|
67
|
+
data = Results._coerce_string_if_json_or_python_literal(data)
|
|
51
68
|
|
|
52
69
|
if isinstance(data, list):
|
|
53
70
|
data = [Results._cast_types(item) for item in data]
|
|
@@ -55,7 +72,7 @@ class Results(UserDict):
|
|
|
55
72
|
for key, value in data.items():
|
|
56
73
|
data[key] = Results._cast_types(value)
|
|
57
74
|
if key == "_time":
|
|
58
|
-
data[key] = Results._convert_timestamp(
|
|
75
|
+
data[key] = Results._convert_timestamp(data[key])
|
|
59
76
|
if isinstance(data, (int, float)):
|
|
60
77
|
data = str(data)
|
|
61
78
|
|
|
@@ -66,7 +83,7 @@ class Results(UserDict):
|
|
|
66
83
|
"""We need to convert timestamp, as there are different formats returned by cloud / CLI / splunk"""
|
|
67
84
|
try:
|
|
68
85
|
ts = datetime.fromisoformat(timestamp)
|
|
69
|
-
except ValueError:
|
|
86
|
+
except (ValueError, TypeError):
|
|
70
87
|
ts = datetime.fromtimestamp(float(timestamp), timezone.utc)
|
|
71
88
|
|
|
72
89
|
return ts.isoformat()
|
|
@@ -158,14 +175,12 @@ class Results(UserDict):
|
|
|
158
175
|
actual_data[key][i], expected_data[key][i]
|
|
159
176
|
)
|
|
160
177
|
|
|
161
|
-
return actual_data
|
|
162
|
-
|
|
163
178
|
def remove_fields_not_in_expected(self, expected):
|
|
164
179
|
"""Remove fields from this Results object that are not present in the expected Results object.
|
|
165
180
|
This is the public method to be called when comparing results.
|
|
166
181
|
"""
|
|
167
182
|
if self._ignore_additional_fields_in_actual and isinstance(expected, Results):
|
|
168
|
-
self.
|
|
183
|
+
self._remove_extra_fields(self.data, expected.data)
|
|
169
184
|
return self
|
|
170
185
|
|
|
171
186
|
def __lt__(self, other):
|