Skip to content

Commit 1729704

Browse files
varmax2511varmax2511
authored
Releasing version 4.48.0
Releasing version 4.48.0
2 parents 3693018 + ad03da3 commit 1729704

File tree

324 files changed

+32871
-233
lines changed

Some content is hidden

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

324 files changed

+32871
-233
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 4.48.0 (Unreleased)
2+
3+
### Added
4+
- Support for APM Configuration Service
5+
- Support for network_configuration in oci_apm_synthetics_monitor resource
6+
- Support for WAF service
7+
- Support for Log Analytics Scheduled Tasks
8+
- Support for Data Labeling Service
9+
- Support for oci_log_analytics_log_sets_count data_source
10+
- Support for Server side encryption using object specific KMS key
11+
112
## 4.47.0 (October 06, 2021)
213

314
### Added

‎examples/apm/apm_config/apdex/main.tf‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" { }
5+
variable "user_ocid" { }
6+
variable "fingerprint" { }
7+
variable "private_key_path" { }
8+
variable "region" { }
9+
variable "compartment_ocid" { }
10+
11+
variable "config_config_type" {
12+
default = "APDEX"
13+
}
14+
15+
variable "config_defined_tags_value" {
16+
default = "value"
17+
}
18+
19+
variable "config_display_name" {
20+
default = "displayName"
21+
}
22+
23+
variable "config_freeform_tags" {
24+
default = { "bar-key" = "value" }
25+
}
26+
27+
variable "rule_display_name" {
28+
default = "rule name"
29+
}
30+
31+
variable "rule_is_apply_to_error_spans" {
32+
default = true
33+
}
34+
35+
variable "rule_is_enabled" {
36+
default = true
37+
}
38+
39+
variable "rule_priority" {
40+
default = 1
41+
}
42+
43+
variable "rule_satisfied_response_time" {
44+
default = 2000
45+
}
46+
47+
variable "rule_tolerating_response_time" {
48+
default = 5000
49+
}
50+
51+
variable "rule_filter_text" {
52+
default = "kind='SERVER'"
53+
}
54+
55+
variable "apm_domain_description" {
56+
default = "description"
57+
}
58+
59+
variable "apm_domain_display_name" {
60+
default = "displayName"
61+
}
62+
63+
variable "apm_domain_freeform_tags" {
64+
default = { "Department" = "Finance" }
65+
}
66+
67+
variable "apm_domain_is_free_tier" {
68+
default = false
69+
}
70+
71+
variable "apm_domain_state" {
72+
default = "ACTIVE"
73+
}
74+
75+
provider "oci" {
76+
tenancy_ocid = var.tenancy_ocid
77+
user_ocid = var.user_ocid
78+
fingerprint = var.fingerprint
79+
private_key_path = var.private_key_path
80+
region = var.region
81+
}
82+
83+
resource "oci_apm_apm_domain" "test_apm_domain" {
84+
#Required
85+
compartment_id = var.compartment_ocid
86+
display_name = var.apm_domain_display_name
87+
88+
#Optional
89+
description = var.apm_domain_description
90+
freeform_tags = var.apm_domain_freeform_tags
91+
is_free_tier = var.apm_domain_is_free_tier
92+
}
93+
94+
resource "oci_apm_config_config" "test_apdex" {
95+
#Required
96+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
97+
config_type = var.config_config_type
98+
display_name = var.config_display_name
99+
100+
#Optional
101+
#defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.config_defined_tags_value)
102+
freeform_tags = var.config_freeform_tags
103+
104+
rules {
105+
display_name = var.rule_display_name
106+
filter_text = var.rule_filter_text
107+
is_apply_to_error_spans = var.rule_is_apply_to_error_spans
108+
is_enabled = var.rule_is_enabled
109+
priority = var.rule_priority
110+
satisfied_response_time = var.rule_satisfied_response_time
111+
tolerating_response_time = var.rule_tolerating_response_time
112+
}
113+
}
114+
115+
data "oci_apm_config_config" "test_apdex" {
116+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
117+
config_id = oci_apm_config_config.test_apdex.id
118+
}
119+
120+
121+
data "oci_apm_config_configs" "test_configs" {
122+
#Required
123+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
124+
125+
#Optional
126+
config_type = data.oci_apm_config_config.test_apdex.config_type
127+
display_name = data.oci_apm_config_config.test_apdex.display_name
128+
}

