Skip to content

Commit 9764eae

Browse files
authored
Merge pull request #145 from SumoLogic/rohit-monitors-docs-fixes
SUMO-156443: misc monitors docs fixes
2 parents 640bac6 + 930e5b6 commit 9764eae

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
BUG FIXES:
44

55
* is_active is now required in sumologic_user, doc fixes
6+
* monitor doc fixes and improvements
67

78
## 2.6.3 (January 15, 2021)
89

GNUmakefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ TEST?=$$(go list ./... |grep -v 'vendor')
22
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
33
WEBSITE_REPO=github.com/hashicorp/terraform-website
44
PKG_NAME=sumologic
5+
DEV_VERSION_NUMBER=2.7.1
56
PLUGIN_DIR=~/.terraform.d/plugins
7+
# PLUGIN_DIR_V13=~/.terraform.d/plugins/registry.terraform.io/sumologic/sumologic
8+
PLUGIN_DIR_V13=~/.terraform.d/providers/registry.terraform.io/sumologic/sumologic
9+
PLUGIN_DIR_SUFFIX=$(DEV_VERSION_NUMBER)/darwin_amd64
610

711
default: build
812

@@ -17,8 +21,14 @@ install: fmtcheck
1721
mkdir -vp $(PLUGIN_DIR)
1822
go build -o $(PLUGIN_DIR)/terraform-provider-sumologic
1923

24+
# separate command for installing in the right directory for terraform v0.13+
25+
install-v13: fmtcheck
26+
mkdir -vp $(PLUGIN_DIR)
27+
go build -o $(PLUGIN_DIR_V13)/$(PLUGIN_DIR_SUFFIX)/terraform-provider-sumologic
28+
2029
uninstall:
2130
@rm -vf $(PLUGIN_DIR)/terraform-provider-sumologic
31+
@rm -vf $(PLUGIN_DIR_V13)/$(PLUGIN_DIR_SUFFIX)/terraform-provider-sumologic
2232

2333
errcheck:
2434
@sh -c "'$(CURDIR)/scripts/errcheck.sh'"

website/docs/r/monitor.html.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ resource "sumologic_monitor" "tf_metrics_monitor_1" {
8181
threshold_type = "GreaterThanOrEqual"
8282
threshold = 40.0
8383
time_range = "15m"
84-
occurrence_type = "Always"
85-
trigger_source = "AllTimeSeries"
84+
occurrence_type = "AtLeastOnce"
85+
trigger_source = "AnyTimeSeries"
8686
trigger_type = "Critical"
8787
detection_method = "StaticCondition"
8888
}
8989
triggers {
9090
threshold_type = "LessThan"
91-
threshold = 30.0
91+
threshold = 40.0
9292
time_range = "15m"
9393
occurrence_type = "Always"
94-
trigger_source = "AllTimeSeries"
94+
trigger_source = "AnyTimeSeries"
9595
trigger_type = "ResolvedCritical"
9696
detection_method = "StaticCondition"
9797
}

0 commit comments

Comments
 (0)