Skip to content

Commit 565de12

Browse files
committed
Merge branch 'master' into feature/SUMO-191578-monitor-configurable-resolution-window-support
2 parents a73d592 + a01b107 commit 565de12

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
name: Matrix Test
5555
needs: build
5656
runs-on: ubuntu-latest
57-
timeout-minutes: 35
57+
timeout-minutes: 60
5858
strategy:
5959
fail-fast: false
6060
matrix:
@@ -77,7 +77,7 @@ jobs:
7777
go mod download
7878
7979
- name: TF acceptance tests
80-
timeout-minutes: 30
80+
timeout-minutes: 55
8181
env:
8282
TF_ACC: "1"
8383
TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
## 2.19.1
2-
1+
## 2.19.1 (Unreleased)
32
FEATURES:
43
* Add new optional `resolution_window` field to resource/sumologic_monitor (GH-418)
54

6-
## 2.19.0
5+
## 2.19.0 (September 20, 2022)
76
FEATURES:
87
* **New Resource:** sumologic_cse_entity_normalization_configuration (GH-430)
98

9+
ENHANCEMENTS:
10+
* Updated maxdepth level for hierarchy resource (GH-433)
1011

1112
## 2.18.2 (September 1, 2022)
12-
1313
BUG FIXES:
1414
* Fix bug for validation for monitor name and description regex (GH-428)
1515

sumologic/resource_sumologic_hierarchy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
var (
11-
maxDepth = 6
11+
maxDepth = 8
1212
maxWidth = 20
1313
maxHierarchyNameLen = 256
1414
maxFilterKeyLen = 1024

website/docs/index.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ The following properties are common to ALL sources and can be used to configure
155155
mask = "MaskedID"
156156
}
157157
```
158-
- `cutoff_timestamp` - (Optional) Only collect data more recent than this timestamp, specified as milliseconds since epoch (13 digit).
159-
- `cutoff_relative_time` - (Optional) Can be specified instead of cutoffTimestamp to provide a relative offset with respect to the current time. Example: use -1h, -1d, or -1w to collect data that's less than one hour, one day, or one week old, respectively.
158+
- `cutoff_timestamp` - (Optional) Only collect data more recent than this timestamp, specified as milliseconds since epoch (13 digit). This maps to the `Collection should begin` field on the UI. Example: using `1663786159000` will set the cutoff timestamp to `Wednesday, September 21, 2022 6:49:19 PM GMT`
159+
- `cutoff_relative_time` - (Optional) Can be specified instead of cutoffTimestamp to provide a relative offset with respect to the current time.This maps to the `Collection should begin` field on the UI. Example: use -1h, -1d, or -1w to collect data that's less than one hour, one day, or one week old, respectively.
160160
- `fields` - (Optional) Map containing key/value pairs.
161161

162162
Usage:

0 commit comments

Comments
 (0)