‎examples/apm/apm_config/metric_groups/main.tf‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_ocid" {}
10+
11+
variable "config_config_type" {
12+
default = "METRIC_GROUP"
13+
}
14+
15+
variable "config_defined_tags_value" {
16+
default = "value"
17+
}
18+
19+
variable "config_description" {
20+
default = "description"
21+
}
22+
23+
variable "config_dimensions_name" {
24+
default = "name"
25+
}
26+
27+
variable "config_dimensions_value_source" {
28+
default = "valueSource"
29+
}
30+
31+
variable "config_display_name" {
32+
default = "displayName"
33+
}
34+
35+
variable "config_freeform_tags" {
36+
default = { "bar-key" = "value" }
37+
}
38+
39+
variable "config_metrics_description" {
40+
default = "description"
41+
}
42+
43+
variable "config_metrics_name" {
44+
default = "ThreadCpuTime"
45+
}
46+
47+
variable "config_metrics_unit" {
48+
default = "ms"
49+
}
50+
51+
variable "config_metrics_value_source" {
52+
default = "valueSource"
53+
}
54+
55+
variable "config_namespace" {
56+
default = "oracle_apm_monitoring"
57+
}
58+
59+
variable "apm_domain_description" {
60+
default = "description"
61+
}
62+
63+
variable "apm_domain_display_name" {
64+
default = "displayName"
65+
}
66+
67+
variable "apm_domain_freeform_tags" {
68+
default = { "Department" = "Finance" }
69+
}
70+
71+
variable "apm_domain_is_free_tier" {
72+
default = false
73+
}
74+
75+
variable "apm_domain_state" {
76+
default = "ACTIVE"
77+
}
78+
79+
variable "data_key_data_key_type" {
80+
default = "PRIVATE"
81+
}
82+
83+
provider "oci" {
84+
tenancy_ocid = var.tenancy_ocid
85+
user_ocid = var.user_ocid
86+
fingerprint = var.fingerprint
87+
private_key_path = var.private_key_path
88+
region = var.region
89+
}
90+
91+
resource "oci_apm_apm_domain" "test_apm_domain" {
92+
#Required
93+
compartment_id = var.compartment_ocid
94+
display_name = var.apm_domain_display_name
95+
96+
#Optional
97+
description = var.apm_domain_description
98+
freeform_tags = var.apm_domain_freeform_tags
99+
is_free_tier = var.apm_domain_is_free_tier
100+
}
101+
102+
103+
// We need to create a Span Filter first, since a Metric Group requires
104+
// an existing filter
105+
//
106+
resource "oci_apm_config_config" "test_filter" {
107+
#Required
108+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
109+
config_type = "SPAN_FILTER"
110+
display_name = "filterName"
111+
112+
filter_text = "kind='SERVER'"
113+
}
114+
115+
data "oci_apm_config_config" "test_filter" {
116+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
117+
config_id = oci_apm_config_config.test_filter.id
118+
}
119+
120+
resource "oci_apm_config_config" "test_config" {
121+
#Required
122+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
123+
config_type = var.config_config_type
124+
display_name = var.config_display_name
125+
126+
# Optional
127+
description = var.config_description
128+
filter_id = data.oci_apm_config_config.test_filter.id
129+
freeform_tags = var.config_freeform_tags
130+
metrics {
131+
132+
# Optional
133+
description = var.config_metrics_description
134+
name = var.config_metrics_name
135+
#unit = var.config_metrics_unit
136+
}
137+
138+
namespace = var.config_namespace
139+
}
140+
141+
data "oci_apm_config_configs" "test_configs" {
142+
#Required
143+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
144+
145+
#Optional
146+
config_type = var.config_config_type
147+
display_name = var.config_display_name
148+
}

‎examples/apm/apm_config/span_filters/main.tf‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" { }
5+
variable "user_ocid" { }
6+
variable "fingerprint" { }
7+
variable "private_key_path" { }
8+
variable "region" { }
9+
variable "compartment_ocid" { }
10+
11+
variable "config_config_type" {
12+
default = "SPAN_FILTER"
13+
}
14+
15+
variable "config_defined_tags_value" {
16+
default = "value"
17+
}
18+
19+
variable "config_description" {
20+
default = "description"
21+
}
22+
23+
variable "config_display_name" {
24+
default = "displayName"
25+
}
26+
27+
variable "config_filter_text" {
28+
# Must be a valid filter
29+
default = "kind='SERVER'"
30+
}
31+
32+
variable "config_freeform_tags" {
33+
default = { "bar-key" = "value" }
34+
}
35+
36+
variable "apm_domain_description" {
37+
default = "description"
38+
}
39+
40+
variable "apm_domain_display_name" {
41+
default = "displayName"
42+
}
43+
44+
variable "apm_domain_freeform_tags" {
45+
default = { "Department" = "Finance" }
46+
}
47+
48+
variable "apm_domain_is_free_tier" {
49+
default = false
50+
}
51+
52+
variable "apm_domain_state" {
53+
default = "ACTIVE"
54+
}
55+
56+
variable "data_key_data_key_type" {
57+
default = "PRIVATE"
58+
}
59+
60+
provider "oci" {
61+
tenancy_ocid = var.tenancy_ocid
62+
user_ocid = var.user_ocid
63+
fingerprint = var.fingerprint
64+
private_key_path = var.private_key_path
65+
region = var.region
66+
}
67+
68+
resource "oci_apm_apm_domain" "test_apm_domain" {
69+
#Required
70+
compartment_id = var.compartment_ocid
71+
display_name = var.apm_domain_display_name
72+
73+
#Optional
74+
description = var.apm_domain_description
75+
freeform_tags = var.apm_domain_freeform_tags
76+
is_free_tier = var.apm_domain_is_free_tier
77+
}
78+
79+
80+
resource "oci_apm_config_config" "test_config" {
81+
#Required
82+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
83+
config_type = var.config_config_type
84+
display_name = var.config_display_name
85+
86+
#Optional
87+
#defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.config_defined_tags_value)
88+
description = var.config_description
89+
filter_text = var.config_filter_text
90+
freeform_tags = var.config_freeform_tags
91+
}
92+
93+
data "oci_apm_config_configs" "test_configs" {
94+
#Required
95+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
96+
97+
#Optional
98+
config_type = var.config_config_type
99+
display_name = var.config_display_name
100+
}

0 commit comments

Comments
 (0)